Permalink
Browse files

glorious funtoo updates

merged:

  gentoo: 27a819d42d1d9921768037efd852c5fa73963d66
  funtoo-overlay: 995872bdeab215793b0fac9d26eeb4a068802ca6
  foo-overlay: e2e7007175c5a6cffd6155d58ddbbffb9b9311bb
  bar-overlay: 6c956f1ca6178fed85bda46013da787239706d7c
  flora: 493fe31bca83de4017fe8f3d80304b3f8b22aaa8
  lcd-filtering: dcdffe73e7d6623c7dfe8e6679597227dc2bb6de
  • Loading branch information...
1 parent 56b4cfb commit 0768547def5b2ddfa62484608bbb6e3839091f7d @danielrobbins danielrobbins committed Jul 15, 2012
Showing 466 changed files with 2,212 additions and 2,201 deletions.
@@ -1,14 +1,14 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-xvmc/eselect-xvmc-0.3.ebuild,v 1.2 2012/05/10 17:14:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-xvmc/eselect-xvmc-0.3.ebuild,v 1.3 2012/07/15 11:35:30 ago Exp $
DESCRIPTION="Manages XvMC implementations"
HOMEPAGE="http://www.gentoo.org/"
SRC_URI=""
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE=""
DEPEND=""
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r3.ebuild,v 1.5 2012/05/24 13:23:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/gnome-system-tools/gnome-system-tools-2.32.0-r3.ebuild,v 1.6 2012/07/15 16:17:20 armin76 Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.gnome.org/projects/gst/"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
IUSE="nfs policykit samba"
RDEPEND="
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r2.ebuild,v 1.2 2012/06/25 07:57:31 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.9-r2.ebuild,v 1.3 2012/07/15 16:19:28 armin76 Exp $
EAPI="3"
@@ -15,7 +15,7 @@ HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sh sparc x86"
SLOT="0"
IUSE="doc policykit"
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.9-r1.ebuild,v 1.9 2012/06/25 00:17:52 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.9-r1.ebuild,v 1.10 2012/07/15 16:21:58 armin76 Exp $
EAPI="3"
@@ -16,7 +16,7 @@ HOMEPAGE="http://cyberelk.net/tim/software/system-config-printer/"
SRC_URI="http://cyberelk.net/tim/data/system-config-printer/1.3/${MY_P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~ia64 ppc ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86"
SLOT="0"
IUSE="gnome-keyring"
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild,v 1.9 2012/06/27 11:56:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.50.16-r4.ebuild,v 1.10 2012/07/15 17:17:09 armin76 Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE=""
DEPEND=""
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.2.3.ebuild,v 1.7 2012/06/28 12:34:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unrar/unrar-4.2.3.ebuild,v 1.8 2012/07/15 17:19:06 armin76 Exp $
EAPI=4
inherit flag-o-matic multilib toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz"
LICENSE="unRAR"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
@@ -1,4 +1,2 @@
-DIST html526.tar.gz 542192666 SHA256 9e5e9d10e93cb8be6b6e0dc63b0bc4848c2b9762459102be205d9269f81748d9 SHA512 e18a49510cfd70eee8016f8d47a4a99f47b361b9e18a546a7124acfa245efd1b531013ea0bdb853e734531b091a908493fa7c42d3da2add52ee31d172ab7bce1 WHIRLPOOL 1780cb5afe6a66af48371038042d56c79892bcb5ec852fbc924526443163c6b0d577d1b91bb2c86b15e383192ac212e55e423c4527de866d7d34ab3219b0b2ad
-DIST html528.tar.gz 1145194061 SHA256 424ea6ec6fd1606c27379cf56f63ab52a99b7e3ac3b98f8b08a50841069ade5a SHA512 6f1f05daf0da8317bc6f88b23ac2b57a274363ba0eb945155aeafa9a1cafcb118542126b6a354775def22f2486bbd56d09c07d0fa4e40970dea57abf577da85d WHIRLPOOL 63881c0ab516f12765c507fa198a2ba2281228ab7bd151ff9dc0f049914766d64ab4b6dbae8a8fd4b41ff7236ac68d4c2a89e7bc02cbf60ea1823df9f6ef8f69
DIST root_v5.32.03.source.tar.gz 55529362 SHA256 575057c429625df69f0fa5c303287acefff185cda8cf8d1e9a6b2d21097d5ae6 SHA512 2e067eb9c6bbda5cf4df6973a3cf5307540247fb07c349f7ee74c0cf6a4abbb63f585a9ff67139cae985250fc5c5106b5ea03d7d9d2bcd20269e0ec8760ebd02 WHIRLPOOL 87dbf6f55f82001e07afc3b467e95f841f185f1f67d1dbd953f73e8aa9127ef8485db84100d6e9a08f0ae6aa5b45a565398eb6723145fff16c07e5158bb3e3ab
DIST root_v5.34.00.source.tar.gz 56214534 SHA256 808e04876dbc9cfbfea54ee11ba35e90382e8ff4219dbdbe2d2236a9dadf7df1 SHA512 2502281b8b5de5771d5a135080d2aba7797a477e0a769c8e6b2801959896bb4b0ce8f2e0c6a64459ffb28e46d681cad0b8af5430c0648654b57a9a3d744a499d WHIRLPOOL e7db950b5460ec8871b4b2b191d33850b23951b0de3285aad602d380f3935f3ab7ac86cd6fb8ab6534d188bf31a80c0e3d7972f931f7d9588274d9b76bea7861
@@ -1,22 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.26.00.ebuild,v 1.4 2010/07/11 17:47:19 armin76 Exp $
-
-inherit versionator
-
-S=${WORKDIR}/htmldoc
-DESCRIPTION="An Object-Oriented Data Analysis Framework"
-VER=$(str=( $(get_version_components) ); echo "${str[0]}${str[1]}")
-SRC_URI="ftp://root.cern.ch/root/html${VER}.tar.gz"
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="as-is"
-IUSE=""
-KEYWORDS="amd64 sparc x86"
-
-src_install() {
- docpath="/usr/share/doc/${PF}/"
- mkdir -p "$D"/${docpath}
- cp -r * "$D"/${docpath}
-}
@@ -1,25 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/root-docs/root-docs-5.28-r1.ebuild,v 1.1 2011/05/17 17:51:07 bicatali Exp $
-
-EAPI=3
-inherit versionator
-
-DESCRIPTION="An Object-Oriented Data Analysis Framework"
-MYP=html$(replace_version_separator 1 '')
-
-SRC_URI="ftp://root.cern.ch/root/${MYP}.tar.gz"
-HOMEPAGE="http://root.cern.ch/"
-
-SLOT="0"
-LICENSE="as-is"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-S=${WORKDIR}/htmldoc
-
-src_install() {
- insinto /usr/share/doc/${PF}/html
- # use mv, there is too much to copy
- mv * "${ED}"/usr/share/doc/${PF}/html
-}
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.11.4.ebuild,v 1.1 2012/06/30 01:44:00 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.11.4.ebuild,v 1.2 2012/07/15 11:36:35 ago Exp $
EAPI=4
@@ -29,7 +29,7 @@ else
ftp://libvirt.org/libvirt/stable_updates/${MY_P}.tar.gz
${BACKPORTS:+
http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-bp-${BACKPORTS}.tar.bz2}"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
S="${WORKDIR}/${P%_rc*}"
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.12.ebuild,v 1.9 2012/06/27 15:52:51 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-0.9.12.ebuild,v 1.10 2012/07/15 11:44:44 ago Exp $
EAPI=4
@@ -26,7 +26,7 @@ else
ftp://libvirt.org/libvirt/${MY_P}.tar.gz
${BACKPORTS:+
http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-bp-${BACKPORTS}.tar.bz2}"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 ~x86"
fi
S="${WORKDIR}/${P%_rc*}"
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.39.ebuild,v 1.4 2012/07/14 20:19:24 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/pommed/pommed-1.39.ebuild,v 1.5 2012/07/15 12:44:53 ago Exp $
EAPI="1"
@@ -13,7 +13,7 @@ SRC_URI="http://alioth.debian.org/frs/download.php/${ALIOTH_NUMBER}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="gtk X"
COMMON_DEPEND="media-libs/alsa-lib
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.2.ebuild,v 1.10 2012/05/24 13:29:56 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/dia/dia-0.97.2.ebuild,v 1.11 2012/07/15 16:24:04 armin76 Exp $
EAPI=4
@@ -16,7 +16,7 @@ HOMEPAGE="http://live.gnome.org/Dia"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
# the doc USE flag doesn't seem to do anything without docbook2html
IUSE="cairo doc gnome python"
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/planner/planner-0.14.6.ebuild,v 1.5 2012/05/24 13:32:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/planner/planner-0.14.6.ebuild,v 1.6 2012/07/15 16:26:56 armin76 Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -14,7 +14,7 @@ HOMEPAGE="http://live.gnome.org/Planner/"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
+KEYWORDS="alpha amd64 ppc sparc x86"
IUSE="doc eds python examples"
RDEPEND=">=dev-libs/glib-2.6:2
@@ -1,6 +1,6 @@
qcodeedit/lib/document/qdocumentcommand.cpp | 1 +
- qtsingleapplication/qtlocalpeer.cpp | 6 +++---
- 2 files changed, 4 insertions(+), 3 deletions(-)
+ qtsingleapplication/qtlocalpeer.cpp | 5 +++--
+ 2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/qcodeedit/lib/document/qdocumentcommand.cpp b/qcodeedit/lib/document/qdocumentcommand.cpp
index 308e4e4..35b7d9f 100644
@@ -15,7 +15,7 @@ index 308e4e4..35b7d9f 100644
/*!
\brief ctor
diff --git a/qtsingleapplication/qtlocalpeer.cpp b/qtsingleapplication/qtlocalpeer.cpp
-index 120a8e8..cab57cd 100644
+index 120a8e8..fa32ff2 100644
--- a/qtsingleapplication/qtlocalpeer.cpp
+++ b/qtsingleapplication/qtlocalpeer.cpp
@@ -48,9 +48,9 @@
@@ -30,12 +30,11 @@ index 120a8e8..cab57cd 100644
#if defined(Q_OS_WIN)
#include <QtCore/QLibrary>
-@@ -103,7 +103,7 @@ QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId)
- socketName += QLatin1Char('-') + QString::number(sessionId, 16);
- }
- #else
-- socketName += QLatin1Char('-') + QString::number(::getuid(), 16);
-+ socketName += QLatin1Char('-') + QString::number(QtLP_Private::getuid(), 16);
+@@ -60,6 +60,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
#endif
- server = new QLocalServer(this);
+ namespace QtLP_Private {
@@ -0,0 +1,29 @@
+From cb478565396b325a0860747a3c9c90789b13aea1 Mon Sep 17 00:00:00 2001
+From: hannes <hannes@fedoraproject.org>
+Date: Thu, 16 Feb 2012 20:49:50 +0000
+Subject: [PATCH] Fix the testcase build failure
+
+---
+ tests/qsearchreplacepanel_t.cpp | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tests/qsearchreplacepanel_t.cpp b/tests/qsearchreplacepanel_t.cpp
+index e043f8b..22d6013 100644
+--- tests/qsearchreplacepanel_t.cpp
++++ tests/qsearchreplacepanel_t.cpp
+@@ -213,9 +213,9 @@ void QSearchReplacePanelTest::incrementalsearch(){
+ widget->cFind->lineEdit()->cursorForward(false,search.length());
+ QTest::keyClick(widget->cFind->lineEdit(),search[search.length()-1].toLatin1());
+ }
+- QDocumentCursor s=ed->cursor().selectionStart();
+- QEQUAL2(s.lineNumber(), cy, search+" "+ed->cursor().selectedText()+" "+QString::number(loop));
+- QEQUAL2(s.columnNumber(), cx, search+" "+ed->cursor().selectedText());
++ QDocumentCursor c=ed->cursor().selectionStart();
++ QEQUAL2(c.lineNumber(), cy, search+" "+ed->cursor().selectedText()+" "+QString::number(loop));
++ QEQUAL2(c.columnNumber(), cx, search+" "+ed->cursor().selectedText());
+ QEQUAL2(ed->cursor().selectedText(), res, search+" "+ed->cursor().selectedText());
+ //searching shouldn't change highlighted selection
+ QCEMULTIEQUAL(getHighlightedSelection(ed), panel->getSearchScope(), ed->document()->cursor(scopey1,scopex1,scopey2,scopex2));
+--
+1.7.7.6
+
@@ -0,0 +1,61 @@
+From 2ae917fad7cd4e5d3043e3ab3f1cfe4faa63f532 Mon Sep 17 00:00:00 2001
+From: Haikel Guemar <haikel.guemar@sysfera.com>
+Date: Thu, 28 Jul 2011 16:55:32 +0200
+Subject: [PATCH 1/3] viewers: use xdg-open
+
+---
+ buildmanager.cpp | 22 +++++-----------------
+ 1 files changed, 5 insertions(+), 17 deletions(-)
+
+diff --git buildmanager.cpp buildmanager.cpp
+index 1441564..d8986bb 100644
+--- buildmanager.cpp
++++ buildmanager.cpp
+@@ -460,23 +460,11 @@ QString BuildManager::guessCommandName(LatexCommand cmd) {
+ // kdvi "file:%.dvi#src:@ %.tex"
+ switch (cmd) {
+ case CMD_VIEWDVI:
+- switch (x11desktop_env()) {
+- case 3: return "kdvi %.dvi > /dev/null";
+- case 4: return "okular %.dvi > /dev/null";
+- default:return "evince %.dvi > /dev/null";
+- };
++ return "xdg-open %.dvi > /dev/null";
+ case CMD_VIEWPS:
+- switch (x11desktop_env()) {
+- case 3: return "kghostview %.ps > /dev/null";
+- case 4: return "okular %.ps > /dev/null";
+- default:return "evince %.ps > /dev/null";
+- };
++ return "xdg-open %.ps > /dev/null";
+ case CMD_VIEWPDF:
+- switch (x11desktop_env()) {
+- case 3: return "kpdf %.pdf > /dev/null";
+- case 4: return "okular %.pdf > /dev/null";
+- default:return "evince %.pdf > /dev/null";
+- };
++ return "xdg-open %.pdf > /dev/null";
+ default:;
+ }
+ #endif
+@@ -610,7 +598,7 @@ void BuildManager::setLatexCommand(LatexCommand cmd, const QString &cmdString){
+ ((unquote == baseName) ||
+ ( (unquote.endsWith(QDir::separator() + baseName) || unquote.endsWith("/" + baseName))
+ && (!unquote.contains(" ") || (!unquote.contains('"') && unquote != trimmed)) //spaces mean options, if not everything is quoted
+- && (QFileInfo(unquote).exists())
++ && (QFileInfo(unquote).exists())
+ )
+ ))
+ commands[cmd] = cmdString + " " + defaultCommandOptions(cmd);
+@@ -619,7 +607,7 @@ void BuildManager::setLatexCommand(LatexCommand cmd, const QString &cmdString){
+ }
+ }
+
+-QString BuildManager::getLatexCommand(LatexCommand cmd){
++QString BuildManager::getLatexCommand(LatexCommand cmd){
+ return commands[cmd];
+ }
+ QString BuildManager::getLatexCommandForDisplay(LatexCommand cmd){
+--
+1.7.4.4
+
Oops, something went wrong.

0 comments on commit 0768547

Please sign in to comment.