diff --git a/app-misc/gentoo/gentoo-0.19.13.ebuild b/app-misc/gentoo/gentoo-0.19.13.ebuild
index 1e7cb2dc4b77..2634d5cd3505 100644
--- a/app-misc/gentoo/gentoo-0.19.13.ebuild
+++ b/app-misc/gentoo/gentoo-0.19.13.ebuild
@@ -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-misc/gentoo/gentoo-0.19.13.ebuild,v 1.1 2012/03/28 15:42:29 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gentoo/gentoo-0.19.13.ebuild,v 1.2 2012/05/23 05:29:45 jdhore Exp $
EAPI=4
inherit autotools eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="nls"
RDEPEND=">=x11-libs/gtk+-2.24:2
diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
index 636b4385e6d5..6095eebe0ef3 100644
--- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
@@ -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/libreoffice/libreoffice-3.5.9999.ebuild,v 1.45 2012/05/13 21:36:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.46 2012/05/23 08:45:10 scarabeus Exp $
EAPI=4
@@ -227,7 +227,7 @@ pkg_pretend() {
if use postgres; then
pgslot=$(postgresql-config show)
if [[ ${pgslot//.} < 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
die "PostgreSQL slot is not set to 9.0 or higher."
fi
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 1e48f0c4fa40..839e882e3b0b 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -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/libreoffice/libreoffice-9999-r2.ebuild,v 1.73 2012/05/13 21:36:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.74 2012/05/23 08:45:10 scarabeus Exp $
EAPI=4
@@ -254,7 +254,7 @@ pkg_pretend() {
if use postgres; then
pgslot=$(postgresql-config show)
if [[ ${pgslot//.} < 90 ]] ; then
- eerror "PostgreSQL slot must be set to 9.0 or higher."
+ eerror "PostgreSQL slot must be set to 9.0 or higher."
eerror " postgresql-config set 9.0"
die "PostgreSQL slot is not set to 9.0 or higher."
fi
diff --git a/app-officeext/barcode/barcode-1.3.5.0.ebuild b/app-officeext/barcode/barcode-1.3.5.0.ebuild
index f2a59f8a2090..f87e351cfddc 100644
--- a/app-officeext/barcode/barcode-1.3.5.0.ebuild
+++ b/app-officeext/barcode/barcode-1.3.5.0.ebuild
@@ -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-officeext/barcode/barcode-1.3.5.0.ebuild,v 1.1 2012/05/09 16:47:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/barcode/barcode-1.3.5.0.ebuild,v 1.2 2012/05/23 08:54:32 scarabeus Exp $
EAPI=4
@@ -15,7 +15,7 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/${PN}/releases/${PV}
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="virtual/ooo"
diff --git a/app-officeext/ct2n/ct2n-1.4.0.ebuild b/app-officeext/ct2n/ct2n-1.4.0.ebuild
index 147204fc3493..d71bdcd67ac9 100644
--- a/app-officeext/ct2n/ct2n-1.4.0.ebuild
+++ b/app-officeext/ct2n/ct2n-1.4.0.ebuild
@@ -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-officeext/ct2n/ct2n-1.4.0.ebuild,v 1.1 2012/05/09 18:11:28 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/ct2n/ct2n-1.4.0.ebuild,v 1.2 2012/05/23 08:54:32 scarabeus Exp $
EAPI=4
@@ -16,7 +16,7 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/${PN}-convert-text-t
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="virtual/ooo"
diff --git a/app-officeext/dmaths/dmaths-3.4.2.2.ebuild b/app-officeext/dmaths/dmaths-3.4.2.2.ebuild
index c604afeb4934..f5e27dd5a9b2 100644
--- a/app-officeext/dmaths/dmaths-3.4.2.2.ebuild
+++ b/app-officeext/dmaths/dmaths-3.4.2.2.ebuild
@@ -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-officeext/dmaths/dmaths-3.4.2.2.ebuild,v 1.1 2012/05/10 09:39:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/dmaths/dmaths-3.4.2.2.ebuild,v 1.2 2012/05/23 08:54:33 scarabeus Exp $
EAPI=4
@@ -15,7 +15,7 @@ SRC_URI="http://extensions.libreoffice.org/extension-center/${PN}/releases/${PV}
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="virtual/ooo"
diff --git a/app-officeext/languagetool/languagetool-1.7.ebuild b/app-officeext/languagetool/languagetool-1.7.ebuild
index 4df66419b3b1..617e98e291e7 100644
--- a/app-officeext/languagetool/languagetool-1.7.ebuild
+++ b/app-officeext/languagetool/languagetool-1.7.ebuild
@@ -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-officeext/languagetool/languagetool-1.7.ebuild,v 1.2 2012/05/09 16:13:45 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/languagetool/languagetool-1.7.ebuild,v 1.3 2012/05/23 08:54:32 scarabeus Exp $
EAPI=4
@@ -18,7 +18,7 @@ SRC_URI="http://www.languagetool.org/download/${MY_P}.oxt"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND=""
diff --git a/app-officeext/ooo2gd/ooo2gd-3.0.0.ebuild b/app-officeext/ooo2gd/ooo2gd-3.0.0.ebuild
index a246489bd282..2a44a4928afa 100644
--- a/app-officeext/ooo2gd/ooo2gd-3.0.0.ebuild
+++ b/app-officeext/ooo2gd/ooo2gd-3.0.0.ebuild
@@ -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-officeext/ooo2gd/ooo2gd-3.0.0.ebuild,v 1.2 2012/05/09 16:31:19 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/ooo2gd/ooo2gd-3.0.0.ebuild,v 1.3 2012/05/23 08:54:32 scarabeus Exp $
EAPI=4
OO_EXTENSIONS=(
@@ -14,7 +14,7 @@ SRC_URI="http://ooo2gd.googlecode.com/files/${PN}_${PV}.oxt"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="virtual/ooo[java]"
diff --git a/app-officeext/texmaths/texmaths-0.35.ebuild b/app-officeext/texmaths/texmaths-0.35.ebuild
index 8dfa2042cbce..817dea82bcca 100644
--- a/app-officeext/texmaths/texmaths-0.35.ebuild
+++ b/app-officeext/texmaths/texmaths-0.35.ebuild
@@ -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-officeext/texmaths/texmaths-0.35.ebuild,v 1.1 2012/05/09 16:16:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-officeext/texmaths/texmaths-0.35.ebuild,v 1.2 2012/05/23 08:54:32 scarabeus Exp $
EAPI=4
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.oxt"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND=""
diff --git a/app-text/calibre/calibre-0.8.48.ebuild b/app-text/calibre/calibre-0.8.48.ebuild
index c174f4199f3b..560215463077 100644
--- a/app-text/calibre/calibre-0.8.48.ebuild
+++ b/app-text/calibre/calibre-0.8.48.ebuild
@@ -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-text/calibre/calibre-0.8.48.ebuild,v 1.2 2012/05/11 23:09:42 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.48.ebuild,v 1.3 2012/05/23 05:50:39 jdhore Exp $
EAPI=4
PYTHON_DEPEND=2:2.7
@@ -14,7 +14,7 @@ SRC_URI="http://sourceforge.net/projects/calibre/files/${PV}/${P}.tar.xz"
LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
SLOT="0"
diff --git a/app-text/epubcheck/Manifest b/app-text/epubcheck/Manifest
new file mode 100644
index 000000000000..95280f01b460
--- /dev/null
+++ b/app-text/epubcheck/Manifest
@@ -0,0 +1 @@
+DIST epubcheck-src-1.1.zip 2442421 RMD160 2a3033047961bf30327c9ee49bcb095072da09c2 SHA1 4d62e2f96fe94995cdbc867108e8880eeec818c2 SHA256 f9db760358b34d9d98d243156e38f905e0f8735d26b8bf3550e3b108f2436be9
diff --git a/app-text/epubcheck/epubcheck-1.1.ebuild b/app-text/epubcheck/epubcheck-1.1.ebuild
new file mode 100644
index 000000000000..b0540e7da3f8
--- /dev/null
+++ b/app-text/epubcheck/epubcheck-1.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/epubcheck/epubcheck-1.1.ebuild,v 1.1 2012/05/23 05:32:57 flameeyes Exp $
+
+EAPI=4
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Tool to validate IDPF EPUB files"
+HOMEPAGE="https://code.google.com/p/epubcheck/"
+SRC_URI="https://${PN}.googlecode.com/files/${PN}-src-${PV}.zip"
+
+LICENSE="as-is BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+COMMON_DEP="dev-java/jigsaw:0
+ dev-java/saxon:6.5"
+
+RDEPEND=">=virtual/jre-1.5
+ ${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.5
+ app-arch/unzip
+ ${COMMON_DEP}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ rm -f lib/*.jar
+
+ java-pkg_jar-from --into lib/ jigsaw
+ java-pkg_jar-from --into lib/ saxon-6.5
+
+ cd lib/
+ ln -s $(java-config --tools)
+}
+
+src_compile() {
+ eant buildJar
+}
+
+src_test() {
+ java -cp "$(java-pkg_getjars jigsaw,saxon-6.5):dist/${P}.jar" \
+ com.adobe.epubcheck.autotest.AutoTest testdocs/general/tests.xml testdocs/general/ \
+ || die "tests failed"
+}
+
+src_install() {
+ java-pkg_newjar dist/${P}.jar ${PN}.jar
+
+ java-pkg_dolauncher ${PN} --main com.adobe.epubcheck.tool.Checker
+
+ dodoc README.txt
+}
diff --git a/app-text/epubcheck/metadata.xml b/app-text/epubcheck/metadata.xml
new file mode 100644
index 000000000000..63ac5653603a
--- /dev/null
+++ b/app-text/epubcheck/metadata.xml
@@ -0,0 +1,7 @@
+
+
+
+
+ flameeyes@gentoo.org
+
+
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index 52d35469c067..300561df0755 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,2 +1 @@
-DIST libwps-0.2.4.tar.xz 271784 RMD160 693969eeb90b29bc5d34fa31f038e7e142d80f42 SHA1 bc32ac4c566191ffa51161cceacdffc931692f25 SHA256 40e7ec96e7715b2063b7fe87ff679956558e46bb3f1ca9f86b3bab6e3f2596d6
DIST libwps-0.2.6.tar.xz 288712 RMD160 bda88ef9de4e6e710efa745c20434fda63601120 SHA1 89696592cfe51b89fecabb3b64fe6c6a8b4ecb39 SHA256 622813b89755603a13b8e39ce5e0ff013193b7b9610081e58bdd282ef7f42162
diff --git a/app-text/libwps/libwps-0.2.4.ebuild b/app-text/libwps/libwps-0.2.4.ebuild
deleted file mode 100644
index c4c1869982b8..000000000000
--- a/app-text/libwps/libwps-0.2.4.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwps/libwps-0.2.4.ebuild,v 1.8 2012/05/14 20:00:15 scarabeus Exp $
-
-EAPI=4
-
-DESCRIPTION="Microsoft Works file word processor format import filter library"
-HOMEPAGE="http://libwps.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc debug static-libs"
-
-RDEPEND="
- app-text/libwpd:0.9
- dev-libs/boost
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
-"
-
-src_configure() {
- econf \
- --disable-werror \
- $(use_enable static-libs static) \
- --docdir=/usr/share/doc/${PF} \
- $(use_with doc docs) \
- $(use_enable debug)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -delete
-}
diff --git a/app-text/libwps/libwps-0.2.6.ebuild b/app-text/libwps/libwps-0.2.6.ebuild
index 94d2e7f6caa9..0d86c16cb192 100644
--- a/app-text/libwps/libwps-0.2.6.ebuild
+++ b/app-text/libwps/libwps-0.2.6.ebuild
@@ -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-text/libwps/libwps-0.2.6.ebuild,v 1.1 2012/05/14 20:04:52 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwps/libwps-0.2.6.ebuild,v 1.3 2012/05/23 08:53:30 scarabeus Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="doc debug static-libs"
RDEPEND="
diff --git a/app-text/llpp/llpp-12.ebuild b/app-text/llpp/llpp-12.ebuild
index 78dd1c61ae5d..2f2ec38ade0b 100644
--- a/app-text/llpp/llpp-12.ebuild
+++ b/app-text/llpp/llpp-12.ebuild
@@ -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-text/llpp/llpp-12.ebuild,v 1.1 2012/04/29 03:56:55 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/llpp/llpp-12.ebuild,v 1.2 2012/05/23 06:57:13 jdhore Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE=""
RDEPEND="media-libs/freetype
diff --git a/app-text/mupdf/mupdf-1.0.ebuild b/app-text/mupdf/mupdf-1.0.ebuild
index e61e476df4f8..570bcefef8f1 100644
--- a/app-text/mupdf/mupdf-1.0.ebuild
+++ b/app-text/mupdf/mupdf-1.0.ebuild
@@ -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-text/mupdf/mupdf-1.0.ebuild,v 1.4 2012/05/13 18:49:47 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/mupdf/mupdf-1.0.ebuild,v 1.5 2012/05/23 06:57:54 jdhore Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI=" http://${PN}.googlecode.com/files/${P}-source.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="X vanilla"
RDEPEND="media-libs/freetype:2
diff --git a/dev-ada/tash/metadata.xml b/dev-ada/tash/metadata.xml
index aec150231c3f..263dc4a63e72 100644
--- a/dev-ada/tash/metadata.xml
+++ b/dev-ada/tash/metadata.xml
@@ -1,5 +1,5 @@
-ada
+ ada
diff --git a/dev-ada/tash/tash-8.4.1a.ebuild b/dev-ada/tash/tash-8.4.1a.ebuild
index a41be3c1ea76..e9dc9aed2f24 100644
--- a/dev-ada/tash/tash-8.4.1a.ebuild
+++ b/dev-ada/tash/tash-8.4.1a.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ada/tash/tash-8.4.1a.ebuild,v 1.7 2009/04/22 14:16:31 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ada/tash/tash-8.4.1a.ebuild,v 1.8 2012/05/23 08:17:28 jlec Exp $
-inherit gnat
+inherit gnat toolchain-funcs
-DESCRIPTION="Tash provides tcl Ada bindings"
+DESCRIPTION="tcl Ada bindings"
HOMEPAGE="http://tcladashell.sourceforge.net/index.htm"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
@@ -16,16 +16,16 @@ IUSE=""
DEPEND="virtual/ada
=dev-lang/tcl-8.4*
=dev-lang/tk-8.4*"
-
RDEPEND=${DEPEND}
lib_compile() {
- gcc -c -O2 -o obj/tclmacro.o src/tclmacro.c && \
- gcc -c -O2 -o obj/tkmacro.o src/tkmacro.c && \
+ CC=${tc-getCC}
+ ${CC} -c ${CFLAGS} -o obj/tclmacro.o src/tclmacro.c && \
+ ${CC} -c ${CFLAGS} -o obj/tkmacro.o src/tkmacro.c && \
gnatmake -Pbuild_stat || die "building static lib failed"
- gcc -c -O2 -fPIC -o obj_dyn/tclmacro.o src/tclmacro.c && \
- gcc -c -O2 -fPIC -o obj_dyn/tkmacro.o src/tkmacro.c && \
+ ${CC} -c ${CFLAGS} -fPIC -o obj_dyn/tclmacro.o src/tclmacro.c && \
+ ${CC} -c ${CFLAGS} -fPIC -o obj_dyn/tkmacro.o src/tkmacro.c && \
gnatmake -Pbuild_dyn || die "building static lib failed"
}
diff --git a/dev-db/virtuoso-odbc/Manifest b/dev-db/virtuoso-odbc/Manifest
index 8e113b2da7be..f890ce940b2f 100644
--- a/dev-db/virtuoso-odbc/Manifest
+++ b/dev-db/virtuoso-odbc/Manifest
@@ -1,4 +1,2 @@
-DIST VOS-genpatches-6.1.3.tar.bz2 1224 RMD160 5eb64921dbcfe88b2edbd93bb0cb8dca51643ce6 SHA1 7a53a74df02246fed27aafd1afca590ecba118ed SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a
DIST VOS-genpatches-6.1.4.tar.bz2 1224 RMD160 5eb64921dbcfe88b2edbd93bb0cb8dca51643ce6 SHA1 7a53a74df02246fed27aafd1afca590ecba118ed SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a
-DIST virtuoso-opensource-6.1.3.tar.gz 75082765 RMD160 eaae429e90c6735e7b6c06b838e56b031802d37f SHA1 27e0b29e690ddf766941067ef861a7bf166aeac5 SHA256 420f28d6e639eed6c3c722097b5bb4a6830435fc703dfb15a577452d71124666
DIST virtuoso-opensource-6.1.4.tar.gz 100595847 RMD160 e62ec1b42be591747bfa04bab7b196afccf5a84a SHA1 39b2ad28e7ee58b5bca1ba8ff8365266dfa55fa7 SHA256 153f92211a23e05dcf4bde4c94d2963d06321d00f213c50025d740b96140154e
diff --git a/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.3.ebuild b/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.3.ebuild
deleted file mode 100644
index 867adfa38caa..000000000000
--- a/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.3.ebuild,v 1.5 2012/01/13 19:53:18 ago Exp $
-
-EAPI=4
-
-inherit virtuoso
-
-DESCRIPTION="ODBC driver for OpenLink Virtuoso Open-Source Edition"
-
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
- >=dev-libs/openssl-0.9.7i:0
-"
-DEPEND="${RDEPEND}"
-
-VOS_EXTRACT="
- libsrc/Dk
- libsrc/Thread
- libsrc/odbcsdk
- libsrc/util
- binsrc/driver
-"
-
-src_configure() {
- myconf+="
- --disable-static
- --without-iodbc
- "
-
- virtuoso_src_configure
-}
-
-src_install() {
- virtuoso_src_install
-
- # Remove libtool files
- find "${ED}" -name '*.la' -delete
-}
diff --git a/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.4.ebuild b/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.4.ebuild
index ae53ae108229..70b2bdb8b4a4 100644
--- a/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.4.ebuild
+++ b/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.4.ebuild
@@ -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/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.4.ebuild,v 1.6 2012/05/20 14:54:29 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-odbc/virtuoso-odbc-6.1.4.ebuild,v 1.7 2012/05/23 08:28:22 jdhore Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit virtuoso
DESCRIPTION="ODBC driver for OpenLink Virtuoso Open-Source Edition"
-KEYWORDS="amd64 ~arm ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="
diff --git a/dev-db/virtuoso-server/Manifest b/dev-db/virtuoso-server/Manifest
index 8e113b2da7be..f890ce940b2f 100644
--- a/dev-db/virtuoso-server/Manifest
+++ b/dev-db/virtuoso-server/Manifest
@@ -1,4 +1,2 @@
-DIST VOS-genpatches-6.1.3.tar.bz2 1224 RMD160 5eb64921dbcfe88b2edbd93bb0cb8dca51643ce6 SHA1 7a53a74df02246fed27aafd1afca590ecba118ed SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a
DIST VOS-genpatches-6.1.4.tar.bz2 1224 RMD160 5eb64921dbcfe88b2edbd93bb0cb8dca51643ce6 SHA1 7a53a74df02246fed27aafd1afca590ecba118ed SHA256 005d960017363d7f0c9807da6f706ec991e48d2c479f92798ee7df9003b7848a
-DIST virtuoso-opensource-6.1.3.tar.gz 75082765 RMD160 eaae429e90c6735e7b6c06b838e56b031802d37f SHA1 27e0b29e690ddf766941067ef861a7bf166aeac5 SHA256 420f28d6e639eed6c3c722097b5bb4a6830435fc703dfb15a577452d71124666
DIST virtuoso-opensource-6.1.4.tar.gz 100595847 RMD160 e62ec1b42be591747bfa04bab7b196afccf5a84a SHA1 39b2ad28e7ee58b5bca1ba8ff8365266dfa55fa7 SHA256 153f92211a23e05dcf4bde4c94d2963d06321d00f213c50025d740b96140154e
diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unbundle-minizip.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unbundle-minizip.patch
deleted file mode 100644
index e68903a2230e..000000000000
--- a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unbundle-minizip.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ruN virtuoso-opensource-6.1.3/configure.in new/configure.in
---- virtuoso-opensource-6.1.3/configure.in 2011-03-30 01:20:19.000000000 +0200
-+++ new/configure.in 2011-09-21 23:04:42.372977092 +0200
-@@ -1568,14 +1568,15 @@
- then
- AC_CHECK_HEADER(zlib.h)
- AC_CHECK_LIB(z, main, [with_zlib=yes], [with_zlib=internal])
-+ AC_CHECK_LIB(minizip, main, [with_zlib=yes], [with_zlib=internal])
- fi
- if test "x$with_zlib" = "xinternal"
- then
- ZLIB_INC='-I$(top_srcdir)/libsrc/zlib'
- ZLIB_LIB='$(top_builddir)/libsrc/zlib/libz.la'
- else
-- ZLIB_INC=""
-- ZLIB_LIB="-lz"
-+ ZLIB_INC=`pkg-config --cflags zlib minizip`
-+ ZLIB_LIB=`pkg-config --libs zlib minizip`
- fi
- AC_SUBST(ZLIB_INC)
- AC_SUBST(ZLIB_LIB)
-diff -ruN virtuoso-opensource-6.1.3/libsrc/Wi/bif_file.c new/libsrc/Wi/bif_file.c
---- virtuoso-opensource-6.1.3/libsrc/Wi/bif_file.c 2011-02-14 13:30:56.000000000 +0100
-+++ new/libsrc/Wi/bif_file.c 2011-09-21 22:44:52.638977417 +0200
-@@ -6139,10 +6139,7 @@
- return NULL;
- }
-
--
--#include "zlib/contrib/minizip/unzip.h"
--#include "zlib/contrib/minizip/ioapi.c"
--#include "zlib/contrib/minizip/unzip.c"
-+#include "unzip.h"
-
- static caddr_t
- bif_unzip_file (caddr_t * qst, caddr_t * err_ret, state_slot_t ** args)
diff --git a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch b/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch
deleted file mode 100644
index 30046d2332ad..000000000000
--- a/dev-db/virtuoso-server/files/virtuoso-server-6.1.3-unicode.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: libsrc/Wi/xqf.c
-===================================================================
-RCS file: /opldev/source/CVS-MASTER/virtuoso-opensource/libsrc/Wi/xqf.c,v
-retrieving revision 1.21.2.9
-retrieving revision 1.21.2.12
-diff -u -r1.21.2.9 -r1.21.2.12
---- libsrc/Wi/xqf.c 3 Mar 2011 11:56:45 -0000 1.21.2.9
-+++ libsrc/Wi/xqf.c 26 Aug 2011 19:34:56 -0000 1.21.2.12
-@@ -3520,6 +3552,12 @@
- desc = xqf_str_parser_descs + desc_idx;
- if (DV_DB_NULL == arg_dtp)
- return NEW_DB_NULL;
-+ /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */
-+ if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING)
-+ {
-+ res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING);
-+ goto res_ready;
-+ }
- if (DV_STRING != arg_dtp)
- {
- caddr_t err = NULL;
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.3-r2.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.3-r2.ebuild
deleted file mode 100644
index cc0c4fb96b91..000000000000
--- a/dev-db/virtuoso-server/virtuoso-server-6.1.3-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.3-r2.ebuild,v 1.4 2011/12/28 18:46:21 halcy0n Exp $
-
-EAPI=4
-
-inherit virtuoso
-
-DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
-
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="kerberos ldap readline"
-
-# Bug 305077
-#RESTRICT="test"
-
-# Version restriction on sys-libs/zlib, bug #383349
-
-# zeroconf support looks like broken - disabling - last checked around 5.0.12
-# mono support fetches mono source and compiles it manually - disabling for now
-# mono? ( dev-lang/mono )
-COMMON_DEPEND="
- dev-libs/libxml2:2
- >=dev-libs/openssl-0.9.7i:0
- =sys-devel/bison-2.3
- >=sys-devel/flex-2.5.33
-"
-RDEPEND="${COMMON_DEPEND}
- >=dev-db/virtuoso-odbc-${PV}:${SLOT}
-"
-
-VOS_EXTRACT="
- libsrc/Dk
- libsrc/Thread
- libsrc/Tidy
- libsrc/Wi
- libsrc/Xml.new
- libsrc/langfunc
- libsrc/odbcsdk
- libsrc/plugin
- libsrc/util
- binsrc/virtuoso
- binsrc/tests
-"
-
-DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README)
-
-PATCHES=( "${FILESDIR}/${P}-unicode.patch" )
-
-src_prepare() {
- sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
- || die "failed to disable installation of static lib"
-
- virtuoso_src_prepare
-}
-
-src_configure() {
- myconf+="
- $(use_enable kerberos krb)
- $(use_enable ldap openldap)
- $(use_with readline)
- --disable-static
- --disable-hslookup
- --disable-rendezvous
- --without-iodbc
- "
-
- virtuoso_src_configure
-}
-
-src_install() {
- virtuoso_src_install
-
- # Rename isql executables (conflicts with unixODBC)
- mv "${ED}/usr/bin/isql" "${ED}/usr/bin/isql-v" || die
- mv "${ED}/usr/bin/isqlw" "${ED}/usr/bin/isqlw-v" || die
-
- keepdir /var/lib/virtuoso/db
-}
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.4-r1.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.4-r1.ebuild
index 5b946e207eca..71c6b6573f3a 100644
--- a/dev-db/virtuoso-server/virtuoso-server-6.1.4-r1.ebuild
+++ b/dev-db/virtuoso-server/virtuoso-server-6.1.4-r1.ebuild
@@ -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/dev-db/virtuoso-server/virtuoso-server-6.1.4-r1.ebuild,v 1.5 2012/05/20 17:52:41 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.4-r1.ebuild,v 1.6 2012/05/23 08:27:53 jdhore Exp $
EAPI=4
@@ -8,7 +8,7 @@ inherit virtuoso
DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
-KEYWORDS="amd64 ~arm ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="kerberos ldap readline"
# Bug 305077
diff --git a/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild b/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild
deleted file mode 100644
index 43c667fcd2d9..000000000000
--- a/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/virtuoso-server/virtuoso-server-6.1.4.ebuild,v 1.1 2011/11/24 00:53:23 reavertm Exp $
-
-EAPI=4
-
-inherit virtuoso
-
-DESCRIPTION="Server binaries for Virtuoso, high-performance object-relational SQL database"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="kerberos ldap readline"
-
-# Bug 305077
-#RESTRICT="test"
-
-# zeroconf support looks like broken - disabling - last checked around 5.0.12
-# mono support fetches mono source and compiles it manually - disabling for now
-# mono? ( dev-lang/mono )
-COMMON_DEPEND="
- dev-libs/libxml2:2
- >=dev-libs/openssl-0.9.7i:0
- >=sys-libs/zlib-1.2.5.1-r2:0[minizip]
- kerberos? ( app-crypt/mit-krb5 )
- ldap? ( net-nds/openldap )
- readline? ( sys-libs/readline:0 )
-"
-DEPEND="${COMMON_DEPEND}
- sys-apps/gawk
- >=sys-devel/bison-2.3
- >=sys-devel/flex-2.5.33
-"
-RDEPEND="${COMMON_DEPEND}
- ~dev-db/virtuoso-odbc-${PV}:${SLOT}
-"
-
-VOS_EXTRACT="
- libsrc/Dk
- libsrc/Thread
- libsrc/Tidy
- libsrc/Wi
- libsrc/Xml.new
- libsrc/langfunc
- libsrc/odbcsdk
- libsrc/plugin
- libsrc/util
- binsrc/virtuoso
- binsrc/tests
-"
-
-DOCS=(AUTHORS ChangeLog CREDITS INSTALL NEWS README)
-
-PATCHES=(
- "${FILESDIR}/${PN}-6.1.4-unbundle-minizip.patch"
-)
-
-src_prepare() {
- sed -e '/^lib_LTLIBRARIES\s*=.*/s/lib_/noinst_/' -i binsrc/virtuoso/Makefile.am \
- || die "failed to disable installation of static lib"
-
- virtuoso_src_prepare
-}
-
-src_configure() {
- myconf+="
- $(use_enable kerberos krb)
- $(use_enable ldap openldap)
- $(use_with readline)
- --disable-static
- --disable-hslookup
- --disable-rendezvous
- --without-iodbc
- "
-
- virtuoso_src_configure
-}
-
-src_install() {
- virtuoso_src_install
-
- # Rename isql executables (conflicts with unixODBC)
- mv "${ED}/usr/bin/isql" "${ED}/usr/bin/isql-v" || die
- mv "${ED}/usr/bin/isqlw" "${ED}/usr/bin/isqlw-v" || die
-
- keepdir /var/lib/virtuoso/db
-}
diff --git a/dev-embedded/msp430-gcc/Manifest b/dev-embedded/msp430-gcc/Manifest
index ba549ebbd041..99b8e53ffb58 100644
--- a/dev-embedded/msp430-gcc/Manifest
+++ b/dev-embedded/msp430-gcc/Manifest
@@ -5,7 +5,10 @@ DIST gcc-4.6.2-patches-1.0.tar.bz2 12374 RMD160 84aa2e55a8762e2d38161943e1661fd7
DIST gcc-4.6.2.tar.bz2 71995338 RMD160 e7041933b39629f9524848dcf81a1a4c02a225c6 SHA1 691974613b1c1f15ed0182ec539fa54a12dd6f93 SHA256 60b05463dfe18d40d68fb8a71b25b408a01f86cc6ceaf5e6b22238b6b0f450c2
DIST gcc-4.6.3-patches-1.0.tar.bz2 80913 RMD160 8ac621c020ce9712963a076113865bb8c9757138 SHA1 19c4a3252e9e6a4946f470988e007e4cb4d35637 SHA256 b34fc9cdbbfc3c89f644a656e3470d43df454df902d32157318640cdb45b545a
DIST gcc-4.6.3.tar.bz2 71999439 RMD160 9abb2f940d08fc84f2d91b6a6ce8d662ca889269 SHA1 ce317ca5c8185b58bc9300182b534608c578637f SHA256 e8f5853d4eec2f5ebaf8a72ae4d53c436aacf98153b2499f8635b48c4718a093
+DIST gcc-4.7.0-patches-1.0.tar.bz2 12574 RMD160 f315f1d19fce074b2939a43aa85404cb22ffd58f SHA1 f491932f9f679e0a2d89dd4b55d3cab3ca02aa01 SHA256 1fa65da2af62a1968f572c1908c7ca4eb00902781ec144ec65519b9779e3f80d
+DIST gcc-4.7.0.tar.bz2 82518546 RMD160 4ed660b281cdb9bcf98f5c2cf2da105c71db5be4 SHA1 03b8241477a9f8a34f6efe7273d92b9b6dd9fe82 SHA256 a680083e016f656dab7acd45b9729912e70e71bbffcbf0e3e8aa1cccf19dc9a5
DIST msp430-gcc-4.6.1_p20120224.patch.bz2 75117 RMD160 b89d24790c8ad50cc8c3e8d7617a2fb51199a0b4 SHA1 6850022689d8a3a9a603b4fefd855ed35a9c0dbe SHA256 9ae8868220f95cb878f9df22880c0513bccaf635fcfd6478c2c418dbe38662ff
DIST msp430-gcc-4.6.2_p20120311.patch.bz2 76065 RMD160 b6ad0808314cda1bb551d35ee9e75302d1fba9ed SHA1 7e7f70ccdc59b42e422a9159e5320ffc588381cd SHA256 33a7906122c218a108dcab2400298c2f291f98303ac57045b1ab04b1b82b2dd7
DIST msp430-gcc-4.6.2_p20120330.patch.bz2 77344 RMD160 8fec569b996334cdb2a2a124bdc5314c25ade547 SHA1 e3ceb9e712bf7b44504ccf1da114fe5231ab2198 SHA256 a560bb7197c6736d37382085bc4f5527e0e0f7802db54e3d83f6faccd6b1284f
DIST msp430-gcc-4.6.3_p20120406.patch.bz2 77359 RMD160 7b598c407bac3247222a1159125aff9345b0a5f4 SHA1 0eb9b3514496a7d731fb66d25bfbd24069db50d5 SHA256 b2429dc96490153e122d2b398620d8e153439fce3a153059b103203038fba501
+DIST msp430-gcc-4.7.0_p20120514.patch.bz2 95159 RMD160 7b11d5b381606189dd4b23423289c67a5b70f04f SHA1 8c1f26deb871b8491b8cfd1924691587501a8106 SHA256 540aa5230e21f1fb2a9430b7c8d8f9c4ca4a186293bc701d196ff8c10cbaba12
diff --git a/dev-embedded/msp430-gcc/msp430-gcc-4.7.0_p20120514.ebuild b/dev-embedded/msp430-gcc/msp430-gcc-4.7.0_p20120514.ebuild
new file mode 100644
index 000000000000..14dbfcb495cd
--- /dev/null
+++ b/dev-embedded/msp430-gcc/msp430-gcc-4.7.0_p20120514.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-embedded/msp430-gcc/msp430-gcc-4.7.0_p20120514.ebuild,v 1.1 2012/05/23 08:58:47 radhermit Exp $
+
+EAPI="4"
+
+PATCH_VER="1.0"
+BRANCH_UPDATE=""
+
+inherit toolchain
+
+DESCRIPTION="The GNU Compiler Collection for MSP430 microcontrollers"
+LICENSE="GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~radhermit/distfiles/${P}.patch.bz2"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ elibc_glibc? ( >=sys-libs/glibc-2.8 )
+ ${CATEGORY}/msp430-binutils"
+
+pkg_pretend() {
+ is_crosscompile || die "Only cross-compile builds are supported"
+}
+
+src_prepare() {
+ epatch "${DISTDIR}"/${P}.patch.bz2
+}
diff --git a/dev-python/PyQt4/PyQt4-4.9.1.ebuild b/dev-python/PyQt4/PyQt4-4.9.1.ebuild
index 144b8b733729..4b5d2038de3d 100644
--- a/dev-python/PyQt4/PyQt4-4.9.1.ebuild
+++ b/dev-python/PyQt4/PyQt4-4.9.1.ebuild
@@ -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/dev-python/PyQt4/PyQt4-4.9.1.ebuild,v 1.11 2012/05/21 19:34:29 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/PyQt4/PyQt4-4.9.1.ebuild,v 1.12 2012/05/23 04:48:54 jdhore Exp $
EAPI=4
@@ -27,7 +27,7 @@ fi
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="X assistant dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns"
REQUIRED_USE="
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.6.1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.6.1.ebuild
index af3b641f4288..8ac19455bd26 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.6.1.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.6.1.ebuild
@@ -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/dev-python/qscintilla-python/qscintilla-python-2.6.1.ebuild,v 1.3 2012/04/24 17:02:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/qscintilla-python/qscintilla-python-2.6.1.ebuild,v 1.4 2012/05/23 04:47:35 jdhore Exp $
EAPI="3"
PYTHON_EXPORT_PHASE_FUNCTIONS="1"
@@ -17,7 +17,7 @@ SRC_URI="http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="debug"
DEPEND=">=dev-python/sip-4.10
diff --git a/dev-python/sip/sip-4.13.2-r1.ebuild b/dev-python/sip/sip-4.13.2-r1.ebuild
index 5ba29d6807f1..c0997e8e1eb8 100644
--- a/dev-python/sip/sip-4.13.2-r1.ebuild
+++ b/dev-python/sip/sip-4.13.2-r1.ebuild
@@ -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/dev-python/sip/sip-4.13.2-r1.ebuild,v 1.4 2012/04/26 02:11:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.13.2-r1.ebuild,v 1.5 2012/05/23 04:50:03 jdhore Exp $
EAPI="4"
PYTHON_DEPEND="*"
@@ -16,7 +16,7 @@ SRC_URI="http://www.riverbankcomputing.com/static/Downloads/${PN}${PV%%.*}/${P}.
LICENSE="|| ( GPL-2 GPL-3 sip )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="debug doc"
DEPEND=""
diff --git a/dev-python/whoosh/whoosh-2.4.0.ebuild b/dev-python/whoosh/whoosh-2.4.0.ebuild
index 2fd85c365f0e..fbdeaec58b78 100644
--- a/dev-python/whoosh/whoosh-2.4.0.ebuild
+++ b/dev-python/whoosh/whoosh-2.4.0.ebuild
@@ -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/dev-python/whoosh/whoosh-2.4.0.ebuild,v 1.1 2012/05/22 12:32:54 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/whoosh/whoosh-2.4.0.ebuild,v 1.2 2012/05/23 05:58:48 mr_bones_ Exp $
EAPI="3"
@@ -33,4 +33,4 @@ src_install() {
insinto "/usr/share/doc/${PF}/"
doins -r docs/build/html/_sources/* || die
fi
-}
\ No newline at end of file
+}
diff --git a/dev-tex/latex-beamer/Manifest b/dev-tex/latex-beamer/Manifest
index 595afffe1d34..35e3b47e7fba 100644
--- a/dev-tex/latex-beamer/Manifest
+++ b/dev-tex/latex-beamer/Manifest
@@ -1,3 +1,4 @@
DIST latex-beamer-3.11.zip 2881467 RMD160 3c2efde491ba0372a2aad5a6fb3161265c363dca SHA1 f9dd79654d7f07c7c062ab8a225a28ae6c16034c SHA256 9b36a8b4c1493344d66ef1058aa25f8b99ab616d9353d541d1f4100f16fdf260
DIST latex-beamer-3.16.zip 4259922 RMD160 b3d789020cc4aa577fe84d4f04052a4edc989399 SHA1 fc51286fb3f1607df80a76f0f28143deec6072b0 SHA256 07837fcaa783a1d0452ba39e03f272c52e6d73f6d9f40f5ca3094116fbabe6ab
DIST latex-beamer-3.17.zip 4260916 RMD160 92f8151cc0f1a58767ef182efdb7b6f26f6a8287 SHA1 8994cc052b2064a3b64dbad7672508d8fdc5e76c SHA256 2af9a33f6e3b860dbfa11ec21f02f8922b2f75a41da97a054fe469b389ee0824
+DIST latex-beamer-3.19.zip 4343622 RMD160 38a3c2ee7839896aba71a3bccc8dd6eeaf1d7a86 SHA1 615fcb24c74db1aefb83c6b01ed67f6542d59145 SHA256 c843260552c136b0f9bb782bccbf92acbef4681e7fe8b7655d90c9e6fa921ec7
diff --git a/dev-tex/latex-beamer/latex-beamer-3.19.ebuild b/dev-tex/latex-beamer/latex-beamer-3.19.ebuild
new file mode 100644
index 000000000000..a85eb587a532
--- /dev/null
+++ b/dev-tex/latex-beamer/latex-beamer-3.19.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-tex/latex-beamer/latex-beamer-3.19.ebuild,v 1.1 2012/05/23 06:47:57 radhermit Exp $
+
+EAPI=4
+
+inherit latex-package
+
+DESCRIPTION="LaTeX class for creating presentations using a video projector"
+HOMEPAGE="http://bitbucket.org/rivanvx/beamer/wiki/Home"
+SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.zip"
+
+LICENSE="GPL-2 FDL-1.2 LPPL-1.3c"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples lyx"
+
+DEPEND="app-arch/unzip
+ lyx? ( app-office/lyx )
+ dev-texlive/texlive-latex"
+RDEPEND=">=dev-tex/pgf-1.10
+ dev-tex/xcolor
+ !dev-tex/translator"
+
+S=${WORKDIR}/beamer
+
+src_install() {
+ insinto /usr/share/texmf-site/tex/latex/beamer
+ doins -r base
+
+ if use lyx ; then
+ insinto /usr/share/lyx/examples
+ doins examples/lyx-based-presentation/*
+ fi
+
+ dodoc AUTHORS ChangeLog README TODO doc/licenses/LICENSE
+
+ if use doc ; then
+ docinto doc
+ dodoc -r doc/*
+ fi
+
+ if use examples ; then
+ rm -f "${S}"/examples/a-lecture/{*.tex~,._beamerexample-lecture-pic*}
+ if ! use lyx ; then
+ einfo "Removing lyx examples as lyx useflag is not set"
+ find "${S}" -name "*.lyx" -print -delete
+ fi
+ dodoc -r examples solutions
+ fi
+}
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index bdde9e8bb3d5..d8a47ebfc038 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,58 +1,40 @@
-DIST eric4-4.4.14.tar.gz 6677208 RMD160 5ce31c30ce6d1a817c67f68abdae0d6ea97c8b92 SHA1 cd706e4eed52e62739980c9b0837f6fd0a0bdedb SHA256 7ff8548c419f3ed09100e84d4c94ffce74bae8eb5ce956bf43f3a79308e86822
DIST eric4-4.5.0.tar.gz 7986864 RMD160 b3eff69618bbb5ab4f10bbfbca3c2f9599c47026 SHA1 4b9112ce55741de60929a7e6defc2b8d717af761 SHA256 213a415fe56e9e2e0dfa12c190b6c2ae26d4a949f8ef0062edcf58f97a4775d3
DIST eric4-4.5.3.tar.gz 8095323 RMD160 a0b83659e8ee80ef7fc799b878335d36ee425fb6 SHA1 edb447adb880645208a19a186216d5159f167a05 SHA256 211a5f41f66b28e9d68f0ab2442a6c07e29e550821f04dd5f78c2407297d1d86
-DIST eric4-i18n-cs-4.4.14.tar.gz 452074 RMD160 cada51a61ab0fe7bf6681da090f187b464a58663 SHA1 f5fce1cb325fdae3ab34ad5b75a37443db7cc1aa SHA256 1b1f74a2ffc173f177e19f8beadc8d11c954359ead15f36e16e2a429d61bf76b
DIST eric4-i18n-cs-4.5.0.tar.gz 456601 RMD160 13ec241835e50e0c6910ad16ab76c2093e5a7c90 SHA1 ddf207c622e0c9730601ccb1d596d37cdca39ab7 SHA256 e5755882e9d580ef90bb5020c6adad983a52861e8711c2c06fe572a43a3e77fb
DIST eric4-i18n-cs-4.5.3.tar.gz 457069 RMD160 caa92ce90b39925334f395003678d3e10c3a56da SHA1 2b44ff4e89e38596a1c98084b0721284ebcc9b68 SHA256 e702946149856ef58f30ba0d11e4a5020703ef81c98a002d36c2460297bae5e6
-DIST eric4-i18n-de-4.4.14.tar.gz 452987 RMD160 2226f13a67d577dd92c254f4f78d195ce8841611 SHA1 bc4795378e73a33e46e7dee6d2e7fbbb6cef4205 SHA256 e66aa50305b12e82d8227d360b226bf25f406f5273fa54e02092608d0b44275b
DIST eric4-i18n-de-4.5.0.tar.gz 468372 RMD160 084dec0bdfa4ba950a10a22b643e5e4596145bf7 SHA1 e1daac3c9972c8d9c1b428232206c39bf10b9a77 SHA256 67e44e8435992731a9154a4aec8f641f84c4c067b14282e2f4fb7a44595d0764
DIST eric4-i18n-de-4.5.3.tar.gz 469432 RMD160 40aaea56d6cf746da8f6242b8d38efb5e979e9b6 SHA1 64e71afd91a8c81296687e4cbb00577d9cf2aa88 SHA256 4b76cfcfe76ff6f4bd99fb6fba5265d7a517264262b5698e9fb9225b6262d853
DIST eric4-i18n-en-4.5.0.tar.gz 126444 RMD160 88bbe0731cc39ba2d8cf3db030d8a1cad5a8cf6b SHA1 35a289b76b6fcd687161499becfe12881e8a0023 SHA256 345cbbc3212f6ebe5d37bb5d339b4a85ec45046d7beb8b1359e0a22807f9be44
DIST eric4-i18n-en-4.5.3.tar.gz 126743 RMD160 7cfdcb91fee464ee63e64192bb812ca9e5b61c0a SHA1 96368dc99874209372674421174e479a4ed67cd7 SHA256 dc15d9f8bda50d7ce6bfbb6f9dc8c0cb915581089e674e12d9e36ce22286f0cb
-DIST eric4-i18n-es-4.4.14.tar.gz 456855 RMD160 ca4e35087137e10481264bda3bc75eab890d01f0 SHA1 9a2be60bbe1e731bc903edf9d7a51f3c8d78405c SHA256 602ba2005a9bafbe3cbcaedaec4c085a1cd14c6c1c71c1ac1db8f3e714356d82
DIST eric4-i18n-es-4.5.0.tar.gz 472467 RMD160 0ed63ae05f48005a19e41fe81691278b9eb158dd SHA1 a4f242af359eca8b0019980bca847626aa82cabf SHA256 c8bd970ef804007976653ab1c5369969855bea755bfebd6ac1844bc2d093a246
DIST eric4-i18n-es-4.5.3.tar.gz 474022 RMD160 715ca413e3402505d025cf9b0afd8f8c9cea52ad SHA1 e9d8bf8d79394ab8e3f321e7e43105cdf7277755 SHA256 368e37ca55779d1ce1db8e9ba0077e8b4593ea730bd365b25259a0bd21b1a7ef
-DIST eric4-i18n-fr-4.4.14.tar.gz 430151 RMD160 f372ca5c8341c2e6c743878f8ed93197234908fc SHA1 54ef2d555b6063fb092150799dd9b7a120b6bac4 SHA256 d9f58894b61b8720fe75762df7475cf023742a466499744b8bc32b6674c2690d
DIST eric4-i18n-fr-4.5.0.tar.gz 471361 RMD160 6c1ed4256341c594f2392cc2e8858079cf47815a SHA1 4e226ca1c627b3279890af249c52fff79ec45624 SHA256 32b21e91e02fc776eb0fc16e01263ae538471ad0b5ed1ef3154f2898377cd69a
DIST eric4-i18n-fr-4.5.3.tar.gz 471882 RMD160 7dfb28a142b0d53d24299d88502294bb2e0840f9 SHA1 fab4a11218edf8875667c623991f097fbe69e4c2 SHA256 5d5e10075bdf01f81a2602dd13299aa4dbd13ac48020ce0269e683832c89d356
-DIST eric4-i18n-it-4.4.14.tar.gz 445334 RMD160 aa9d13630338a8c3c96fd45647086f2ce2b4f49a SHA1 124c13ce61aeb198440916e9642324f75fb6900f SHA256 3fbd0e1b222d197da9bb909385eec99fdb10d7e07aad4b9e4be3bee7f3faf23b
DIST eric4-i18n-it-4.5.0.tar.gz 461086 RMD160 e9c13d3a820dbac0adbe4d136086e38ad6cfc100 SHA1 bab7302a7942d1c2be9396b2c7b427d16c7670aa SHA256 448a9a5142d6430a0725fa7ba680e22a43f86e001ac4923d82eb4995dd2f10ef
DIST eric4-i18n-it-4.5.3.tar.gz 461615 RMD160 58d659cb286174a0b5b41f65c277c7123dadb444 SHA1 c918f547e101b9a51a615071dab7449b58f19e02 SHA256 9d99cff9963d106ce652418440cf225f996bbbd165808663b8abcc2da239e0da
-DIST eric4-i18n-ru-4.4.14.tar.gz 472659 RMD160 04f967c6989cd0a217f95e8bd1bb6fa396abca5a SHA1 9cbd66472798918eeeb4eb1884b3947a9f6f88df SHA256 a4174b538cccf77ed130d8c1414860ac8658600d236adecac29e09fdc601151c
DIST eric4-i18n-ru-4.5.0.tar.gz 478204 RMD160 2b83436aa88feeb0ce1799fc5b98c83234e176ae SHA1 962873750747e9148e9cec4164fc06b0984cd352 SHA256 c06937b19b563963cc6b3bdd99783146a4e9169bdd28c714434d181c9c7a0ab2
DIST eric4-i18n-ru-4.5.3.tar.gz 478775 RMD160 94aaddd315541506529429432ebe343c8aa23aa4 SHA1 fb1b773f45bcd39bc11023096940fe35480a852c SHA256 d98065318ec2b643d35c414ac5f71161d35a03227be2fac28d1320a82c590da0
-DIST eric4-i18n-tr-4.4.14.tar.gz 357758 RMD160 8f83c5a928a5cbd9fa7c558c11c59e8082873260 SHA1 da6981987fe2b1380850a4d51ad271f8400734d7 SHA256 d125de55e8914bad5cd75885488c9e5d548e6066318e150b72e833e5d1a8b78f
DIST eric4-i18n-tr-4.5.0.tar.gz 355691 RMD160 5af83ff7518e40b8b6aca06de6f4ff6e9a4c17ba SHA1 b951044dd011b89b12323ab013484499dde09003 SHA256 3d1016833475af50f02a84031ff06727ed61c8627a89d7e167958d3fdc59eb3c
DIST eric4-i18n-tr-4.5.3.tar.gz 356033 RMD160 a9ed13c1ebc4a1b9586e0d326471e82601d95041 SHA1 a7188761c8b2d04f7ee8380e6d53ada718263ceb SHA256 79096459e4392f326b4f11e1789c42a57cc906c3a10ecfab0ec7660ac23acdb8
-DIST eric4-i18n-zh_CN.GB2312-4.4.14.tar.gz 392204 RMD160 20f0222cd5e6f01c4ca43fc48a727fb46fd1ea35 SHA1 67d612b90ee98b57f01b77ab7bec2285e3ba93fb SHA256 82f1b955817b2026781f937caa5475871f3e9557e0e77c2903a4d36ce1e3c2e7
DIST eric4-i18n-zh_CN.GB2312-4.5.0.tar.gz 388679 RMD160 abb2d6f1953dff64553f40c354c528c4afca2009 SHA1 0dd51e2e0901d0503629ea2d76241acc5adfa67d SHA256 bb3080582edf3512fe9a8eb177dc23e4f9b35e94dc351e83bcb95ad749f853d9
DIST eric4-i18n-zh_CN.GB2312-4.5.3.tar.gz 389004 RMD160 a344f3a239812995619b1513313c598774632084 SHA1 e109e66c837fb37444d246f851e47768e67b879f SHA256 1a0bdfdfaa50b5487f2bb1694e9cea2c929ed9651612544cfde0c4bf5168f4fb
-DIST eric5-5.1.2.tar.gz 7217433 RMD160 e02bae94f338d4e9181d2f3cd18c594f1c9962c6 SHA1 853f67dec620c53b732ec7ec19a87d87fc72dc7e SHA256 14b095affa96d100e67969d6c3626ee611caa7d4497279d8be91775e6ee4d44d
DIST eric5-5.2.0.tar.gz 8832214 RMD160 d5e76a258b18b59a84b75f207d926589afbb6784 SHA1 65d9ca655d455de113543d425882122e82c0a923 SHA256 18fea6c012dce4326629777e8e55d8d56dab0d16497d7ed4924b7e6075838982
DIST eric5-5.2.2.tar.gz 8835270 RMD160 b7f8d166616d7afecfc7e1c015f24f16912a0dcb SHA1 22843abf689508ea9fa6e546b60d47facb1c8fa7 SHA256 5d7a593a3501becd5231dc7c7463cbab38f9f99be4c5ae9961a8a50389979900
-DIST eric5-i18n-cs-5.1.2.tar.gz 502070 RMD160 8f06931229b2e5cbf76abc0543fe70b9e21217f4 SHA1 58ece324be205c8bd6e666a80610f2bf0374a63c SHA256 073425bf1be885e4ec405efb1eda829c7bf86e5b983875da2a9e9d186d487c4d
DIST eric5-i18n-cs-5.2.0.tar.gz 530064 RMD160 428bae008a6fc657a080fe1331f25cb02ed480c6 SHA1 4e3ce610926a56b04cc7a4301f60b8157e0fb96c SHA256 44979acf362742af87bbf572f00b15eb031a3f8378b616cdb4b276e084843f66
DIST eric5-i18n-cs-5.2.2.tar.gz 530091 RMD160 b23ecc5fa261e13ab9b7859ba482bc90a8dcf257 SHA1 bbb6ecea9eb228361d4ece428e9ccbfac410e62f SHA256 8afa8705a97716b8abc308b907cfb6eaf6faa527250a87743deb7c8f8da6f24a
-DIST eric5-i18n-de-5.1.2.tar.gz 531114 RMD160 1d9c37c4eea2022cedeb4622e0fb65cf40ee9d6f SHA1 e51395ddd7d8bb1b4a1282dab46b80a5fb9a0bd1 SHA256 5ea945c17c88eab0bbade1b3dbe7aa76213be26437151cfebd3275ca282622df
DIST eric5-i18n-de-5.2.0.tar.gz 600706 RMD160 ca5e372868e33a7c87e8a05fcd66f81a45077d71 SHA1 f5e7111bfe8e3ffbe69a1fbb56253eee145f4f6b SHA256 e877139f2440506a1884007e820b8592f37ae3136727258ae352af706083e19b
DIST eric5-i18n-de-5.2.2.tar.gz 600801 RMD160 0bf8567ca5c8ba8ce5e5914d61ea58b66be46517 SHA1 9955404dfe9ea8220980fea2c637b5fe67c9f789 SHA256 c867f9356e4772b171b755a5afa014471d141feb056d90d52b78c72888ecbd4d
DIST eric5-i18n-en-5.2.0.tar.gz 162856 RMD160 4a64794d2a9b87fb10b103f6c742505e4aae99dd SHA1 fa1e7d7ff0619b09f154b445ec99e3d7189f3fea SHA256 9ddd8db9d2495c1efd43d51e4919f667420594b200db6ed7f0c18f1afc26eefe
DIST eric5-i18n-en-5.2.2.tar.gz 162892 RMD160 baf7f391166878b0ab7050751a243fd14086af3c SHA1 bc8116f7f7f77e07d4bb4b64e6c54c21cac14655 SHA256 1117a1d19804e48ce16cd467f692eac1500c61bdeff496e82dea7e1d868927f1
-DIST eric5-i18n-es-5.1.2.tar.gz 535570 RMD160 ec08584a1509852d739a2f661e0ee9e5c7bf5c8b SHA1 31ef56a8c3fa245fdedbcfe57628b8934090ea52 SHA256 12c46ddc72b6285924c21daeff62a4964fc9d1529ff760cebbe615822da0b832
DIST eric5-i18n-es-5.2.0.tar.gz 606047 RMD160 db43cb4642f7f0c06a5f1fcd2ee24613cfb6748c SHA1 a6116f5d404718979fa57713593dfc13dd6d151f SHA256 09f086f6f76ad3476c975fc082680ae04e626b56b450f9f5fd7c8f954bd33f1f
DIST eric5-i18n-es-5.2.2.tar.gz 605005 RMD160 1e8ad473a5a2ba45af0669ee9bd8f9d725a8401f SHA1 594795a46043c08ed6ecd838c3c5a4afc4fbe8bd SHA256 1148e28c0ff20b2ad624f4440d44dcba305d31be80ea94c05be624f9f8b81b26
-DIST eric5-i18n-fr-5.1.2.tar.gz 423505 RMD160 7f2097b121e1d964cfb9a63fae5b59b6649433f8 SHA1 54b7e081745415c8bb2dadd2036a8923db00c706 SHA256 853fe42e119df2246d533e25ee9a73ffb48239b851b0c2c7b5ce88f0c788c346
DIST eric5-i18n-fr-5.2.0.tar.gz 470679 RMD160 ff9ffae4dd6bdb8049b6727d3879f2532f6577b5 SHA1 bfc418ea36244aea27f9d85bae42eb3ae1878e0f SHA256 6c6e498db3245938e318c8ca9f02e85b9e096e9c7f6db9af277ff0ccf9c88a8e
DIST eric5-i18n-fr-5.2.2.tar.gz 470781 RMD160 ce487280df33845e2994e52ffacfd4c3b0b856f8 SHA1 ed05db390a7b130187f7f07254e07f6e33048c55 SHA256 f7f27011e1abece8cc7e428cd2e64b4bbb7a6ea75413a730ab6c8ecf68700199
-DIST eric5-i18n-it-5.1.2.tar.gz 523308 RMD160 b40ac0d64cfbf5d913388e4c7a5643e499c22440 SHA1 7efdf31dea4cd7f9617ba507b1ded2c95ad570c1 SHA256 0285b7c8515ee168885407ad10f1d45a352200ff0bca805bb8c49b8a3328aa06
DIST eric5-i18n-it-5.2.0.tar.gz 547717 RMD160 0f76d72c78382a39206a53628dcee17c28b33b2d SHA1 be5e360cebdcf67bc96510ed3d11f9f20d800f5c SHA256 421b503b9432f2da41a174cd44506ad3201abe19c5f6176c7a58a5f14242006c
DIST eric5-i18n-it-5.2.2.tar.gz 547787 RMD160 675f2a389f3903139d977e4289087d48355e313d SHA1 e803bbc79d4b5fa7b510f76f8d57ec730f558a63 SHA256 431da789e2bec80b9b4a718d07922572ecf8ce87fa954cb2f8289a75f28c5673
-DIST eric5-i18n-ru-5.1.2.tar.gz 549398 RMD160 fb54c30e645fbf5451985a45b5984b55f659e86f SHA1 2687a6e17e91f6fabc79926d258fed31d1545841 SHA256 80fc756c905bbeaa837b70a96bf6487267f451b2edee8b172b4acea014cbd947
DIST eric5-i18n-ru-5.2.0.tar.gz 576765 RMD160 ca71a0534ecf087cdc8c33ccb6a47407ca79b90b SHA1 668d5fc1611611ed8f14960bcbbf1a0ab0004c31 SHA256 8b884c75f11882857987e17940e3ffbe5d524dc8288a8a33e74c4be3a1561d0d
DIST eric5-i18n-ru-5.2.2.tar.gz 576848 RMD160 93b401f7c950a4e07ba3ce37ed0bb68ba70aef87 SHA1 7afd5cfdb2f9517a698f3e7e0ea5d8201e2e6a95 SHA256 077e300390c97d61149ca3133a6750f2080ab1b7b6ad9dc140ae96c6eb7f8c6b
-DIST eric5-i18n-tr-5.1.2.tar.gz 424715 RMD160 9133070f96cc34347a4410d02d06de5b933799ea SHA1 430b26dab77138a73a5ba6792604b256b6b64c85 SHA256 95615b371e709979a660398eae905f7736b31e309f03ac3ae15ba9e962a79f0a
DIST eric5-i18n-tr-5.2.0.tar.gz 450185 RMD160 1b014674cff7067be972212e84b7271b1c54ea6f SHA1 84bacb905d68bc6905668dd1d70c23eee8ea18d8 SHA256 8ee63dbb8e60aef5952070045f991afa046f00600a5e2c1b59ccb8527e78b40f
DIST eric5-i18n-tr-5.2.2.tar.gz 450198 RMD160 301324f6c942efcffe0a26a3707df6cec7807bed SHA1 525ad741ef1491c339a2f0d228c31bce8c459499 SHA256 ea8754403413cc18a96b9a10e7e9abbd2c4c5949b5da4c09acde822603ec62c1
-DIST eric5-i18n-zh_CN.GB2312-5.1.2.tar.gz 388663 RMD160 58f55d52a36442c60ef09d1107241ba6bc0de381 SHA1 81cd1474a5c91b4a8d1a081bdba40ff5d90247ac SHA256 ccc071162d8675beeb5afca2548632421b1e61e54abced6c7750816db4e03df7
DIST eric5-i18n-zh_CN.GB2312-5.2.0.tar.gz 436144 RMD160 b349bf407f2bc7e10f661898b06ddd4b34ad4e72 SHA1 b78df48cbde03c528593b2d85a3632db8e412562 SHA256 9d161d2f6e181d6205e7377c87b17310ba6fbf2a5ea94825be336e3b9fef304c
DIST eric5-i18n-zh_CN.GB2312-5.2.2.tar.gz 436100 RMD160 3bac55e146e83817810a9f0e364378af6c0f7fa7 SHA1 6bd3e424fd1cd1fb3ebed80f038a96e52d95aee8 SHA256 ea6af74c413948ebae85a7e171854bd8f808c7ee3daaba928b3657912dd7a9e2
diff --git a/dev-util/eric/eric-4.4.14.ebuild b/dev-util/eric/eric-4.4.14.ebuild
deleted file mode 100644
index ce90c11c855e..000000000000
--- a/dev-util/eric/eric-4.4.14.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.4.14.ebuild,v 1.4 2012/02/28 15:03:24 pesa Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS="1"
-# 2.4 and 2.5 are restricted to avoid conditional dependency on dev-python/simplejson.
-RESTRICT_PYTHON_ABIS="2.4 2.5 3.* *-jython 2.7-pypy-*"
-
-inherit eutils python
-
-MY_PN="${PN}${PV%%.*}"
-MY_PV="${PV/_pre/-snapshot-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
-HOMEPAGE="http://eric-ide.python-projects.org/"
-BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
-SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="kde spell"
-
-DEPEND="dev-python/PyQt4[assistant,svg,webkit,X]
- dev-python/qscintilla-python
- kde? ( kde-base/pykde4 )"
-RDEPEND="${DEPEND}
- >=dev-python/chardet-2.0
- dev-python/coverage
- >=dev-python/pygments-1.1"
-PDEPEND="spell? ( dev-python/pyenchant )"
-
-LANGS="cs de es fr it ru tr zh_CN"
-for L in ${LANGS}; do
- SRC_URI="${SRC_URI}
- linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
- IUSE="${IUSE} linguas_${L}"
-done
-unset L
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
-
-src_prepare() {
- epatch "${FILESDIR}/eric-4.4-no-interactive.patch"
- epatch "${FILESDIR}/remove_coverage.patch"
- use kde || epatch "${FILESDIR}/eric-4.4-no-pykde.patch"
-
- # Delete internal copies of dev-python/chardet, dev-python/coverage, dev-python/pygments and dev-python/simplejson.
- rm -fr eric/ThirdParty
- rm -fr eric/DebugClients/Python{,3}/coverage
-}
-
-src_install() {
- installation() {
- "$(PYTHON)" install.py \
- -z \
- -b "${EPREFIX}/usr/bin" \
- -i "${T}/images/${PYTHON_ABI}" \
- -d "${EPREFIX}$(python_get_sitedir)" \
- -c
- }
- python_execute_function installation
- python_merge_intermediate_installation_images "${T}/images"
-
- doicon eric/icons/default/eric.png || die "doicon failed"
- make_desktop_entry "${MY_PN} --nosplash" ${MY_PN} eric "Development;IDE;Qt"
-}
-
-pkg_postinst() {
- python_mod_optimize ${MY_PN}{,config.py,plugins}
-
- elog
- elog "If you want to use Eric with mod_python, have a look at"
- elog "\"${EROOT}$(python_get_sitedir -b -f)/${MY_PN}/patch_modpython.py\"."
- elog
- elog "The following packages will give Eric extended functionality:"
- elog " dev-python/pylint"
- elog " dev-python/pysvn"
- elog
- elog "This version has a plugin interface with plugin-autofetch from"
- elog "the application itself. You may want to check those as well."
- elog
-}
-
-pkg_postrm() {
- python_mod_cleanup ${MY_PN}{,config.py,plugins}
-}
diff --git a/dev-util/eric/eric-4.5.0.ebuild b/dev-util/eric/eric-4.5.0.ebuild
index d1143505a788..a6450130ca6c 100644
--- a/dev-util/eric/eric-4.5.0.ebuild
+++ b/dev-util/eric/eric-4.5.0.ebuild
@@ -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/dev-util/eric/eric-4.5.0.ebuild,v 1.2 2012/04/30 14:37:32 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.0.ebuild,v 1.3 2012/05/23 06:03:13 jdhore Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -21,7 +21,7 @@ BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="kde spell"
DEPEND="
diff --git a/dev-util/eric/eric-5.1.2.ebuild b/dev-util/eric/eric-5.1.2.ebuild
deleted file mode 100644
index d8e9a92dce4f..000000000000
--- a/dev-util/eric/eric-5.1.2.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.1.2.ebuild,v 1.4 2012/02/28 15:03:24 pesa Exp $
-
-EAPI="3"
-PYTHON_DEPEND="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.* *-jython 2.7-pypy-*"
-
-inherit eutils python
-
-MY_PN="${PN}${PV%%.*}"
-MY_PV="${PV/_pre/-snapshot-}"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="A full featured Python IDE using PyQt4 and QScintilla"
-HOMEPAGE="http://eric-ide.python-projects.org/"
-BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
-SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="spell"
-
-DEPEND=">=dev-python/PyQt4-4.7[assistant,svg,webkit,X]
- >=dev-python/qscintilla-python-2.4"
-RDEPEND="${DEPEND}
- >=dev-python/chardet-2.0.1
- >=dev-python/coverage-3.2
- >=dev-python/pygments-1.4"
-PDEPEND="spell? ( dev-python/pyenchant )"
-
-LANGS="cs de es fr it ru tr zh_CN"
-for L in ${LANGS}; do
- SRC_URI="${SRC_URI}
- linguas_${L}? ( ${BASE_URI}/${MY_PN}-i18n-${L/zh_CN/zh_CN.GB2312}-${MY_PV}.tar.gz )"
- IUSE="${IUSE} linguas_${L}"
-done
-unset L
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_VERSIONED_EXECUTABLES=("/usr/bin/.*")
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-5.0.2-remove_coverage.patch"
-
- # Avoid file collisions between different slots of Eric.
- sed -e "s/^Icon=eric$/&${SLOT}/" -i eric/${MY_PN}.desktop || die "sed failed"
- sed -e "s/\([^[:alnum:]]\)eric\.png\([^[:alnum:]]\)/\1eric5.png\2/" -i $(grep -lr eric.png .) || die "sed failed"
- mv eric/icons/default/eric{,5}.png || die "mv failed"
- mv eric/pixmaps/eric{,5}.png || die "mv failed"
- rm -f eric/APIs/Python/zope-*.api
- rm -f eric/APIs/Ruby/Ruby-*.api
-
- # Delete internal copies of dev-python/chardet, dev-python/coverage and dev-python/pygments.
- rm -fr eric/ThirdParty
- rm -fr eric/DebugClients/Python{,3}/coverage
-}
-
-src_install() {
- installation() {
- "$(PYTHON)" install.py \
- -z \
- -b "${EPREFIX}/usr/bin" \
- -i "${T}/images/${PYTHON_ABI}" \
- -d "${EPREFIX}$(python_get_sitedir)" \
- -c
- }
- python_execute_function installation
- python_merge_intermediate_installation_images "${T}/images"
-
- doicon eric/icons/default/${MY_PN}.png || die "doicon failed"
-}
-
-pkg_postinst() {
- python_mod_optimize -x "/eric5/(DebugClients/Python|UtilitiesPython2)/" ${MY_PN}{,config.py,plugins}
-
- elog
- elog "If you want to use Eric with mod_python, have a look at"
- elog "\"${EROOT}$(python_get_sitedir -b -f)/${MY_PN}/patch_modpython.py\"."
- elog
- elog "The following packages will give Eric extended functionality:"
- elog " dev-python/pylint"
- elog " dev-python/pysvn"
- elog
- elog "This version has a plugin interface with plugin-autofetch from"
- elog "the application itself. You may want to check those as well."
- elog
-}
-
-pkg_postrm() {
- python_mod_cleanup ${MY_PN}{,config.py,plugins}
-}
diff --git a/dev-util/eric/eric-5.2.0.ebuild b/dev-util/eric/eric-5.2.0.ebuild
index 2de14d82291c..4f1a73919e88 100644
--- a/dev-util/eric/eric-5.2.0.ebuild
+++ b/dev-util/eric/eric-5.2.0.ebuild
@@ -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/dev-util/eric/eric-5.2.0.ebuild,v 1.2 2012/04/30 12:37:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.2.0.ebuild,v 1.3 2012/05/23 06:03:13 jdhore Exp $
EAPI="4"
PYTHON_DEPEND="3:3.1"
@@ -20,7 +20,7 @@ BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
LICENSE="GPL-3"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
IUSE="spell"
DEPEND="
diff --git a/dev-util/eric/files/eric-5.0.2-remove_coverage.patch b/dev-util/eric/files/eric-5.0.2-remove_coverage.patch
deleted file mode 100644
index 63425454d881..000000000000
--- a/dev-util/eric/files/eric-5.0.2-remove_coverage.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- eric/DataViews/PyCoverageDialog.py
-+++ eric/DataViews/PyCoverageDialog.py
-@@ -15,7 +15,7 @@
- from .Ui_PyCoverageDialog import Ui_PyCoverageDialog
-
- import Utilities
--from DebugClients.Python3.coverage import coverage
-+from coverage import coverage
-
- class PyCoverageDialog(QDialog, Ui_PyCoverageDialog):
- """
---- eric/eric5.e4p
-+++ eric/eric5.e4p
-@@ -542,12 +542,6 @@
-
-
-
--
--
--
--
--
--
-
-
-
-@@ -568,15 +562,6 @@
-
-
-
--
--
--
--
--
--
--
--
--
-
-
-
-@@ -631,23 +616,6 @@
-
-
-
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-
-
-
-@@ -700,14 +668,6 @@
-
-
-
--
--
--
--
--
--
--
--
-
-
-
-@@ -1082,15 +1042,11 @@
- ThirdParty/Pygments/pygments/AUTHORS
- ThirdParty/Pygments/pygments/PKG-INFO
- Documentation/Help
-- DebugClients/Python/coverage/htmlfiles
- IconEditor/cursors/aim-cursor.xpm
- IconEditor/cursors/colorpicker-cursor.xpm
- IconEditor/cursors/eraser-cursor.xpm
- IconEditor/cursors/fill-cursor.xpm
- IconEditor/cursors/paintbrush-cursor.xpm
-- DebugClients/Python/coverage/doc
-- DebugClients/Python3/coverage/doc
-- DebugClients/Python3/coverage/htmlfiles
- eric5config.linux
- eric5.e4p
- README-eric5-doc.txt
---- eric/PyUnit/UnittestDialog.py
-+++ eric/PyUnit/UnittestDialog.py
-@@ -23,7 +23,7 @@
- from .Ui_UnittestDialog import Ui_UnittestDialog
- from .Ui_UnittestStacktraceDialog import Ui_UnittestStacktraceDialog
-
--from DebugClients.Python3.coverage import coverage
-+from coverage import coverage
-
- import UI.PixmapCache
-
---- eric/QScintilla/Editor.py
-+++ eric/QScintilla/Editor.py
-@@ -27,7 +27,7 @@
-
- from Debugger.EditBreakpointDialog import EditBreakpointDialog
-
--from DebugClients.Python3.coverage import coverage
-+from coverage import coverage
-
- from DataViews.CodeMetricsDialog import CodeMetricsDialog
- from DataViews.PyCoverageDialog import PyCoverageDialog
diff --git a/dev-util/eric/files/remove_coverage.patch b/dev-util/eric/files/remove_coverage.patch
deleted file mode 100644
index a63a76e91bef..000000000000
--- a/dev-util/eric/files/remove_coverage.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Index: eric4-4.4.0/eric/eric4.e4p
-===================================================================
---- eric4-4.4.0.orig/eric/eric4.e4p
-+++ eric4-4.4.0/eric/eric4.e4p
-@@ -614,12 +614,6 @@
-
-
-
--
--
--
--
--
--
-
-
-
-@@ -652,15 +646,6 @@
-
-
-
--
--
--
--
--
--
--
--
--
-
-
-
-@@ -720,23 +705,6 @@
-
-
-
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-
-
-
-@@ -1045,15 +1013,11 @@
- Documentation/Help
- ThirdParty/SimpleJSON/simplejson/LICENSE.txt
- ThirdParty/SimpleJSON/simplejson/PKG-INFO
-- DebugClients/Python/coverage/htmlfiles
- IconEditor/cursors/aim-cursor.xpm
- IconEditor/cursors/colorpicker-cursor.xpm
- IconEditor/cursors/eraser-cursor.xpm
- IconEditor/cursors/fill-cursor.xpm
- IconEditor/cursors/paintbrush-cursor.xpm
-- DebugClients/Python/coverage/doc
-- DebugClients/Python3/coverage/doc
-- DebugClients/Python3/coverage/htmlfiles
-
- eric4.py
-
-@@ -1511,4 +1475,4 @@
-
-
-
--
-\ No newline at end of file
-+
-Index: eric4-4.4.0/eric/DataViews/PyCoverageDialog.py
-===================================================================
---- eric4-4.4.0.orig/eric/DataViews/PyCoverageDialog.py
-+++ eric4-4.4.0/eric/DataViews/PyCoverageDialog.py
-@@ -19,7 +19,7 @@ from KdeQt.KQProgressDialog import KQPro
- from Ui_PyCoverageDialog import Ui_PyCoverageDialog
-
- import Utilities
--from DebugClients.Python.coverage import coverage
-+from coverage import coverage
-
- class PyCoverageDialog(QDialog, Ui_PyCoverageDialog):
- """
-Index: eric4-4.4.0/eric/PyUnit/UnittestDialog.py
-===================================================================
---- eric4-4.4.0.orig/eric/PyUnit/UnittestDialog.py
-+++ eric4-4.4.0/eric/PyUnit/UnittestDialog.py
-@@ -26,7 +26,7 @@ from E4Gui.E4Completers import E4FileCom
- from Ui_UnittestDialog import Ui_UnittestDialog
- from Ui_UnittestStacktraceDialog import Ui_UnittestStacktraceDialog
-
--from DebugClients.Python.coverage import coverage
-+from coverage import coverage
-
- import UI.PixmapCache
-
-Index: eric4-4.4.0/eric/QScintilla/Editor.py
-===================================================================
---- eric4-4.4.0.orig/eric/QScintilla/Editor.py
-+++ eric4-4.4.0/eric/QScintilla/Editor.py
-@@ -28,7 +28,7 @@ from SpellCheckingDialog import SpellChe
-
- from Debugger.EditBreakpointDialog import EditBreakpointDialog
-
--from DebugClients.Python.coverage import coverage
-+from coverage import coverage
-
- from DataViews.CodeMetricsDialog import CodeMetricsDialog
- from DataViews.PyCoverageDialog import PyCoverageDialog
diff --git a/media-gfx/graphite2/Manifest b/media-gfx/graphite2/Manifest
index bba5ae0a1341..78362fc879df 100644
--- a/media-gfx/graphite2/Manifest
+++ b/media-gfx/graphite2/Manifest
@@ -1,2 +1 @@
-DIST graphite2-1.1.1.tgz 4468216 RMD160 c500f833d4620b3ddf875e0817e6e1a5f8c5ed91 SHA1 bebf2e5837ffa838c01ed165a0c3984eb114e7c1 SHA256 7140a1eb22e41138e01e76ae4088bb07e3293ca981cafedfeebc8439ed7d3149
DIST graphite2-1.1.2.tgz 3677920 RMD160 389819c589a448d68626356566768dee39a451fe SHA1 afc07f4afd9aa4a2f8ac37bb7178635fd20dc9a7 SHA256 3e96d503bd8014b5ea06741487f5db2aab2d5785d43aa046c7d6de74e1b24f87
diff --git a/media-gfx/graphite2/graphite2-1.1.1.ebuild b/media-gfx/graphite2/graphite2-1.1.1.ebuild
deleted file mode 100644
index d17e5a7cf8ea..000000000000
--- a/media-gfx/graphite2/graphite2-1.1.1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.1.1.ebuild,v 1.3 2012/04/26 07:27:51 scarabeus Exp $
-
-EAPI=4
-
-inherit base cmake-utils perl-module
-
-DESCRIPTION="Library providing rendering capabilities for complex non-Roman writing systems"
-HOMEPAGE="http://graphite.sil.org/"
-SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="perl test"
-
-RDEPEND="
- perl? ( dev-lang/perl )
-"
-DEPEND="${RDEPEND}
- perl? ( virtual/perl-Module-Build )
- test? (
- dev-libs/glib:2
- media-libs/fontconfig
- media-libs/silgraphite
- )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.1.0-includes-libs-perl.patch"
- "${FILESDIR}/${PN}-fix_wrong_linker_opts.patch"
- "${FILESDIR}/${PN}-1.0.2-no_harfbuzz_tests.patch"
- "${FILESDIR}/${PN}-1.0.3-no-test-binaries.patch"
-)
-
-pkg_setup() {
- use perl && perl-module_pkg_setup
-}
-
-src_prepare() {
- base_src_prepare
-
- # fix perl linking
- if use perl; then
- _check_build_dir init
- sed -i \
- -e "s:@BUILD_DIR@:\"${CMAKE_BUILD_DIR}/src\":" \
- contrib/perl/Build.PL || die
- fi
-
- # make tests optional
- if ! use test; then
- sed -i \
- -e '/tests/d' \
- CMakeLists.txt || die
- fi
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DVM_MACHINE_TYPE=direct"
- )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile
- if use perl; then
- cd contrib/perl
- perl-module_src_prep
- perl-module_src_compile
- fi
-}
-
-src_test() {
- cmake-utils_src_test
- if use perl; then
- cd contrib/perl
- perl-module_src_test
- fi
-}
-
-src_install() {
- cmake-utils_src_install
- if use perl; then
- cd contrib/perl
- perl-module_src_install
- fixlocalpod
- fi
-
- find "${ED}" -name '*.la' -exec rm -f {} +
-
-}
diff --git a/media-gfx/graphite2/graphite2-1.1.2.ebuild b/media-gfx/graphite2/graphite2-1.1.2.ebuild
index 1445f562eb5b..13071f92ef06 100644
--- a/media-gfx/graphite2/graphite2-1.1.2.ebuild
+++ b/media-gfx/graphite2/graphite2-1.1.2.ebuild
@@ -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/media-gfx/graphite2/graphite2-1.1.2.ebuild,v 1.2 2012/04/26 07:30:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphite2/graphite2-1.1.2.ebuild,v 1.3 2012/05/23 08:49:11 scarabeus Exp $
EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/silgraphite/${PN}/${P}.tgz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
IUSE="perl test"
RDEPEND="
diff --git a/media-libs/libvisio/Manifest b/media-libs/libvisio/Manifest
index b8a083668d63..63b4e42feb81 100644
--- a/media-libs/libvisio/Manifest
+++ b/media-libs/libvisio/Manifest
@@ -1,2 +1 @@
-DIST libvisio-0.0.15.tar.xz 317732 RMD160 24a97c9473fe9c2df9f3672a9f6747ab39c07987 SHA1 62e665d08d43348cc8317b09b5b2f0ada324229e SHA256 a787af52c230003c69b96906cb3ff1255d1d3fc0af0bf32d6e01190d5f2b1a92
DIST libvisio-0.0.16.tar.xz 318296 RMD160 fe5fca2fba490a4cef7b23104ce2e58374f09451 SHA1 c9e943728431e8614d4212e1be705f2a44855dd0 SHA256 62fea7ed3d441179a636efdf0297284fbddfa7fb2a5be3b1dd9468ba6da8f5d0
diff --git a/media-libs/libvisio/libvisio-0.0.15.ebuild b/media-libs/libvisio/libvisio-0.0.15.ebuild
deleted file mode 100644
index 53a7e83cd5a4..000000000000
--- a/media-libs/libvisio/libvisio-0.0.15.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.15.ebuild,v 1.4 2012/05/05 08:02:37 jdhore Exp $
-
-EAPI=4
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/git/libreoffice/contrib/libvisio/"
-[[ ${PV} == 9999 ]] && vcs="autotools git-2"
-inherit base ${vcs}
-unset vcs
-
-DESCRIPTION="Library parsing the visio documents"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/libvisio"
-[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-[[ ${PV} == 9999 ]] || KEYWORDS="amd64 ppc x86"
-IUSE="doc static-libs"
-
-RDEPEND="
- app-text/libwpd:0.9
- app-text/libwpg:0.2
-"
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.46
- virtual/pkgconfig
- sys-devel/libtool
- doc? ( app-doc/doxygen )
-"
-
-src_prepare() {
- [[ -d m4 ]] || mkdir "m4"
- base_src_prepare
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- econf \
- --docdir="${EPREFIX}/usr/share/doc/${PF}" \
- $(use_enable static-libs static) \
- --disable-werror \
- $(use_with doc docs)
-}
-
-src_install() {
- default
- find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/libvisio/libvisio-0.0.16.ebuild b/media-libs/libvisio/libvisio-0.0.16.ebuild
index 4f1d7987e7e3..6b176994fc14 100644
--- a/media-libs/libvisio/libvisio-0.0.16.ebuild
+++ b/media-libs/libvisio/libvisio-0.0.16.ebuild
@@ -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/media-libs/libvisio/libvisio-0.0.16.ebuild,v 1.2 2012/05/05 08:02:37 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvisio/libvisio-0.0.16.ebuild,v 1.3 2012/05/23 08:47:44 scarabeus Exp $
EAPI=4
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/libvisio"
LICENSE="LGPL-2.1"
SLOT="0"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~ppc ~x86"
+[[ ${PV} == 9999 ]] || KEYWORDS="amd64 ppc x86"
IUSE="doc static-libs"
RDEPEND="
diff --git a/media-sound/easytag/easytag-2.1.7-r2.ebuild b/media-sound/easytag/easytag-2.1.7-r2.ebuild
index ee981c177ee1..cac842acc688 100644
--- a/media-sound/easytag/easytag-2.1.7-r2.ebuild
+++ b/media-sound/easytag/easytag-2.1.7-r2.ebuild
@@ -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/media-sound/easytag/easytag-2.1.7-r2.ebuild,v 1.5 2012/05/22 11:20:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/easytag/easytag-2.1.7-r2.ebuild,v 1.6 2012/05/23 06:40:42 jdhore Exp $
EAPI=4
inherit eutils fdo-mime
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac mp3 mp4 speex vorbis wavpack"
RDEPEND=">=x11-libs/gtk+-2.12:2
diff --git a/media-sound/google-musicmanager/Manifest b/media-sound/google-musicmanager/Manifest
index 476feb5d5c2d..bcc31e54b01f 100644
--- a/media-sound/google-musicmanager/Manifest
+++ b/media-sound/google-musicmanager/Manifest
@@ -1,4 +1,4 @@
DIST google-musicmanager-beta_1.0.29.4806-r0_amd64.deb 3106636 RMD160 44880c37d6e88bcb6ed288a1ff321736a6b74684 SHA1 4559cbce3e33a7bc5f1b32770eed7c0e0ba8fb27 SHA256 eb00fd028c14b69aad0f6866382cfb2e2b72c154d701712823846c11127e9485
DIST google-musicmanager-beta_1.0.29.4806-r0_i386.deb 3096254 RMD160 e99ef06719ec254debc8b679593a997eae0dff52 SHA1 01737e818aa008818cc5402617c3054d7069d6b6 SHA256 1a5105b6aabcf806ba4be65f73f1b7a090b5e7e8cc158ed8d16539e0af752dd2
-DIST google-musicmanager-beta_1.0.35.1577-r0_amd64.deb 3147618 RMD160 907071ae1b3d9ac9cb2a8f7d8d5f3229ff7033e6 SHA1 c1d5fd923919b133846a1cde11b2a2ea2e0e856f SHA256 61bda2ca7995ce02f40010522aa1c1c3e017b6b2843bc2644ef43ed030d8b842
-DIST google-musicmanager-beta_1.0.35.1577-r0_i386.deb 3138744 RMD160 394338bc07b4712d4811193bcfc30640f16e1144 SHA1 8267b221ff2672b799ec1ae8ee98b7e5d3e21021 SHA256 8bbbff09d095f7c306038915f1687392bf185a14a9ce9f5866e6122b60486812
+DIST google-musicmanager-beta_1.0.35.3998-r0_amd64.deb 3144476 RMD160 c6f3a63560f6a0447a89be17115e9f47d92f4cf2 SHA1 56653c6a0107141565e6f759cbedaa729435335d SHA256 8c279d31ce829200bc2804d029a6fac579c0e518ad03d0d4a5bc6d37a704273b
+DIST google-musicmanager-beta_1.0.35.3998-r0_i386.deb 3137256 RMD160 04276b9df9a962bb23f74510b2510a5c00f96051 SHA1 4b844433a4b6ba1a4ea0c10b8abfeb0aac6bb76b SHA256 1f824c50447852e7aad57bf89d62cb1c4ffd3e1b095e6e02f57010ced6bf1c9f
diff --git a/media-sound/google-musicmanager/google-musicmanager-1.0.35.1577_beta.ebuild b/media-sound/google-musicmanager/google-musicmanager-1.0.35.3998_beta.ebuild
similarity index 95%
rename from media-sound/google-musicmanager/google-musicmanager-1.0.35.1577_beta.ebuild
rename to media-sound/google-musicmanager/google-musicmanager-1.0.35.3998_beta.ebuild
index 4bd539856cb5..a13e80c2a7dc 100644
--- a/media-sound/google-musicmanager/google-musicmanager-1.0.35.1577_beta.ebuild
+++ b/media-sound/google-musicmanager/google-musicmanager-1.0.35.3998_beta.ebuild
@@ -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/media-sound/google-musicmanager/google-musicmanager-1.0.35.1577_beta.ebuild,v 1.1 2012/05/12 22:48:58 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/google-musicmanager/google-musicmanager-1.0.35.3998_beta.ebuild,v 1.1 2012/05/23 07:57:44 zmedico Exp $
EAPI=4
diff --git a/metadata/cache/app-misc/gentoo-0.19.13 b/metadata/cache/app-misc/gentoo-0.19.13
index e0a591053c67..ecf9468229d0 100644
--- a/metadata/cache/app-misc/gentoo-0.19.13
+++ b/metadata/cache/app-misc/gentoo-0.19.13
@@ -6,7 +6,7 @@ mirror://sourceforge/gentoo/gentoo-0.19.13.tar.gz
http://www.obsession.se/gentoo/
GPL-2
A modern GTK+ based filemanager for any WM
-~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
autotools eutils libtool multilib toolchain-funcs user
nls
diff --git a/metadata/cache/app-officeext/barcode-1.3.5.0 b/metadata/cache/app-officeext/barcode-1.3.5.0
index 6f65eb5247d7..fbb8d2d7672a 100644
--- a/metadata/cache/app-officeext/barcode-1.3.5.0
+++ b/metadata/cache/app-officeext/barcode-1.3.5.0
@@ -6,7 +6,7 @@ http://extensions.libreoffice.org/extension-center/barcode/releases/1.3.5.0/barc
http://extensions.libreoffice.org/extension-center/barcode
LGPL-2
Extension for reading barcodes
-~amd64 ~x86
+amd64 x86
eutils multilib office-ext toolchain-funcs user
diff --git a/metadata/cache/app-officeext/ct2n-1.4.0 b/metadata/cache/app-officeext/ct2n-1.4.0
index 967dfad60796..6f805c5646e2 100644
--- a/metadata/cache/app-officeext/ct2n-1.4.0
+++ b/metadata/cache/app-officeext/ct2n-1.4.0
@@ -6,7 +6,7 @@ http://extensions.libreoffice.org/extension-center/ct2n-convert-text-to-number-a
http://extensions.libreoffice.org/extension-center/ct2n-convert-text-to-number-and-dates
LGPL-3
Extension for converting text to numbers
-~amd64 ~x86
+amd64 x86
eutils multilib office-ext toolchain-funcs user
diff --git a/metadata/cache/app-officeext/dmaths-3.4.2.2 b/metadata/cache/app-officeext/dmaths-3.4.2.2
index 89d31a39a0d6..05316bcd4941 100644
--- a/metadata/cache/app-officeext/dmaths-3.4.2.2
+++ b/metadata/cache/app-officeext/dmaths-3.4.2.2
@@ -6,7 +6,7 @@ http://extensions.libreoffice.org/extension-center/dmaths/releases/3.4.2.2/dmath
http://extensions.libreoffice.org/extension-center/dmaths
GPL-2
Mathematics Formula Editor Extension
-~amd64 ~x86
+amd64 x86
eutils multilib office-ext toolchain-funcs user
diff --git a/metadata/cache/app-officeext/languagetool-1.7 b/metadata/cache/app-officeext/languagetool-1.7
index eccca82779d5..b5213fbe201f 100644
--- a/metadata/cache/app-officeext/languagetool-1.7
+++ b/metadata/cache/app-officeext/languagetool-1.7
@@ -6,7 +6,7 @@ http://www.languagetool.org/download/LanguageTool-1.7.oxt
http://www.languagetool.org/
LGPL-2
Style and Grammar Checker for libreoffice
-~amd64 ~x86
+amd64 x86
eutils multilib office-ext toolchain-funcs user
diff --git a/metadata/cache/app-officeext/ooo2gd-3.0.0 b/metadata/cache/app-officeext/ooo2gd-3.0.0
index e0275ab39024..7c4bbd2f1c30 100644
--- a/metadata/cache/app-officeext/ooo2gd-3.0.0
+++ b/metadata/cache/app-officeext/ooo2gd-3.0.0
@@ -6,7 +6,7 @@ http://ooo2gd.googlecode.com/files/ooo2gd_3.0.0.oxt
http://code.google.com/p/ooo2gd/
LGPL-2
Extension for export to Google docs, zoho and WebDAV
-~amd64 ~x86
+amd64 x86
eutils multilib office-ext toolchain-funcs user
diff --git a/metadata/cache/app-officeext/texmaths-0.35 b/metadata/cache/app-officeext/texmaths-0.35
index 430309feed19..84cd832b8ade 100644
--- a/metadata/cache/app-officeext/texmaths-0.35
+++ b/metadata/cache/app-officeext/texmaths-0.35
@@ -6,7 +6,7 @@ mirror://sourceforge/texmaths/TexMaths-0.35.oxt
http://roland65.free.fr/texmaths/
GPL-2
LaTeX Equation Editor for LibreOffice
-~amd64 ~x86
+amd64 x86
eutils multilib office-ext toolchain-funcs user
diff --git a/metadata/cache/app-text/calibre-0.8.48 b/metadata/cache/app-text/calibre-0.8.48
index 63161aebcbcb..186f404960a5 100644
--- a/metadata/cache/app-text/calibre-0.8.48
+++ b/metadata/cache/app-text/calibre-0.8.48
@@ -6,7 +6,7 @@ http://sourceforge.net/projects/calibre/files/0.8.48/calibre-0.8.48.tar.xz
http://calibre-ebook.com/
GPL-2
Ebook management application.
-amd64 ~x86
+amd64 x86
bash-completion-r1 distutils eutils fdo-mime multilib python toolchain-funcs user
+udisks
diff --git a/metadata/cache/app-text/epubcheck-1.1 b/metadata/cache/app-text/epubcheck-1.1
new file mode 100644
index 000000000000..7376f411c75a
--- /dev/null
+++ b/metadata/cache/app-text/epubcheck-1.1
@@ -0,0 +1,22 @@
+>=virtual/jdk-1.5 app-arch/unzip dev-java/jigsaw:0 dev-java/saxon:6.5 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jre-1.5 dev-java/jigsaw:0 dev-java/saxon:6.5 >=dev-java/java-config-2.1.9-r1
+0
+https://epubcheck.googlecode.com/files/epubcheck-src-1.1.zip
+
+https://code.google.com/p/epubcheck/
+as-is BSD
+Tool to validate IDPF EPUB files
+~amd64
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/app-text/libwps-0.2.4 b/metadata/cache/app-text/libwps-0.2.4
deleted file mode 100644
index c74044ef2ad5..000000000000
--- a/metadata/cache/app-text/libwps-0.2.4
+++ /dev/null
@@ -1,22 +0,0 @@
-app-text/libwpd:0.9 dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen )
-app-text/libwpd:0.9 dev-libs/boost
-0
-mirror://sourceforge/libwps/libwps-0.2.4.tar.xz
-
-http://libwps.sourceforge.net/
-LGPL-2.1
-Microsoft Works file word processor format import filter library
-amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-
-doc debug static-libs
-
-
-
-4
-
-configure install
-
-
-
-
-
diff --git a/metadata/cache/app-text/libwps-0.2.6 b/metadata/cache/app-text/libwps-0.2.6
index 4a244b761017..0dbec55231ad 100644
--- a/metadata/cache/app-text/libwps-0.2.6
+++ b/metadata/cache/app-text/libwps-0.2.6
@@ -6,7 +6,7 @@ mirror://sourceforge/libwps/libwps-0.2.6.tar.xz
http://libwps.sourceforge.net/
LGPL-2.1
Microsoft Works file word processor format import filter library
-~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
doc debug static-libs
diff --git a/metadata/cache/app-text/llpp-12 b/metadata/cache/app-text/llpp-12
index aed72869ca43..ffb62b860495 100644
--- a/metadata/cache/app-text/llpp-12
+++ b/metadata/cache/app-text/llpp-12
@@ -6,7 +6,7 @@ mirror://gentoo/llpp-12.tar.gz
http://repo.or.cz/w/llpp.git
GPL-3
a graphical PDF viewer which aims to superficially resemble less(1)
-~amd64 ~x86
+~amd64 x86
eutils multilib toolchain-funcs user
diff --git a/metadata/cache/app-text/mupdf-1.0 b/metadata/cache/app-text/mupdf-1.0
index 4ae2ec5a6383..669765e9703d 100644
--- a/metadata/cache/app-text/mupdf-1.0
+++ b/metadata/cache/app-text/mupdf-1.0
@@ -6,7 +6,7 @@ http://mupdf.googlecode.com/files/mupdf-1.0-source.tar.gz
http://mupdf.com/
GPL-3
a lightweight PDF viewer and toolkit written in portable C
-~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+~amd64 ~ppc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
eutils flag-o-matic multilib toolchain-funcs user
X vanilla
diff --git a/metadata/cache/dev-ada/tash-8.4.1a b/metadata/cache/dev-ada/tash-8.4.1a
index d1d262f4d5f5..ae381951a625 100644
--- a/metadata/cache/dev-ada/tash-8.4.1a
+++ b/metadata/cache/dev-ada/tash-8.4.1a
@@ -5,7 +5,7 @@ mirror://gentoo/tash-8.4.1a.tar.bz2
http://tcladashell.sourceforge.net/index.htm
GPL-2
-Tash provides tcl Ada bindings
+tcl Ada bindings
~amd64 ~x86
eutils flag-o-matic gnat multilib toolchain-funcs user
diff --git a/metadata/cache/dev-db/virtuoso-odbc-6.1.3 b/metadata/cache/dev-db/virtuoso-odbc-6.1.3
deleted file mode 100644
index 5050f5449e5a..000000000000
--- a/metadata/cache/dev-db/virtuoso-odbc-6.1.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/openssl-0.9.7i:0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
->=dev-libs/openssl-0.9.7i:0
-0
-mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.3.tar.gz mirror://gentoo/VOS-genpatches-6.1.3.tar.bz2
-
-http://virtuoso.openlinksw.com/wiki/main/Main/
-GPL-2
-ODBC driver for OpenLink Virtuoso Open-Source Edition
-amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-autotools base eutils libtool multilib toolchain-funcs user virtuoso
-
-
-
-
-4
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-db/virtuoso-odbc-6.1.4 b/metadata/cache/dev-db/virtuoso-odbc-6.1.4
index 68d90ed6f421..aa9c22177a23 100644
--- a/metadata/cache/dev-db/virtuoso-odbc-6.1.4
+++ b/metadata/cache/dev-db/virtuoso-odbc-6.1.4
@@ -6,7 +6,7 @@ mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.4.tar.gz mirror://gentoo/V
http://virtuoso.openlinksw.com/wiki/main/Main/
GPL-2
ODBC driver for OpenLink Virtuoso Open-Source Edition
-amd64 ~arm ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
autotools base eutils libtool multilib toolchain-funcs user virtuoso
diff --git a/metadata/cache/dev-db/virtuoso-server-6.1.3-r2 b/metadata/cache/dev-db/virtuoso-server-6.1.3-r2
deleted file mode 100644
index 97f72cd24d04..000000000000
--- a/metadata/cache/dev-db/virtuoso-server-6.1.3-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 =sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
-dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 =dev-db/virtuoso-odbc-6.1.3:0
-0
-mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.3.tar.gz mirror://gentoo/VOS-genpatches-6.1.3.tar.bz2
-
-http://virtuoso.openlinksw.com/wiki/main/Main/
-GPL-2
-Server binaries for Virtuoso, high-performance object-relational SQL database
-amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-autotools base eutils libtool multilib toolchain-funcs user virtuoso
-kerberos ldap readline
-
-
-
-4
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-db/virtuoso-server-6.1.4 b/metadata/cache/dev-db/virtuoso-server-6.1.4
deleted file mode 100644
index f8d5099ef433..000000000000
--- a/metadata/cache/dev-db/virtuoso-server-6.1.4
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) sys-apps/gawk >=sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
-dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) ~dev-db/virtuoso-odbc-6.1.4:0
-0
-mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.4.tar.gz mirror://gentoo/VOS-genpatches-6.1.4.tar.bz2
-
-http://virtuoso.openlinksw.com/wiki/main/Main/
-GPL-2
-Server binaries for Virtuoso, high-performance object-relational SQL database
-~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-autotools base eutils libtool multilib toolchain-funcs user virtuoso
-kerberos ldap readline
-
-
-
-4
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-db/virtuoso-server-6.1.4-r1 b/metadata/cache/dev-db/virtuoso-server-6.1.4-r1
index 157dc20ec2b1..c02407c5bbf8 100644
--- a/metadata/cache/dev-db/virtuoso-server-6.1.4-r1
+++ b/metadata/cache/dev-db/virtuoso-server-6.1.4-r1
@@ -6,7 +6,7 @@ mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.4.tar.gz mirror://gentoo/V
http://virtuoso.openlinksw.com/wiki/main/Main/
GPL-2
Server binaries for Virtuoso, high-performance object-relational SQL database
-amd64 ~arm ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
autotools base eutils libtool multilib toolchain-funcs user virtuoso
kerberos ldap readline
diff --git a/metadata/cache/dev-embedded/msp430-gcc-4.7.0_p20120514 b/metadata/cache/dev-embedded/msp430-gcc-4.7.0_p20120514
new file mode 100644
index 000000000000..c3f330297467
--- /dev/null
+++ b/metadata/cache/dev-embedded/msp430-gcc-4.7.0_p20120514
@@ -0,0 +1,22 @@
+elibc_glibc? ( >=sys-libs/glibc-2.8 ) dev-embedded/msp430-binutils sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
+4.7
+mirror://gnu/gcc/gcc-4.7.0_p20120514/gcc-4.7.0.tar.bz2 mirror://gentoo/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/distfiles/msp430-gcc-4.7.0_p20120514.patch.bz2
+strip
+http://gcc.gnu.org/
+GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
+The GNU Compiler Collection for MSP430 microcontrollers
+~amd64 ~x86
+eutils fixheadtails flag-o-matic gnuconfig libtool multilib pax-utils toolchain toolchain-funcs user versionator
+build multislot nls nptl test vanilla altivec cxx fortran nocxx bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
+
+>=sys-devel/gcc-config-1.5
+
+4
+
+compile install postinst postrm preinst prepare prerm pretend setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-python/PyQt4-4.9.1 b/metadata/cache/dev-python/PyQt4-4.9.1
index ae9d3e244979..4727ba00dd92 100644
--- a/metadata/cache/dev-python/PyQt4-4.9.1
+++ b/metadata/cache/dev-python/PyQt4-4.9.1
@@ -6,7 +6,7 @@ http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-4.9.1.tar.
http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt
|| ( GPL-2 GPL-3 )
Python bindings for the Qt toolkit
-amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
base eutils multilib python qt4-r2 toolchain-funcs user
X assistant dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns
assistant? ( X ) declarative? ( X ) multimedia? ( X ) opengl? ( X ) phonon? ( X ) sql? ( X ) svg? ( X ) webkit? ( X )
diff --git a/metadata/cache/dev-python/qscintilla-python-2.6.1 b/metadata/cache/dev-python/qscintilla-python-2.6.1
index 419fbce9aeb9..c7a1d0626bfd 100644
--- a/metadata/cache/dev-python/qscintilla-python-2.6.1
+++ b/metadata/cache/dev-python/qscintilla-python-2.6.1
@@ -6,7 +6,7 @@ http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/QScintilla-gpl-
http://www.riverbankcomputing.co.uk/software/qscintilla/intro
|| ( GPL-2 GPL-3 )
Python bindings for Qscintilla
-~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
eutils multilib python toolchain-funcs user
debug
diff --git a/metadata/cache/dev-python/sip-4.13.2-r1 b/metadata/cache/dev-python/sip-4.13.2-r1
index 436a6a3de745..ec8ee9ce05fe 100644
--- a/metadata/cache/dev-python/sip-4.13.2-r1
+++ b/metadata/cache/dev-python/sip-4.13.2-r1
@@ -6,7 +6,7 @@ http://www.riverbankcomputing.com/static/Downloads/sip4/sip-4.13.2.tar.gz
http://www.riverbankcomputing.co.uk/software/sip/intro http://pypi.python.org/pypi/SIP
|| ( GPL-2 GPL-3 sip )
Python extension module generator for C and C++ libraries
-~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
eutils multilib python toolchain-funcs user
debug doc
diff --git a/metadata/cache/dev-tex/latex-beamer-3.19 b/metadata/cache/dev-tex/latex-beamer-3.19
new file mode 100644
index 000000000000..c67071d5c929
--- /dev/null
+++ b/metadata/cache/dev-tex/latex-beamer-3.19
@@ -0,0 +1,22 @@
+app-arch/unzip lyx? ( app-office/lyx ) dev-texlive/texlive-latex virtual/latex-base >=sys-apps/texinfo-4.2-r5
+>=dev-tex/pgf-1.10 dev-tex/xcolor !dev-tex/translator virtual/latex-base
+0
+http://dev.gentoo.org/~radhermit/distfiles/latex-beamer-3.19.zip
+
+http://bitbucket.org/rivanvx/beamer/wiki/Home
+GPL-2 FDL-1.2 LPPL-1.3c
+LaTeX class for creating presentations using a video projector
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+base eutils latex-package multilib toolchain-funcs user
+doc examples lyx
+
+
+
+4
+
+compile configure install postinst postrm prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-util/eric-4.4.14 b/metadata/cache/dev-util/eric-4.4.14
deleted file mode 100644
index 17e950a49366..000000000000
--- a/metadata/cache/dev-util/eric-4.4.14
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-python/PyQt4[assistant,svg,webkit,X] dev-python/qscintilla-python kde? ( kde-base/pykde4 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-dev-python/PyQt4[assistant,svg,webkit,X] dev-python/qscintilla-python kde? ( kde-base/pykde4 ) >=dev-python/chardet-2.0 dev-python/coverage >=dev-python/pygments-1.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-4
-mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-4.4.14.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-cs-4.4.14.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-de-4.4.14.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-es-4.4.14.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-fr-4.4.14.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-it-4.4.14.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-ru-4.4.14.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-tr-4.4.14.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-zh_CN.GB2312-4.4.14.tar.gz )
-
-http://eric-ide.python-projects.org/
-GPL-3
-A full featured Python IDE using PyQt4 and QScintilla
-amd64 ~ppc ~ppc64 x86
-eutils multilib python toolchain-funcs user
-kde spell linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-
-spell? ( dev-python/pyenchant )
-
-3
-
-install postinst postrm prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-util/eric-4.5.0 b/metadata/cache/dev-util/eric-4.5.0
index 8a8d31579eae..9b450192092f 100644
--- a/metadata/cache/dev-util/eric-4.5.0
+++ b/metadata/cache/dev-util/eric-4.5.0
@@ -6,7 +6,7 @@ mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-4.5.0.tar.gz linguas_cs?
http://eric-ide.python-projects.org/
GPL-3
A full featured Python IDE using PyQt4 and QScintilla
-amd64 ~ppc ~ppc64 ~x86
+amd64 ~ppc ~ppc64 x86
eutils multilib python toolchain-funcs user
kde spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
diff --git a/metadata/cache/dev-util/eric-5.1.2 b/metadata/cache/dev-util/eric-5.1.2
deleted file mode 100644
index 7dcac9bbfd25..000000000000
--- a/metadata/cache/dev-util/eric-5.1.2
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-python/PyQt4-4.7[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.4 =dev-lang/python-3*
->=dev-python/PyQt4-4.7[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.4 >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.2 >=dev-python/pygments-1.4 =dev-lang/python-3*
-5
-mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-5.1.2.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-cs-5.1.2.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-de-5.1.2.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-es-5.1.2.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-fr-5.1.2.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-it-5.1.2.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-ru-5.1.2.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-tr-5.1.2.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-zh_CN.GB2312-5.1.2.tar.gz )
-
-http://eric-ide.python-projects.org/
-GPL-3
-A full featured Python IDE using PyQt4 and QScintilla
-amd64 ~ppc ~ppc64 x86
-eutils multilib python toolchain-funcs user
-spell linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-
-spell? ( dev-python/pyenchant )
-
-3
-
-install postinst postrm prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-util/eric-5.2.0 b/metadata/cache/dev-util/eric-5.2.0
index fa76a3775846..43d6e53c5c88 100644
--- a/metadata/cache/dev-util/eric-5.2.0
+++ b/metadata/cache/dev-util/eric-5.2.0
@@ -6,7 +6,7 @@ mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-5.2.0.tar.gz linguas_cs?
http://eric-ide.python-projects.org/
GPL-3
A full featured Python IDE using PyQt4 and QScintilla
-amd64 ~ppc ~ppc64 ~x86
+amd64 ~ppc ~ppc64 x86
eutils multilib python toolchain-funcs user
spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
diff --git a/metadata/cache/media-gfx/graphite2-1.1.1 b/metadata/cache/media-gfx/graphite2-1.1.1
deleted file mode 100644
index 6efad936c3ec..000000000000
--- a/metadata/cache/media-gfx/graphite2-1.1.1
+++ /dev/null
@@ -1,22 +0,0 @@
-perl? ( dev-lang/perl ) perl? ( virtual/perl-Module-Build ) test? ( dev-libs/glib:2 media-libs/fontconfig media-libs/silgraphite ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-lang/perl[-build]
-perl? ( dev-lang/perl ) dev-lang/perl[-build]
-0
-mirror://sourceforge/silgraphite/graphite2/graphite2-1.1.1.tgz
-
-http://graphite.sil.org/
-LGPL-2.1
-Library providing rendering capabilities for complex non-Roman writing systems
-amd64 ppc x86 ~amd64-linux ~x86-linux
-base cmake-utils eutils flag-o-matic multilib perl-module toolchain-funcs user
-perl test
-
-
-
-4
-
-compile configure install prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/media-gfx/graphite2-1.1.2 b/metadata/cache/media-gfx/graphite2-1.1.2
index dfc5fbbbe1d4..35c04c7afce4 100644
--- a/metadata/cache/media-gfx/graphite2-1.1.2
+++ b/metadata/cache/media-gfx/graphite2-1.1.2
@@ -6,7 +6,7 @@ mirror://sourceforge/silgraphite/graphite2/graphite2-1.1.2.tgz
http://graphite.sil.org/
LGPL-2.1
Library providing rendering capabilities for complex non-Roman writing systems
-~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+amd64 ppc x86 ~amd64-linux ~x86-linux
base cmake-utils eutils flag-o-matic multilib perl-module python toolchain-funcs user
perl test
diff --git a/metadata/cache/media-libs/libvisio-0.0.15 b/metadata/cache/media-libs/libvisio-0.0.15
deleted file mode 100644
index ce9937bddccb..000000000000
--- a/metadata/cache/media-libs/libvisio-0.0.15
+++ /dev/null
@@ -1,22 +0,0 @@
-app-text/libwpd:0.9 app-text/libwpg:0.2 >=dev-libs/boost-1.46 virtual/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen )
-app-text/libwpd:0.9 app-text/libwpg:0.2
-0
-http://dev-www.libreoffice.org/src/libvisio-0.0.15.tar.xz
-
-http://www.freedesktop.org/wiki/Software/libvisio
-LGPL-2.1
-Library parsing the visio documents
-amd64 ppc x86
-base eutils multilib toolchain-funcs user
-doc static-libs
-
-
-
-4
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/metadata/cache/media-libs/libvisio-0.0.16 b/metadata/cache/media-libs/libvisio-0.0.16
index 96729894119a..2a4dd36fb848 100644
--- a/metadata/cache/media-libs/libvisio-0.0.16
+++ b/metadata/cache/media-libs/libvisio-0.0.16
@@ -6,7 +6,7 @@ http://dev-www.libreoffice.org/src/libvisio-0.0.16.tar.xz
http://www.freedesktop.org/wiki/Software/libvisio
LGPL-2.1
Library parsing the visio documents
-~amd64 ~ppc ~x86
+amd64 ppc x86
base eutils multilib toolchain-funcs user
doc static-libs
diff --git a/metadata/cache/media-sound/easytag-2.1.7-r2 b/metadata/cache/media-sound/easytag-2.1.7-r2
index 0e0c5d26c02d..2bda92fec30a 100644
--- a/metadata/cache/media-sound/easytag-2.1.7-r2
+++ b/metadata/cache/media-sound/easytag-2.1.7-r2
@@ -6,7 +6,7 @@ mirror://sourceforge/easytag/easytag-2.1.7.tar.bz2
http://easytag.sourceforge.net
GPL-2
GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags
-~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
eutils fdo-mime multilib toolchain-funcs user
flac mp3 mp4 speex vorbis wavpack
diff --git a/metadata/cache/media-sound/google-musicmanager-1.0.35.1577_beta b/metadata/cache/media-sound/google-musicmanager-1.0.35.3998_beta
similarity index 90%
rename from metadata/cache/media-sound/google-musicmanager-1.0.35.1577_beta
rename to metadata/cache/media-sound/google-musicmanager-1.0.35.3998_beta
index 66cc08edd4e0..f571f1acb3ca 100644
--- a/metadata/cache/media-sound/google-musicmanager-1.0.35.1577_beta
+++ b/metadata/cache/media-sound/google-musicmanager-1.0.35.3998_beta
@@ -1,7 +1,7 @@
app-arch/xz-utils app-admin/chrpath
dev-libs/expat dev-libs/glib:2 media-libs/flac media-libs/fontconfig media-libs/freetype:2 media-libs/libogg media-libs/libvorbis net-dns/libidn sys-libs/glibc x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-webkit log? ( dev-libs/log4cxx )
0
-x86? ( http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-beta_1.0.35.1577-r0_i386.deb ) amd64? ( http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-beta_1.0.35.1577-r0_amd64.deb )
+x86? ( http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-beta_1.0.35.3998-r0_i386.deb ) amd64? ( http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-beta_1.0.35.3998-r0_amd64.deb )
strip mirror
http://music.google.com
google-talkplugin Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 openssl ZLIB as-is
diff --git a/metadata/cache/net-misc/mosh-1.2 b/metadata/cache/net-misc/mosh-1.2
deleted file mode 100644
index 48b117a4169f..000000000000
--- a/metadata/cache/net-misc/mosh-1.2
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/protobuf dev-libs/skalibs sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-dev-libs/protobuf dev-libs/skalibs sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
-0
-https://github.com/downloads/keithw/mosh/mosh-1.2.tar.gz
-
-http://mosh.mit.edu
-GPL-3
-Mobile shell that supports roaming and intelligent local echo
-~amd64 ~x86
-autotools eutils libtool multilib toolchain-funcs user
-+client examples +server +utempter
-|| ( client server ) examples? ( client )
-
-
-4
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/net-misc/mosh-1.2-r1 b/metadata/cache/net-misc/mosh-1.2-r1
deleted file mode 100644
index 370d6d731758..000000000000
--- a/metadata/cache/net-misc/mosh-1.2-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) skalibs? ( dev-libs/skalibs ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) skalibs? ( dev-libs/skalibs ) utempter? ( sys-libs/libutempter )
-0
-https://github.com/downloads/keithw/mosh/mosh-1.2.tar.gz
-
-http://mosh.mit.edu
-GPL-3
-Mobile shell that supports roaming and intelligent local echo
-~amd64 ~x86
-autotools eutils libtool linux-info multilib toolchain-funcs user versionator
-+client examples +server skalibs +utempter
-|| ( client server ) examples? ( client )
-
-
-4
-
-compile configure install prepare setup
-
-
-
-
-
diff --git a/metadata/cache/net-misc/mosh-1.2.0.95 b/metadata/cache/net-misc/mosh-1.2.0.95
new file mode 100644
index 000000000000..b0daffb42a48
--- /dev/null
+++ b/metadata/cache/net-misc/mosh-1.2.0.95
@@ -0,0 +1,22 @@
+dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
+0
+https://github.com/downloads/keithw/mosh/mosh-1.2.0.95.tar.gz
+
+http://mosh.mit.edu
+GPL-3
+Mobile shell that supports roaming and intelligent local echo
+~amd64 ~x86
+autotools eutils libtool multilib toolchain-funcs user
++client examples +server +utempter
+|| ( client server ) examples? ( client )
+
+
+4
+
+compile configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/cluster-1.3.081231 b/metadata/cache/sci-chemistry/cluster-1.3.081231
index d7e7f857c3e9..33c5466742d5 100644
--- a/metadata/cache/sci-chemistry/cluster-1.3.081231
+++ b/metadata/cache/sci-chemistry/cluster-1.3.081231
@@ -12,9 +12,9 @@ eutils multilib toolchain-funcs user
-3
+4
-compile install prepare
+install prepare
diff --git a/metadata/cache/sci-chemistry/msms-bin-2.6.1-r1 b/metadata/cache/sci-chemistry/msms-bin-2.6.1-r1
index de6113605081..984c6b15bf98 100644
--- a/metadata/cache/sci-chemistry/msms-bin-2.6.1-r1
+++ b/metadata/cache/sci-chemistry/msms-bin-2.6.1-r1
@@ -12,7 +12,7 @@ MSMS allows to compute very efficiently triangulations of Solvent Excluded Surfa
-3
+4
install nofetch
diff --git a/metadata/cache/sys-fs/aufs3-3_p20110815 b/metadata/cache/sys-fs/aufs3-3_p20110815
deleted file mode 100644
index 07e4bc4c9869..000000000000
--- a/metadata/cache/sys-fs/aufs3-3_p20110815
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
-0
-http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20110815.tar.xz
-
-http://aufs.sourceforge.net/
-GPL-2
-An entirely re-designed and re-implemented Unionfs
-~amd64 ~x86
-eutils linux-info linux-mod multilib toolchain-funcs user versionator
-debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
-
-
-
-4
-
-compile install postinst postrm preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/sys-fs/aufs3-3_p20111114 b/metadata/cache/sys-fs/aufs3-3_p20111114
deleted file mode 100644
index 4ffb9286d4b5..000000000000
--- a/metadata/cache/sys-fs/aufs3-3_p20111114
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
-0
-http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20111114.tar.xz
-
-http://aufs.sourceforge.net/
-GPL-2
-An entirely re-designed and re-implemented Unionfs
-~amd64 ~x86
-eutils linux-info linux-mod multilib toolchain-funcs user versionator
-debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
-
-
-
-4
-
-compile install postinst postrm preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/sys-fs/aufs3-3_p20111205-r1 b/metadata/cache/sys-fs/aufs3-3_p20111205-r1
deleted file mode 100644
index e4a5c39e061b..000000000000
--- a/metadata/cache/sys-fs/aufs3-3_p20111205-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
-0
-http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20111205.tar.xz
-
-http://aufs.sourceforge.net/
-GPL-2
-An entirely re-designed and re-implemented Unionfs
-~amd64 ~x86
-eutils linux-info linux-mod multilib toolchain-funcs user versionator
-debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
-
-
-
-4
-
-compile install postinst postrm preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/sys-fs/aufs3-3_p20120319 b/metadata/cache/sys-fs/aufs3-3_p20120319
deleted file mode 100644
index 4f2e0435f95f..000000000000
--- a/metadata/cache/sys-fs/aufs3-3_p20120319
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
-0
-http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20120319.tar.xz
-
-http://aufs.sourceforge.net/
-GPL-2
-An entirely re-designed and re-implemented Unionfs
-~amd64 ~x86
-eutils linux-info linux-mod multilib toolchain-funcs user versionator
-debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
-
-
-
-4
-
-compile install postinst postrm preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/sys-fs/aufs3-3_p20120329 b/metadata/cache/sys-fs/aufs3-3_p20120329
deleted file mode 100644
index 87feecdbe44f..000000000000
--- a/metadata/cache/sys-fs/aufs3-3_p20120329
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
-0
-http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20120329.tar.xz
-
-http://aufs.sourceforge.net/
-GPL-2
-An entirely re-designed and re-implemented Unionfs
-~amd64 ~x86
-eutils linux-info linux-mod multilib toolchain-funcs user versionator
-debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
-
-
-
-4
-
-compile install postinst postrm preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/sys-fs/aufs3-3_p20120402 b/metadata/cache/sys-fs/aufs3-3_p20120402
deleted file mode 100644
index 1ce2120aae5e..000000000000
--- a/metadata/cache/sys-fs/aufs3-3_p20120402
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
-0
-http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20120402.tar.xz
-
-http://aufs.sourceforge.net/
-GPL-2
-An entirely re-designed and re-implemented Unionfs
-~amd64 ~x86
-eutils linux-info linux-mod multilib toolchain-funcs user versionator
-debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
-
-
-
-4
-
-compile install postinst postrm preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/sys-fs/aufs3-3_p20111031 b/metadata/cache/sys-fs/aufs3-3_p20120523
similarity index 88%
rename from metadata/cache/sys-fs/aufs3-3_p20111031
rename to metadata/cache/sys-fs/aufs3-3_p20120523
index f1cc45c85545..a06f706bfc43 100644
--- a/metadata/cache/sys-fs/aufs3-3_p20111031
+++ b/metadata/cache/sys-fs/aufs3-3_p20120523
@@ -1,7 +1,7 @@
dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
0
-http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20111031.tar.xz
+http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20120523.tar.xz
http://aufs.sourceforge.net/
GPL-2
diff --git a/metadata/cache/sys-process/parallel-20120422 b/metadata/cache/sys-process/parallel-20120422
index 316213580735..68721504c716 100644
--- a/metadata/cache/sys-process/parallel-20120422
+++ b/metadata/cache/sys-process/parallel-20120422
@@ -6,7 +6,7 @@ mirror://gnu/parallel/parallel-20120422.tar.bz2
http://www.gnu.org/software/parallel/
GPL-3
A shell tool for executing jobs in parallel locally or on remote machines
-~amd64 ~x86 ~amd64-linux ~x86-linux
+~amd64 x86 ~amd64-linux ~x86-linux
diff --git a/metadata/cache/sys-process/parallel-20120322 b/metadata/cache/sys-process/parallel-20120522
similarity index 90%
rename from metadata/cache/sys-process/parallel-20120322
rename to metadata/cache/sys-process/parallel-20120522
index 0f2b3d3d25c6..29651ad93606 100644
--- a/metadata/cache/sys-process/parallel-20120322
+++ b/metadata/cache/sys-process/parallel-20120522
@@ -1,7 +1,7 @@
dev-lang/perl dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO !=x11-libs/gtk+-2.24:2 >=dev-libs/glib-2 x11-libs/gdk-pixbuf x11-libs/pango
SLOT=0
SRC_URI=mirror://sourceforge/gentoo/gentoo-0.19.13.tar.gz
_eclasses_=autotools e4e346f68308900c24bb302865e7d43d eutils 39af24987a4a7a34dccf2ef9cc6af3f7 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=393286e75fe0c98acc3d4d4c2d3134d5
+_md5_=fdfc1e100c6766c81c1d1f972041474a
diff --git a/metadata/md5-cache/app-office/libreoffice-3.5.9999 b/metadata/md5-cache/app-office/libreoffice-3.5.9999
index 58412641a02f..4517bdc33e3e 100644
--- a/metadata/md5-cache/app-office/libreoffice-3.5.9999
+++ b/metadata/md5-cache/app-office/libreoffice-3.5.9999
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.5.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) java? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
_eclasses_=autotools e4e346f68308900c24bb302865e7d43d base 5f35078c26d6c60556d5c8a2feb4f84f bash-completion-r1 3480f8385cb9e31797e7b659e366e2d2 check-reqs e25439e7f4ca914e41d6bb617caa564d eutils 39af24987a4a7a34dccf2ef9cc6af3f7 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 66cb710a2aa184a5687fe1289d7973ab git-2 15733ab6a6feb34af9837b41623c2bad gnome2-utils dfd98be073cc8193fc79925566741ab0 java-pkg-opt-2 131dd2a697d663c0e33247611b9a1cd7 java-utils-2 b173b5d55bfd6e328939985bc54a1c9e kde4-base a5866abff73618fd21d222141d24401d kde4-functions 9c01808120aa5c3905415f4cf4e6adb5 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5f4ad6cf85e365e8f0c6050ddd21659e nsplugins c42fe69d78ae059f56a2d43658fc0480 pax-utils 0ace932c4045349c7fc1af0fe7091acf prefix 21058c21ca48453d771df15500873ede python 36d7e2b7aa4dce62364c72eec96610cf toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 0c41ff55e46b959d9457dde69e7a09d9
-_md5_=13ef810aab62dd4b993ce56a946c3c2e
+_md5_=2ce7f80928933039a628be6504af7049
diff --git a/metadata/md5-cache/app-office/libreoffice-9999-r2 b/metadata/md5-cache/app-office/libreoffice-9999-r2
index e15c106b8389..8600ac11f1cd 100644
--- a/metadata/md5-cache/app-office/libreoffice-9999-r2
+++ b/metadata/md5-cache/app-office/libreoffice-9999-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=nsplugin? ( gtk ) gnome? ( gtk ) eds? ( gnome ) libreoffice_extensi
SLOT=0
SRC_URI=branding? ( http://dev.gentoo.org/~dilfridge/distfiles/libreoffice-branding-gentoo-0.5.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) libreoffice_extensions_wiki-publisher? ( http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
_eclasses_=autotools e4e346f68308900c24bb302865e7d43d base 5f35078c26d6c60556d5c8a2feb4f84f bash-completion-r1 3480f8385cb9e31797e7b659e366e2d2 check-reqs e25439e7f4ca914e41d6bb617caa564d eutils 39af24987a4a7a34dccf2ef9cc6af3f7 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 66cb710a2aa184a5687fe1289d7973ab git-2 15733ab6a6feb34af9837b41623c2bad gnome2-utils dfd98be073cc8193fc79925566741ab0 java-pkg-opt-2 131dd2a697d663c0e33247611b9a1cd7 java-utils-2 b173b5d55bfd6e328939985bc54a1c9e kde4-base a5866abff73618fd21d222141d24401d kde4-functions 9c01808120aa5c3905415f4cf4e6adb5 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5f4ad6cf85e365e8f0c6050ddd21659e nsplugins c42fe69d78ae059f56a2d43658fc0480 pax-utils 0ace932c4045349c7fc1af0fe7091acf prefix 21058c21ca48453d771df15500873ede python 36d7e2b7aa4dce62364c72eec96610cf toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 0c41ff55e46b959d9457dde69e7a09d9
-_md5_=6e31555c9036487dbc97570f5d06bb28
+_md5_=3ed738268e1404ccd94aefdba9067a5d
diff --git a/metadata/md5-cache/app-officeext/barcode-1.3.5.0 b/metadata/md5-cache/app-officeext/barcode-1.3.5.0
index 07ab364ffa28..cb3999be55df 100644
--- a/metadata/md5-cache/app-officeext/barcode-1.3.5.0
+++ b/metadata/md5-cache/app-officeext/barcode-1.3.5.0
@@ -3,10 +3,10 @@ DEPEND=virtual/ooo virtual/ooo
DESCRIPTION=Extension for reading barcodes
EAPI=4
HOMEPAGE=http://extensions.libreoffice.org/extension-center/barcode
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-2
RDEPEND=virtual/ooo virtual/ooo
SLOT=0
SRC_URI=http://extensions.libreoffice.org/extension-center/barcode/releases/1.3.5.0/barcode_1.3.5.0.oxt
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e office-ext ba4cfc1fb015bc83bea154bbb693a0d7 toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=9517107254a259f882ea8474643c458a
+_md5_=fa026e92d5b9ee7500fed272f017baef
diff --git a/metadata/md5-cache/app-officeext/ct2n-1.4.0 b/metadata/md5-cache/app-officeext/ct2n-1.4.0
index 94f8df762faf..ff073cb17a2b 100644
--- a/metadata/md5-cache/app-officeext/ct2n-1.4.0
+++ b/metadata/md5-cache/app-officeext/ct2n-1.4.0
@@ -3,10 +3,10 @@ DEPEND=virtual/ooo virtual/ooo
DESCRIPTION=Extension for converting text to numbers
EAPI=4
HOMEPAGE=http://extensions.libreoffice.org/extension-center/ct2n-convert-text-to-number-and-dates
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-3
RDEPEND=virtual/ooo virtual/ooo
SLOT=0
SRC_URI=http://extensions.libreoffice.org/extension-center/ct2n-convert-text-to-number-and-dates/releases/1.4.0/converttexttonumber-1.4.0.oxt
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e office-ext ba4cfc1fb015bc83bea154bbb693a0d7 toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=74c586ccb6c9029ac0b6b1c4072bd856
+_md5_=98644fa2fe83d2f8333378e3cf9ae451
diff --git a/metadata/md5-cache/app-officeext/dmaths-3.4.2.2 b/metadata/md5-cache/app-officeext/dmaths-3.4.2.2
index 0a55e5a5c570..f3c1997a6318 100644
--- a/metadata/md5-cache/app-officeext/dmaths-3.4.2.2
+++ b/metadata/md5-cache/app-officeext/dmaths-3.4.2.2
@@ -3,10 +3,10 @@ DEPEND=virtual/ooo virtual/ooo
DESCRIPTION=Mathematics Formula Editor Extension
EAPI=4
HOMEPAGE=http://extensions.libreoffice.org/extension-center/dmaths
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=virtual/ooo virtual/ooo
SLOT=0
SRC_URI=http://extensions.libreoffice.org/extension-center/dmaths/releases/3.4.2.2/dmathsaddon.oxt
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e office-ext ba4cfc1fb015bc83bea154bbb693a0d7 toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=a9d8ab1fe0d003f571619b4b334f50a0
+_md5_=2d4de13d97f3ef2dddfb9d1781c599bf
diff --git a/metadata/md5-cache/app-officeext/languagetool-1.7 b/metadata/md5-cache/app-officeext/languagetool-1.7
index 79a727eb285e..48a3a7f09d45 100644
--- a/metadata/md5-cache/app-officeext/languagetool-1.7
+++ b/metadata/md5-cache/app-officeext/languagetool-1.7
@@ -3,10 +3,10 @@ DEPEND=virtual/ooo
DESCRIPTION=Style and Grammar Checker for libreoffice
EAPI=4
HOMEPAGE=http://www.languagetool.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-2
RDEPEND=virtual/ooo[java] virtual/ooo
SLOT=0
SRC_URI=http://www.languagetool.org/download/LanguageTool-1.7.oxt
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e office-ext ba4cfc1fb015bc83bea154bbb693a0d7 toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=d0b0d0373feee276b3c5baeabcbf2f53
+_md5_=ca0626e2d3499a0a89d1db7263c74c86
diff --git a/metadata/md5-cache/app-officeext/ooo2gd-3.0.0 b/metadata/md5-cache/app-officeext/ooo2gd-3.0.0
index ad137cc6a6f2..e89c7269d20e 100644
--- a/metadata/md5-cache/app-officeext/ooo2gd-3.0.0
+++ b/metadata/md5-cache/app-officeext/ooo2gd-3.0.0
@@ -3,10 +3,10 @@ DEPEND=virtual/ooo[java] virtual/ooo
DESCRIPTION=Extension for export to Google docs, zoho and WebDAV
EAPI=4
HOMEPAGE=http://code.google.com/p/ooo2gd/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=LGPL-2
RDEPEND=virtual/ooo[java] virtual/ooo
SLOT=0
SRC_URI=http://ooo2gd.googlecode.com/files/ooo2gd_3.0.0.oxt
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e office-ext ba4cfc1fb015bc83bea154bbb693a0d7 toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=9c7b34d431d8aa134415cf56ddc20d7c
+_md5_=b3939deb92b8d69a02f631f44835549a
diff --git a/metadata/md5-cache/app-officeext/texmaths-0.35 b/metadata/md5-cache/app-officeext/texmaths-0.35
index 514894ffc803..e51670038835 100644
--- a/metadata/md5-cache/app-officeext/texmaths-0.35
+++ b/metadata/md5-cache/app-officeext/texmaths-0.35
@@ -3,10 +3,10 @@ DEPEND=virtual/ooo
DESCRIPTION=LaTeX Equation Editor for LibreOffice
EAPI=4
HOMEPAGE=http://roland65.free.fr/texmaths/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=app-text/dvisvgm virtual/tex-base virtual/ooo
SLOT=0
SRC_URI=mirror://sourceforge/texmaths/TexMaths-0.35.oxt
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e office-ext ba4cfc1fb015bc83bea154bbb693a0d7 toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=37d89ce5ed0cde802dbb5ae28c1cc81f
+_md5_=91ed4a2024cd9c70640801863852d3aa
diff --git a/metadata/md5-cache/app-text/calibre-0.8.48 b/metadata/md5-cache/app-text/calibre-0.8.48
index 6cfa4a0404a9..7851fd3a8ebe 100644
--- a/metadata/md5-cache/app-text/calibre-0.8.48
+++ b/metadata/md5-cache/app-text/calibre-0.8.48
@@ -4,10 +4,10 @@ DESCRIPTION=Ebook management application.
EAPI=4
HOMEPAGE=http://calibre-ebook.com/
IUSE=+udisks
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=GPL-2
RDEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers] >=dev-libs/chmlib-0.40 >=dev-libs/icu-4.4 >=dev-python/beautifulsoup-3.0.5:python-2 dev-python/python-dateutil >=dev-python/dnspython-1.6.0 >=dev-python/cssutils-0.9.7_alpha3 >=dev-python/dbus-python-0.82.2 >=dev-python/imaging-1.1.6 >=dev-python/lxml-2.2.1 >=dev-python/mechanize-0.1.11 >=dev-python/python-dateutil-1.4.1 >=dev-python/PyQt4-4.9.1[X,svg,webkit] >=media-gfx/imagemagick-6.5.9[jpeg,png] >=media-libs/libwmf-0.2.8 virtual/libusb:0 >=x11-misc/xdg-utils-1.0.2-r2 udisks? ( sys-fs/udisks:0 ) =dev-lang/python-2.7* =dev-lang/python-2.7*[ssl,sqlite]
SLOT=0
SRC_URI=http://sourceforge.net/projects/calibre/files/0.8.48/calibre-0.8.48.tar.xz
_eclasses_=bash-completion-r1 3480f8385cb9e31797e7b659e366e2d2 distutils 15ae23f6f8219a009bfcfff7724fe727 eutils 39af24987a4a7a34dccf2ef9cc6af3f7 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa multilib 5f4ad6cf85e365e8f0c6050ddd21659e python 36d7e2b7aa4dce62364c72eec96610cf toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=5f8a5111a552e30d8dcf684c96794c4a
+_md5_=b25fd4567d7348675b182139d7b39660
diff --git a/metadata/md5-cache/app-text/epubcheck-1.1 b/metadata/md5-cache/app-text/epubcheck-1.1
new file mode 100644
index 000000000000..94ccb43f30d2
--- /dev/null
+++ b/metadata/md5-cache/app-text/epubcheck-1.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.5 app-arch/unzip dev-java/jigsaw:0 dev-java/saxon:6.5 >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Tool to validate IDPF EPUB files
+EAPI=4
+HOMEPAGE=https://code.google.com/p/epubcheck/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=as-is BSD
+RDEPEND=>=virtual/jre-1.5 dev-java/jigsaw:0 dev-java/saxon:6.5 >=dev-java/java-config-2.1.9-r1
+SLOT=0
+SRC_URI=https://epubcheck.googlecode.com/files/epubcheck-src-1.1.zip
+_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 java-ant-2 c637c20d93ef0d49a5efcf5feaa776cd java-pkg-2 6f723b44cff6b07377ca5c0848da887b java-utils-2 b173b5d55bfd6e328939985bc54a1c9e multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=9854f7cea78853923df54af714a1dff1
diff --git a/metadata/md5-cache/app-text/libwps-0.2.4 b/metadata/md5-cache/app-text/libwps-0.2.4
deleted file mode 100644
index 1a409418330f..000000000000
--- a/metadata/md5-cache/app-text/libwps-0.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-text/libwpd:0.9 dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Microsoft Works file word processor format import filter library
-EAPI=4
-HOMEPAGE=http://libwps.sourceforge.net/
-IUSE=doc debug static-libs
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=app-text/libwpd:0.9 dev-libs/boost
-SLOT=0
-SRC_URI=mirror://sourceforge/libwps/libwps-0.2.4.tar.xz
-_md5_=df47d9d74bc900466089b5b3418dc861
diff --git a/metadata/md5-cache/app-text/libwps-0.2.6 b/metadata/md5-cache/app-text/libwps-0.2.6
index 70100adbdab2..8984277aab81 100644
--- a/metadata/md5-cache/app-text/libwps-0.2.6
+++ b/metadata/md5-cache/app-text/libwps-0.2.6
@@ -4,9 +4,9 @@ DESCRIPTION=Microsoft Works file word processor format import filter library
EAPI=4
HOMEPAGE=http://libwps.sourceforge.net/
IUSE=doc debug static-libs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1
RDEPEND=app-text/libwpd:0.9 dev-libs/boost
SLOT=0
SRC_URI=mirror://sourceforge/libwps/libwps-0.2.6.tar.xz
-_md5_=3da5acdaa134aba2a7f305eac081a402
+_md5_=be4aae156fe20ab7a5b5b0151066eedc
diff --git a/metadata/md5-cache/app-text/llpp-12 b/metadata/md5-cache/app-text/llpp-12
index 3cb261653cc8..dc36fbf9e84e 100644
--- a/metadata/md5-cache/app-text/llpp-12
+++ b/metadata/md5-cache/app-text/llpp-12
@@ -3,10 +3,10 @@ DEPEND=media-libs/freetype media-libs/jbig2dec media-libs/openjpeg virtual/jpeg
DESCRIPTION=a graphical PDF viewer which aims to superficially resemble less(1)
EAPI=4
HOMEPAGE=http://repo.or.cz/w/llpp.git
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
LICENSE=GPL-3
RDEPEND=media-libs/freetype media-libs/jbig2dec media-libs/openjpeg virtual/jpeg x11-libs/libX11 x11-misc/xsel
SLOT=0
SRC_URI=mirror://gentoo/llpp-12.tar.gz
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=321d8c35551fc8c42c3f628973e9d58b
+_md5_=1e60a236c131db53e10525950c099a31
diff --git a/metadata/md5-cache/app-text/mupdf-1.0 b/metadata/md5-cache/app-text/mupdf-1.0
index 1808c7fb0f13..9a402e062e7d 100644
--- a/metadata/md5-cache/app-text/mupdf-1.0
+++ b/metadata/md5-cache/app-text/mupdf-1.0
@@ -4,10 +4,10 @@ DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
EAPI=4
HOMEPAGE=http://mupdf.com/
IUSE=X vanilla
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~amd64 ~ppc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=GPL-3
RDEPEND=media-libs/freetype:2 media-libs/jbig2dec >=media-libs/openjpeg-1.5 virtual/jpeg X? ( x11-libs/libX11 x11-libs/libXext )
SLOT=0
SRC_URI=http://mupdf.googlecode.com/files/mupdf-1.0-source.tar.gz
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 flag-o-matic 66cb710a2aa184a5687fe1289d7973ab multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=104ba7925ab2864e2e1c370222997886
+_md5_=5b7ba2c2ce292927764475c17b212c0b
diff --git a/metadata/md5-cache/dev-ada/tash-8.4.1a b/metadata/md5-cache/dev-ada/tash-8.4.1a
index fa50dd6eb346..9135ba55e38a 100644
--- a/metadata/md5-cache/dev-ada/tash-8.4.1a
+++ b/metadata/md5-cache/dev-ada/tash-8.4.1a
@@ -1,6 +1,6 @@
DEFINED_PHASES=compile install postinst setup
DEPEND=virtual/ada =dev-lang/tcl-8.4* =dev-lang/tk-8.4* >=app-admin/eselect-gnat-1.3
-DESCRIPTION=Tash provides tcl Ada bindings
+DESCRIPTION=tcl Ada bindings
HOMEPAGE=http://tcladashell.sourceforge.net/index.htm
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
@@ -8,4 +8,4 @@ RDEPEND=virtual/ada =dev-lang/tcl-8.4* =dev-lang/tk-8.4*
SLOT=0
SRC_URI=mirror://gentoo/tash-8.4.1a.tar.bz2
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 flag-o-matic 66cb710a2aa184a5687fe1289d7973ab gnat 5f4e57a467a92576c252ae7c317db6e4 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=98857e2674f7606d2ba3704d3e18d968
+_md5_=8ff19a2e1f0330205541dc97f7c62b18
diff --git a/metadata/md5-cache/dev-db/virtuoso-odbc-6.1.3 b/metadata/md5-cache/dev-db/virtuoso-odbc-6.1.3
deleted file mode 100644
index 4746332117f8..000000000000
--- a/metadata/md5-cache/dev-db/virtuoso-odbc-6.1.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=dev-libs/openssl-0.9.7i:0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
-DESCRIPTION=ODBC driver for OpenLink Virtuoso Open-Source Edition
-EAPI=4
-HOMEPAGE=http://virtuoso.openlinksw.com/wiki/main/Main/
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/openssl-0.9.7i:0
-SLOT=0
-SRC_URI=mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.3.tar.gz mirror://gentoo/VOS-genpatches-6.1.3.tar.bz2
-_eclasses_=autotools e4e346f68308900c24bb302865e7d43d base 5f35078c26d6c60556d5c8a2feb4f84f eutils 39af24987a4a7a34dccf2ef9cc6af3f7 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e virtuoso fc975d1bd0d91cca3ae3109373019c59
-_md5_=b6d9570aaf4601674ef770cee0deba11
diff --git a/metadata/md5-cache/dev-db/virtuoso-odbc-6.1.4 b/metadata/md5-cache/dev-db/virtuoso-odbc-6.1.4
index ba174ba29dee..f8d651eb6c1f 100644
--- a/metadata/md5-cache/dev-db/virtuoso-odbc-6.1.4
+++ b/metadata/md5-cache/dev-db/virtuoso-odbc-6.1.4
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/openssl-0.9.7i:0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys
DESCRIPTION=ODBC driver for OpenLink Virtuoso Open-Source Edition
EAPI=4
HOMEPAGE=http://virtuoso.openlinksw.com/wiki/main/Main/
-KEYWORDS=amd64 ~arm ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=>=dev-libs/openssl-0.9.7i:0
SLOT=0
SRC_URI=mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.4.tar.gz mirror://gentoo/VOS-genpatches-6.1.4.tar.bz2
_eclasses_=autotools e4e346f68308900c24bb302865e7d43d base 5f35078c26d6c60556d5c8a2feb4f84f eutils 39af24987a4a7a34dccf2ef9cc6af3f7 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e virtuoso fc975d1bd0d91cca3ae3109373019c59
-_md5_=674f3fa886ca20f086ee457a40053087
+_md5_=54a9e91e5a3d51836066e91c6e73d3a7
diff --git a/metadata/md5-cache/dev-db/virtuoso-server-6.1.3-r2 b/metadata/md5-cache/dev-db/virtuoso-server-6.1.3-r2
deleted file mode 100644
index e706fe3f708c..000000000000
--- a/metadata/md5-cache/dev-db/virtuoso-server-6.1.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 =sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
-DESCRIPTION=Server binaries for Virtuoso, high-performance object-relational SQL database
-EAPI=4
-HOMEPAGE=http://virtuoso.openlinksw.com/wiki/main/Main/
-IUSE=kerberos ldap readline
-KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 =dev-db/virtuoso-odbc-6.1.3:0
-SLOT=0
-SRC_URI=mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.3.tar.gz mirror://gentoo/VOS-genpatches-6.1.3.tar.bz2
-_eclasses_=autotools e4e346f68308900c24bb302865e7d43d base 5f35078c26d6c60556d5c8a2feb4f84f eutils 39af24987a4a7a34dccf2ef9cc6af3f7 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e virtuoso fc975d1bd0d91cca3ae3109373019c59
-_md5_=52d32e8b42b5389653466aad614d4ae8
diff --git a/metadata/md5-cache/dev-db/virtuoso-server-6.1.4 b/metadata/md5-cache/dev-db/virtuoso-server-6.1.4
deleted file mode 100644
index d0233998e6be..000000000000
--- a/metadata/md5-cache/dev-db/virtuoso-server-6.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) sys-apps/gawk >=sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
-DESCRIPTION=Server binaries for Virtuoso, high-performance object-relational SQL database
-EAPI=4
-HOMEPAGE=http://virtuoso.openlinksw.com/wiki/main/Main/
-IUSE=kerberos ldap readline
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) ~dev-db/virtuoso-odbc-6.1.4:0
-SLOT=0
-SRC_URI=mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.4.tar.gz mirror://gentoo/VOS-genpatches-6.1.4.tar.bz2
-_eclasses_=autotools e4e346f68308900c24bb302865e7d43d base 5f35078c26d6c60556d5c8a2feb4f84f eutils 39af24987a4a7a34dccf2ef9cc6af3f7 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e virtuoso fc975d1bd0d91cca3ae3109373019c59
-_md5_=0abebdcc10bc7ef36f51c507185975a6
diff --git a/metadata/md5-cache/dev-db/virtuoso-server-6.1.4-r1 b/metadata/md5-cache/dev-db/virtuoso-server-6.1.4-r1
index 425a4cdd8ab7..dce2675ef32f 100644
--- a/metadata/md5-cache/dev-db/virtuoso-server-6.1.4-r1
+++ b/metadata/md5-cache/dev-db/virtuoso-server-6.1.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Server binaries for Virtuoso, high-performance object-relational SQL
EAPI=4
HOMEPAGE=http://virtuoso.openlinksw.com/wiki/main/Main/
IUSE=kerberos ldap readline
-KEYWORDS=amd64 ~arm ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) ~dev-db/virtuoso-odbc-6.1.4:0
SLOT=0
SRC_URI=mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.4.tar.gz mirror://gentoo/VOS-genpatches-6.1.4.tar.bz2
_eclasses_=autotools e4e346f68308900c24bb302865e7d43d base 5f35078c26d6c60556d5c8a2feb4f84f eutils 39af24987a4a7a34dccf2ef9cc6af3f7 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e virtuoso fc975d1bd0d91cca3ae3109373019c59
-_md5_=d6422f16a8443e937fb23f6975e8f9cf
+_md5_=83f3e3887909569582a7f928be3393d5
diff --git a/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120514 b/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120514
new file mode 100644
index 000000000000..879acbcca1bc
--- /dev/null
+++ b/metadata/md5-cache/dev-embedded/msp430-gcc-4.7.0_p20120514
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend setup test unpack
+DEPEND=elibc_glibc? ( >=sys-libs/glibc-2.8 ) dev-embedded/msp430-binutils sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 ) >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) gcj? ( gtk? ( x11-libs/libXt x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto =x11-libs/gtk+-2* x11-libs/pango ) >=media-libs/libart_lgpl-2.1 app-arch/zip app-arch/unzip )
+DESCRIPTION=The GNU Compiler Collection for MSP430 microcontrollers
+EAPI=4
+HOMEPAGE=http://gcc.gnu.org/
+IUSE=build multislot nls nptl test vanilla altivec cxx fortran nocxx bootstrap doc gcj gtk hardened multilib objc objc-gc mudflap libssp objc++ openmp fixed-point graphite go
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 LGPL-3 || ( GPL-3 libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.2
+PDEPEND=>=sys-devel/gcc-config-1.5
+RDEPEND=sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=dev-libs/gmp-4.3.2 >=dev-libs/mpfr-2.4.2 >=dev-libs/mpc-0.8.1 graphite? ( >=dev-libs/cloog-ppl-0.15.10 >=dev-libs/ppl-0.11 )
+RESTRICT=strip
+SLOT=4.7
+SRC_URI=mirror://gnu/gcc/gcc-4.7.0_p20120514/gcc-4.7.0.tar.bz2 mirror://gentoo/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~vapier/dist/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~dirtyepic/dist/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~halcy0n/patches/gcc-4.7.0-patches-1.0.tar.bz2 http://dev.gentoo.org/~zorry/patches/gcc/gcc-4.7.0-patches-1.0.tar.bz2 gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar ) http://dev.gentoo.org/~radhermit/distfiles/msp430-gcc-4.7.0_p20120514.patch.bz2
+_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 fixheadtails f96922acc9287f1e889a1e50a6c8986e flag-o-matic 66cb710a2aa184a5687fe1289d7973ab gnuconfig 9200bfc8e0184357abfb86a08edd4fc3 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5f4ad6cf85e365e8f0c6050ddd21659e pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain 189352c6da03fe308716c7d56e63740e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=bc9cf21ff23445b18ed73958064150e7
diff --git a/metadata/md5-cache/dev-python/PyQt4-4.9.1 b/metadata/md5-cache/dev-python/PyQt4-4.9.1
index 20dbf2e53389..28f86c6654a9 100644
--- a/metadata/md5-cache/dev-python/PyQt4-4.9.1
+++ b/metadata/md5-cache/dev-python/PyQt4-4.9.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for the Qt toolkit
EAPI=4
HOMEPAGE=http://www.riverbankcomputing.co.uk/software/pyqt/intro/ http://pypi.python.org/pypi/PyQt
IUSE=X assistant dbus debug declarative doc examples kde multimedia opengl phonon sql svg webkit xmlpatterns
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
LICENSE=|| ( GPL-2 GPL-3 )
RDEPEND=>=dev-python/sip-4.13.1 >=x11-libs/qt-core-4.7.2:4 >=x11-libs/qt-script-4.7.2:4 X? ( >=x11-libs/qt-gui-4.7.2:4[dbus?] >=x11-libs/qt-test-4.7.2:4 ) assistant? ( >=x11-libs/qt-assistant-4.7.2:4 ) dbus? ( >=dev-python/dbus-python-0.80 >=x11-libs/qt-dbus-4.7.2:4 ) declarative? ( >=x11-libs/qt-declarative-4.7.2:4 ) multimedia? ( >=x11-libs/qt-multimedia-4.7.2:4 ) opengl? ( >=x11-libs/qt-opengl-4.7.2:4 || ( >=x11-libs/qt-opengl-4.8.0:4 =x11-libs/qt-phonon-4.7.2:4 media-libs/phonon ) ) kde? ( media-libs/phonon ) ) sql? ( >=x11-libs/qt-sql-4.7.2:4 ) svg? ( >=x11-libs/qt-svg-4.7.2:4 ) webkit? ( >=x11-libs/qt-webkit-4.7.2:4 ) xmlpatterns? ( >=x11-libs/qt-xmlpatterns-4.7.2:4 ) dev-lang/python
REQUIRED_USE=assistant? ( X ) declarative? ( X ) multimedia? ( X ) opengl? ( X ) phonon? ( X ) sql? ( X ) svg? ( X ) webkit? ( X )
SLOT=0
SRC_URI=http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-4.9.1.tar.gz
_eclasses_=base 5f35078c26d6c60556d5c8a2feb4f84f eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e python 36d7e2b7aa4dce62364c72eec96610cf qt4-r2 2111bb601bba6402257079dab64c7310 toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=4f975f220c934c84546b68cea4e64b34
+_md5_=3550e9880607c4828f181608657d1e91
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.6.1 b/metadata/md5-cache/dev-python/qscintilla-python-2.6.1
index 0ac5aac0e0ec..28bf3d6184fb 100644
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.6.1
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.6.1
@@ -4,10 +4,10 @@ DESCRIPTION=Python bindings for Qscintilla
EAPI=3
HOMEPAGE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
IUSE=debug
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=|| ( GPL-2 GPL-3 )
RDEPEND=>=dev-python/sip-4.10 >=dev-python/PyQt4-4.7[X] ~x11-libs/qscintilla-2.6.1
SLOT=0
SRC_URI=http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/QScintilla-gpl-2.6.1.tar.gz
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e python 36d7e2b7aa4dce62364c72eec96610cf toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=d60334b6b39288d1e35a670108562680
+_md5_=789db8a4bb542b6f018a0a431360d545
diff --git a/metadata/md5-cache/dev-python/sip-4.13.2-r1 b/metadata/md5-cache/dev-python/sip-4.13.2-r1
index f0c971713dff..9fdc38300da2 100644
--- a/metadata/md5-cache/dev-python/sip-4.13.2-r1
+++ b/metadata/md5-cache/dev-python/sip-4.13.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Python extension module generator for C and C++ libraries
EAPI=4
HOMEPAGE=http://www.riverbankcomputing.co.uk/software/sip/intro http://pypi.python.org/pypi/SIP
IUSE=debug doc
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
LICENSE=|| ( GPL-2 GPL-3 sip )
RDEPEND=dev-lang/python
SLOT=0
SRC_URI=http://www.riverbankcomputing.com/static/Downloads/sip4/sip-4.13.2.tar.gz
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e python 36d7e2b7aa4dce62364c72eec96610cf toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=f430a7089619fa47035a0a1409653ba5
+_md5_=6fe6713c043af208319919f3e181e364
diff --git a/metadata/md5-cache/dev-python/whoosh-2.4.0 b/metadata/md5-cache/dev-python/whoosh-2.4.0
index bb20cacd9f9a..c763ba7d5c82 100644
--- a/metadata/md5-cache/dev-python/whoosh-2.4.0
+++ b/metadata/md5-cache/dev-python/whoosh-2.4.0
@@ -10,4 +10,4 @@ RDEPEND=|| ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =
SLOT=0
SRC_URI=mirror://pypi/W/Whoosh/Whoosh-2.4.0.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 5f4ad6cf85e365e8f0c6050ddd21659e python 36d7e2b7aa4dce62364c72eec96610cf toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3
-_md5_=709d3a7f6d0d626930a8af71866fbfa9
+_md5_=24a6d1966c465235be2a1bd1fbdbdb5d
diff --git a/metadata/md5-cache/dev-tex/latex-beamer-3.19 b/metadata/md5-cache/dev-tex/latex-beamer-3.19
new file mode 100644
index 000000000000..d136f22862bc
--- /dev/null
+++ b/metadata/md5-cache/dev-tex/latex-beamer-3.19
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare unpack
+DEPEND=app-arch/unzip lyx? ( app-office/lyx ) dev-texlive/texlive-latex virtual/latex-base >=sys-apps/texinfo-4.2-r5
+DESCRIPTION=LaTeX class for creating presentations using a video projector
+EAPI=4
+HOMEPAGE=http://bitbucket.org/rivanvx/beamer/wiki/Home
+IUSE=doc examples lyx
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-2 FDL-1.2 LPPL-1.3c
+RDEPEND=>=dev-tex/pgf-1.10 dev-tex/xcolor !dev-tex/translator virtual/latex-base
+SLOT=0
+SRC_URI=http://dev.gentoo.org/~radhermit/distfiles/latex-beamer-3.19.zip
+_eclasses_=base 5f35078c26d6c60556d5c8a2feb4f84f eutils 39af24987a4a7a34dccf2ef9cc6af3f7 latex-package e7bfe03b27224512702eac009812cc50 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
+_md5_=d213fd2ff99539283b1414ec8d9bd065
diff --git a/metadata/md5-cache/dev-util/eric-4.4.14 b/metadata/md5-cache/dev-util/eric-4.4.14
deleted file mode 100644
index 3c726ee04471..000000000000
--- a/metadata/md5-cache/dev-util/eric-4.4.14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=dev-python/PyQt4[assistant,svg,webkit,X] dev-python/qscintilla-python kde? ( kde-base/pykde4 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-DESCRIPTION=A full featured Python IDE using PyQt4 and QScintilla
-EAPI=3
-HOMEPAGE=http://eric-ide.python-projects.org/
-IUSE=kde spell linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-3
-PDEPEND=spell? ( dev-python/pyenchant )
-RDEPEND=dev-python/PyQt4[assistant,svg,webkit,X] dev-python/qscintilla-python kde? ( kde-base/pykde4 ) >=dev-python/chardet-2.0 dev-python/coverage >=dev-python/pygments-1.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
-SLOT=4
-SRC_URI=mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-4.4.14.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-cs-4.4.14.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-de-4.4.14.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-es-4.4.14.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-fr-4.4.14.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-it-4.4.14.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-ru-4.4.14.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-tr-4.4.14.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric4/stable/4.4.14/eric4-i18n-zh_CN.GB2312-4.4.14.tar.gz )
-_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e python 36d7e2b7aa4dce62364c72eec96610cf toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=c46037598e0d911b479be234f6ab33e8
diff --git a/metadata/md5-cache/dev-util/eric-4.5.0 b/metadata/md5-cache/dev-util/eric-4.5.0
index e2fdd9f2c559..64f956636789 100644
--- a/metadata/md5-cache/dev-util/eric-4.5.0
+++ b/metadata/md5-cache/dev-util/eric-4.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=A full featured Python IDE using PyQt4 and QScintilla
EAPI=4
HOMEPAGE=http://eric-ide.python-projects.org/
IUSE=kde spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=GPL-3
PDEPEND=spell? ( dev-python/pyenchant )
RDEPEND=>=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.6[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.3 kde? ( kde-base/pykde4 ) >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.0.1 >=dev-python/pygments-1.3.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
SLOT=4
SRC_URI=mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-4.5.0.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-cs-4.5.0.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-de-4.5.0.tar.gz ) linguas_en? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-en-4.5.0.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-es-4.5.0.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-fr-4.5.0.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-it-4.5.0.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-ru-4.5.0.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-tr-4.5.0.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.0/eric4-i18n-zh_CN.GB2312-4.5.0.tar.gz )
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e python 36d7e2b7aa4dce62364c72eec96610cf toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=a97879d3d53aa6d70cbef4d7271fd593
+_md5_=f0ac1c5d45b616283b16b220baa66a9c
diff --git a/metadata/md5-cache/dev-util/eric-5.1.2 b/metadata/md5-cache/dev-util/eric-5.1.2
deleted file mode 100644
index a289754a2f6b..000000000000
--- a/metadata/md5-cache/dev-util/eric-5.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=>=dev-python/PyQt4-4.7[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.4 =dev-lang/python-3*
-DESCRIPTION=A full featured Python IDE using PyQt4 and QScintilla
-EAPI=3
-HOMEPAGE=http://eric-ide.python-projects.org/
-IUSE=spell linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-3
-PDEPEND=spell? ( dev-python/pyenchant )
-RDEPEND=>=dev-python/PyQt4-4.7[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.4 >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.2 >=dev-python/pygments-1.4 =dev-lang/python-3*
-SLOT=5
-SRC_URI=mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-5.1.2.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-cs-5.1.2.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-de-5.1.2.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-es-5.1.2.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-fr-5.1.2.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-it-5.1.2.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-ru-5.1.2.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-tr-5.1.2.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric5/stable/5.1.2/eric5-i18n-zh_CN.GB2312-5.1.2.tar.gz )
-_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e python 36d7e2b7aa4dce62364c72eec96610cf toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=7a212bd49f4202cde1b75db997dd3f24
diff --git a/metadata/md5-cache/dev-util/eric-5.2.0 b/metadata/md5-cache/dev-util/eric-5.2.0
index 0e4d5c7b11f2..335b4882be08 100644
--- a/metadata/md5-cache/dev-util/eric-5.2.0
+++ b/metadata/md5-cache/dev-util/eric-5.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=A full featured Python IDE using PyQt4 and QScintilla
EAPI=4
HOMEPAGE=http://eric-ide.python-projects.org/
IUSE=spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-KEYWORDS=amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 x86
LICENSE=GPL-3
PDEPEND=spell? ( dev-python/pyenchant )
RDEPEND=>=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.8[assistant,svg,webkit,X] >=dev-python/qscintilla-python-2.4 >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.2 >=dev-python/pygments-1.4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* )
SLOT=5
SRC_URI=mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-5.2.0.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-cs-5.2.0.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-de-5.2.0.tar.gz ) linguas_en? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-en-5.2.0.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-es-5.2.0.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-fr-5.2.0.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-it-5.2.0.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-ru-5.2.0.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-tr-5.2.0.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric5/stable/5.2.0/eric5-i18n-zh_CN.GB2312-5.2.0.tar.gz )
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e python 36d7e2b7aa4dce62364c72eec96610cf toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=3c0b684790ce5f60df6baa39dbca2795
+_md5_=a87f17945f8f92331f6486194daa6c53
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.1.1 b/metadata/md5-cache/media-gfx/graphite2-1.1.1
deleted file mode 100644
index c8be7757cdc6..000000000000
--- a/metadata/md5-cache/media-gfx/graphite2-1.1.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=perl? ( dev-lang/perl ) perl? ( virtual/perl-Module-Build ) test? ( dev-libs/glib:2 media-libs/fontconfig media-libs/silgraphite ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-lang/perl[-build]
-DESCRIPTION=Library providing rendering capabilities for complex non-Roman writing systems
-EAPI=4
-HOMEPAGE=http://graphite.sil.org/
-IUSE=perl test
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2.1
-RDEPEND=perl? ( dev-lang/perl ) dev-lang/perl[-build]
-SLOT=0
-SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.1.1.tgz
-_eclasses_=base 5f35078c26d6c60556d5c8a2feb4f84f cmake-utils de2b6743eb0bffee798e01b913aec936 eutils 39af24987a4a7a34dccf2ef9cc6af3f7 flag-o-matic 66cb710a2aa184a5687fe1289d7973ab multilib 5f4ad6cf85e365e8f0c6050ddd21659e perl-module f172bf9f9c1de91c81b83a1ae4c27d57 toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=282d0e2e9c6ea31414e5e364d63da11a
diff --git a/metadata/md5-cache/media-gfx/graphite2-1.1.2 b/metadata/md5-cache/media-gfx/graphite2-1.1.2
index 0ddf26e7b561..3129461ec529 100644
--- a/metadata/md5-cache/media-gfx/graphite2-1.1.2
+++ b/metadata/md5-cache/media-gfx/graphite2-1.1.2
@@ -4,10 +4,10 @@ DESCRIPTION=Library providing rendering capabilities for complex non-Roman writi
EAPI=4
HOMEPAGE=http://graphite.sil.org/
IUSE=perl test
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-2.1
RDEPEND=perl? ( dev-lang/perl ) dev-lang/perl[-build] test? ( =dev-lang/python-2* )
SLOT=0
SRC_URI=mirror://sourceforge/silgraphite/graphite2/graphite2-1.1.2.tgz
_eclasses_=base 5f35078c26d6c60556d5c8a2feb4f84f cmake-utils de2b6743eb0bffee798e01b913aec936 eutils 39af24987a4a7a34dccf2ef9cc6af3f7 flag-o-matic 66cb710a2aa184a5687fe1289d7973ab multilib 5f4ad6cf85e365e8f0c6050ddd21659e perl-module f172bf9f9c1de91c81b83a1ae4c27d57 python 36d7e2b7aa4dce62364c72eec96610cf toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=9f7146bc7cf35731b0459e8e59c5b6a1
+_md5_=21e5b715493c9ffa1a9afeb03189cb71
diff --git a/metadata/md5-cache/media-libs/libvisio-0.0.15 b/metadata/md5-cache/media-libs/libvisio-0.0.15
deleted file mode 100644
index f5418d3fc66c..000000000000
--- a/metadata/md5-cache/media-libs/libvisio-0.0.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 >=dev-libs/boost-1.46 virtual/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen )
-DESCRIPTION=Library parsing the visio documents
-EAPI=4
-HOMEPAGE=http://www.freedesktop.org/wiki/Software/libvisio
-IUSE=doc static-libs
-KEYWORDS=amd64 ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2
-SLOT=0
-SRC_URI=http://dev-www.libreoffice.org/src/libvisio-0.0.15.tar.xz
-_eclasses_=base 5f35078c26d6c60556d5c8a2feb4f84f eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=99963212996ef03b6ae171958b3789f9
diff --git a/metadata/md5-cache/media-libs/libvisio-0.0.16 b/metadata/md5-cache/media-libs/libvisio-0.0.16
index 1419679adfd2..68a28c7ba7da 100644
--- a/metadata/md5-cache/media-libs/libvisio-0.0.16
+++ b/metadata/md5-cache/media-libs/libvisio-0.0.16
@@ -4,10 +4,10 @@ DESCRIPTION=Library parsing the visio documents
EAPI=4
HOMEPAGE=http://www.freedesktop.org/wiki/Software/libvisio
IUSE=doc static-libs
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=amd64 ppc x86
LICENSE=LGPL-2.1
RDEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2
SLOT=0
SRC_URI=http://dev-www.libreoffice.org/src/libvisio-0.0.16.tar.xz
_eclasses_=base 5f35078c26d6c60556d5c8a2feb4f84f eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=df13bda774ec936c7ee276dcbf81187a
+_md5_=03e27dea4b67b4c6730f34a4b153d66b
diff --git a/metadata/md5-cache/media-sound/easytag-2.1.7-r2 b/metadata/md5-cache/media-sound/easytag-2.1.7-r2
index 04dd6d5d98c5..a9cd78ab8828 100644
--- a/metadata/md5-cache/media-sound/easytag-2.1.7-r2
+++ b/metadata/md5-cache/media-sound/easytag-2.1.7-r2
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media ta
EAPI=4
HOMEPAGE=http://easytag.sourceforge.net
IUSE=flac mp3 mp4 speex vorbis wavpack
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
LICENSE=GPL-2
RDEPEND=>=x11-libs/gtk+-2.12:2 mp3? ( >=media-libs/id3lib-3.8.3-r7 media-libs/libid3tag ) flac? ( media-libs/flac media-libs/libvorbis ) mp4? ( >=media-libs/libmp4v2-1.9.1:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) speex? ( media-libs/speex media-libs/libvorbis )
SLOT=0
SRC_URI=mirror://sourceforge/easytag/easytag-2.1.7.tar.bz2
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=a7512ce087b2a422753757727a8d7a36
+_md5_=b6a6e038c33a1672fa03b0ace77709cd
diff --git a/metadata/md5-cache/media-sound/google-musicmanager-1.0.35.1577_beta b/metadata/md5-cache/media-sound/google-musicmanager-1.0.35.3998_beta
similarity index 89%
rename from metadata/md5-cache/media-sound/google-musicmanager-1.0.35.1577_beta
rename to metadata/md5-cache/media-sound/google-musicmanager-1.0.35.3998_beta
index 8c09791666fb..f8865b70c95a 100644
--- a/metadata/md5-cache/media-sound/google-musicmanager-1.0.35.1577_beta
+++ b/metadata/md5-cache/media-sound/google-musicmanager-1.0.35.3998_beta
@@ -9,6 +9,6 @@ LICENSE=google-talkplugin Apache-2.0 MIT LGPL-2.1 gSOAP BSD FDL-1.2 MPL-1.1 open
RDEPEND=dev-libs/expat dev-libs/glib:2 media-libs/flac media-libs/fontconfig media-libs/freetype:2 media-libs/libogg media-libs/libvorbis net-dns/libidn sys-libs/glibc x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/qt-core x11-libs/qt-gui x11-libs/qt-webkit log? ( dev-libs/log4cxx )
RESTRICT=strip mirror
SLOT=0
-SRC_URI=x86? ( http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-beta_1.0.35.1577-r0_i386.deb ) amd64? ( http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-beta_1.0.35.1577-r0_amd64.deb )
+SRC_URI=x86? ( http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-beta_1.0.35.3998-r0_i386.deb ) amd64? ( http://dl.google.com/linux/musicmanager/deb/pool/main/g/google-musicmanager-beta/google-musicmanager-beta_1.0.35.3998-r0_amd64.deb )
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 unpacker e1b907c6a72dc4c9025109f3e84129c7 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=583e02c45b11ee2125fa3f2926204620
+_md5_=6d3f598714eb072f62971edea3b7e7d8
diff --git a/metadata/md5-cache/net-misc/mosh-1.2 b/metadata/md5-cache/net-misc/mosh-1.2
deleted file mode 100644
index f745eddc85cd..000000000000
--- a/metadata/md5-cache/net-misc/mosh-1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/protobuf dev-libs/skalibs sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
-EAPI=4
-HOMEPAGE=http://mosh.mit.edu
-IUSE=+client examples +server +utempter
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/protobuf dev-libs/skalibs sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
-REQUIRED_USE=|| ( client server ) examples? ( client )
-SLOT=0
-SRC_URI=https://github.com/downloads/keithw/mosh/mosh-1.2.tar.gz
-_eclasses_=autotools e4e346f68308900c24bb302865e7d43d eutils 39af24987a4a7a34dccf2ef9cc6af3f7 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=c2ba6bb76425b9eea54d9ffcd57772a9
diff --git a/metadata/md5-cache/net-misc/mosh-1.2-r1 b/metadata/md5-cache/net-misc/mosh-1.2-r1
deleted file mode 100644
index 9cb6aee3606f..000000000000
--- a/metadata/md5-cache/net-misc/mosh-1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) skalibs? ( dev-libs/skalibs ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
-EAPI=4
-HOMEPAGE=http://mosh.mit.edu
-IUSE=+client examples +server skalibs +utempter
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) skalibs? ( dev-libs/skalibs ) utempter? ( sys-libs/libutempter )
-REQUIRED_USE=|| ( client server ) examples? ( client )
-SLOT=0
-SRC_URI=https://github.com/downloads/keithw/mosh/mosh-1.2.tar.gz
-_eclasses_=autotools e4e346f68308900c24bb302865e7d43d eutils 39af24987a4a7a34dccf2ef9cc6af3f7 libtool 46e19fa7553f66c48ebc7cf025acd3ed linux-info cc184ad3383ffb6ffbaa82f53608e77f multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=bfdc8328f413859c928a7c1b5b405858
diff --git a/metadata/md5-cache/net-misc/mosh-1.2.0.95 b/metadata/md5-cache/net-misc/mosh-1.2.0.95
new file mode 100644
index 000000000000..91ec878db3aa
--- /dev/null
+++ b/metadata/md5-cache/net-misc/mosh-1.2.0.95
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter ) virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
+EAPI=4
+HOMEPAGE=http://mosh.mit.edu
+IUSE=+client examples +server +utempter
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/protobuf sys-libs/ncurses:5 virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) utempter? ( sys-libs/libutempter )
+REQUIRED_USE=|| ( client server ) examples? ( client )
+SLOT=0
+SRC_URI=https://github.com/downloads/keithw/mosh/mosh-1.2.0.95.tar.gz
+_eclasses_=autotools e4e346f68308900c24bb302865e7d43d eutils 39af24987a4a7a34dccf2ef9cc6af3f7 libtool 46e19fa7553f66c48ebc7cf025acd3ed multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
+_md5_=75c9898dff137e1ee97c7d2b375e702d
diff --git a/metadata/md5-cache/sci-chemistry/cluster-1.3.081231 b/metadata/md5-cache/sci-chemistry/cluster-1.3.081231
index adcbaa52d531..20372f3c0539 100644
--- a/metadata/md5-cache/sci-chemistry/cluster-1.3.081231
+++ b/metadata/md5-cache/sci-chemistry/cluster-1.3.081231
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile install prepare
+DEFINED_PHASES=install prepare
DESCRIPTION=Build lists of collections of interacting items
-EAPI=3
+EAPI=4
HOMEPAGE=http://kinemage.biochem.duke.edu/software/index.php
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=richardson
SLOT=0
SRC_URI=http://kinemage.biochem.duke.edu/downloads/software/cluster/cluster.1.3.081231.src.tgz
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=16f8fbd2ed2d006dcaa6402d55ba6e29
+_md5_=163668327ccf4530959bc990a4436e66
diff --git a/metadata/md5-cache/sci-chemistry/msms-bin-2.6.1-r1 b/metadata/md5-cache/sci-chemistry/msms-bin-2.6.1-r1
index b41255712994..1d105cd9d959 100644
--- a/metadata/md5-cache/sci-chemistry/msms-bin-2.6.1-r1
+++ b/metadata/md5-cache/sci-chemistry/msms-bin-2.6.1-r1
@@ -1,10 +1,10 @@
DEFINED_PHASES=install nofetch
DESCRIPTION=MSMS allows to compute very efficiently triangulations of Solvent Excluded Surfaces
-EAPI=3
+EAPI=4
HOMEPAGE=http://mgl.scripps.edu/people/sanner/html/msms_home.html
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=MSMS
RESTRICT=fetch
SLOT=0
SRC_URI=amd64? ( msms_i86_64Linux2_2.6.1.tar.gz ) x86? ( msms_i86Linux2_2.6.1.tar.gz )
-_md5_=6cf8c109b3f57e5ef7fc6954d6ce3748
+_md5_=9e825a93c1933539422eb71060ea6a16
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20111031 b/metadata/md5-cache/sys-fs/aufs3-3_p20111031
deleted file mode 100644
index d90c49923709..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20111031
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=4
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20111031.tar.xz
-_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 linux-info cc184ad3383ffb6ffbaa82f53608e77f linux-mod cba6b1240fca7886fe5c7297106aea80 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=ead5bf90ec6684065d29aceb7251c796
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20111114 b/metadata/md5-cache/sys-fs/aufs3-3_p20111114
deleted file mode 100644
index b1ae836699b9..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20111114
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=4
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20111114.tar.xz
-_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 linux-info cc184ad3383ffb6ffbaa82f53608e77f linux-mod cba6b1240fca7886fe5c7297106aea80 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=1f687c2054ffd623a96e0098d489a4dc
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20111205-r1 b/metadata/md5-cache/sys-fs/aufs3-3_p20111205-r1
deleted file mode 100644
index f9b5b08063a8..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20111205-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=4
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20111205.tar.xz
-_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 linux-info cc184ad3383ffb6ffbaa82f53608e77f linux-mod cba6b1240fca7886fe5c7297106aea80 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=ef0c44ad650ca45e249f3a13e66c1ec9
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20120319 b/metadata/md5-cache/sys-fs/aufs3-3_p20120319
deleted file mode 100644
index 1b50fdb895c3..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20120319
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=4
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20120319.tar.xz
-_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 linux-info cc184ad3383ffb6ffbaa82f53608e77f linux-mod cba6b1240fca7886fe5c7297106aea80 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=1b4f431f380acc90691f5e05b40254c9
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20120329 b/metadata/md5-cache/sys-fs/aufs3-3_p20120329
deleted file mode 100644
index cae144fc4352..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20120329
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=4
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20120329.tar.xz
-_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 linux-info cc184ad3383ffb6ffbaa82f53608e77f linux-mod cba6b1240fca7886fe5c7297106aea80 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=edacde22184af4cf8b0bb17cce3a68bb
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20120402 b/metadata/md5-cache/sys-fs/aufs3-3_p20120402
deleted file mode 100644
index c33591b2b44c..000000000000
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20120402
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup
-DEPEND=dev-vcs/git kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
-DESCRIPTION=An entirely re-designed and re-implemented Unionfs
-EAPI=4
-HOMEPAGE=http://aufs.sourceforge.net/
-IUSE=debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs kernel_linux
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
-SLOT=0
-SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20120402.tar.xz
-_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 linux-info cc184ad3383ffb6ffbaa82f53608e77f linux-mod cba6b1240fca7886fe5c7297106aea80 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=7e6521c6f46efbf8e2f344f298b69a57
diff --git a/metadata/md5-cache/sys-fs/aufs3-3_p20110815 b/metadata/md5-cache/sys-fs/aufs3-3_p20120523
similarity index 88%
rename from metadata/md5-cache/sys-fs/aufs3-3_p20110815
rename to metadata/md5-cache/sys-fs/aufs3-3_p20120523
index 81efbccc29ab..245608a39f50 100644
--- a/metadata/md5-cache/sys-fs/aufs3-3_p20110815
+++ b/metadata/md5-cache/sys-fs/aufs3-3_p20120523
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=!sys-fs/aufs !sys-fs/aufs2 kernel_linux? ( virtual/modutils )
SLOT=0
-SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20110815.tar.xz
+SRC_URI=http://dev.gentoo.org/~jlec/distfiles/aufs3-3_p20120523.tar.xz
_eclasses_=eutils 39af24987a4a7a34dccf2ef9cc6af3f7 linux-info cc184ad3383ffb6ffbaa82f53608e77f linux-mod cba6b1240fca7886fe5c7297106aea80 multilib 5f4ad6cf85e365e8f0c6050ddd21659e toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=09127a540dd08224d4df7359a8c45769
+_md5_=90ae13b7aae66b8d6b7ead013ceb32a7
diff --git a/metadata/md5-cache/sys-process/parallel-20120422 b/metadata/md5-cache/sys-process/parallel-20120422
index 94cfe02f2bd8..d96c03c1de99 100644
--- a/metadata/md5-cache/sys-process/parallel-20120422
+++ b/metadata/md5-cache/sys-process/parallel-20120422
@@ -3,9 +3,9 @@ DEPEND=dev-lang/perl dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-F
DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
EAPI=4
HOMEPAGE=http://www.gnu.org/software/parallel/
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
RDEPEND=dev-lang/perl dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
SLOT=0
SRC_URI=mirror://gnu/parallel/parallel-20120422.tar.bz2
-_md5_=da53ce763bc0c5d516cc7bc35d42f7a2
+_md5_=eb162d5597e2fa5b7609dddf2adc8b4b
diff --git a/metadata/md5-cache/sys-process/parallel-20120322 b/metadata/md5-cache/sys-process/parallel-20120522
similarity index 84%
rename from metadata/md5-cache/sys-process/parallel-20120322
rename to metadata/md5-cache/sys-process/parallel-20120522
index 4ab08f3ae514..7e88f0833a87 100644
--- a/metadata/md5-cache/sys-process/parallel-20120322
+++ b/metadata/md5-cache/sys-process/parallel-20120522
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=GPL-3
RDEPEND=dev-lang/perl dev-perl/Devel-Size virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
SLOT=0
-SRC_URI=mirror://gnu/parallel/parallel-20120322.tar.bz2
-_md5_=12e78ff7115c2eb88e2125967ddc630b
+SRC_URI=mirror://gnu/parallel/parallel-20120522.tar.bz2
+_md5_=5535cf03fc3b3360677f2032c6f4f316
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.6.1 b/metadata/md5-cache/x11-libs/qscintilla-2.6.1
index a2b7bf20416c..f87d5ae2b575 100644
--- a/metadata/md5-cache/x11-libs/qscintilla-2.6.1
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.6.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Qt port of Neil Hodgson's Scintilla C++ editor class
EAPI=3
HOMEPAGE=http://www.riverbankcomputing.co.uk/software/qscintilla/intro
IUSE=doc python
-KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
LICENSE=|| ( GPL-2 GPL-3 )
PDEPEND=python? ( ~dev-python/qscintilla-python-2.6.1 )
RDEPEND=x11-libs/qt-gui:4
SLOT=0
SRC_URI=http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/QScintilla-gpl-2.6.1.tar.gz
_eclasses_=base 5f35078c26d6c60556d5c8a2feb4f84f eutils 39af24987a4a7a34dccf2ef9cc6af3f7 multilib 5f4ad6cf85e365e8f0c6050ddd21659e qt4-r2 2111bb601bba6402257079dab64c7310 toolchain-funcs f71b9936acc911ed1cc84557d3b5c2b3 user 32a09e82e2f592bf88ad2fd08525166e
-_md5_=ef1ea8a8951d2c01f033ba54bcd5201b
+_md5_=c1a995b9191e6067135a03ade2200140
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a802dff71b0f..f23cb0199258 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 23 May 2012 04:37:24 +0000
+Wed, 23 May 2012 09:37:30 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 34e36099019b..d57bd78399e0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed May 23 04:37:22 UTC 2012
+Wed May 23 09:37:27 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ae405d481bd1..55981c16d6b5 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 23 May 2012 05:00:01 +0000
+Wed, 23 May 2012 10:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 435f041612b3..eafd6796f2db 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1337747701 Wed May 23 04:35:01 2012 UTC
+1337765701 Wed May 23 09:35:01 2012 UTC
diff --git a/net-misc/mosh/Manifest b/net-misc/mosh/Manifest
index 5f3b3723cb2a..2d79225b443d 100644
--- a/net-misc/mosh/Manifest
+++ b/net-misc/mosh/Manifest
@@ -1 +1 @@
-DIST mosh-1.2.tar.gz 296000 RMD160 2b8bd9eaddf0e5a3749e414444ffa20251ed2da5 SHA1 162c85c2f27605896533964977e5ed7ef4cf8fbf SHA256 8b2d346a2f0d560ceb2ca91ff396fa859f81bb321ebd8c26fc564db8b335433a
+DIST mosh-1.2.0.95.tar.gz 176065 RMD160 6221fbae9e6ae644f3e3b03f3ad698ce3a50b2cc SHA1 4eea379b965b660c5edd6a36822000ff3944c02e SHA256 cd2a8680aa6ed68cbfbd328cca0f83f7dd07456788b36f32aecd6c736ce47f8c
diff --git a/net-misc/mosh/files/mosh-1.2-r1-remove-skalibs.patch b/net-misc/mosh/files/mosh-1.2-r1-remove-skalibs.patch
deleted file mode 100644
index 763048cfc6af..000000000000
--- a/net-misc/mosh/files/mosh-1.2-r1-remove-skalibs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- mosh-1.2/configure.ac
-+++ mosh-1.2/configure.ac
-@@ -178,7 +178,7 @@
- STDDJB_LDFLAGS=""
- AS_IF([test x"$with_skalibs" != xno],
- [AX_CHECK_LIBRARY([SKALIBS], [selfpipe.h], [stddjb], [],
-- [AC_MSG_ERROR([Unable to find skalibs.])])
-+ [AC_MSG_WARN([Unable to find skalibs.])])
- AC_SUBST([STDDJB_CPPFLAGS], ["$SKALIBS_CPPFLAGS"])
- AC_SUBST([STDDJB_LDFLAGS], ["$SKALIBS_LDFLAGS -lstddjb"])])
-
-@@ -360,9 +360,6 @@
-
- AC_CONFIG_FILES([
- Makefile
-- third/Makefile
-- third/libstddjb/Makefile
-- third/poll/Makefile
- src/Makefile
- src/crypto/Makefile
- src/frontend/Makefile
---- mosh-1.2/Makefile.am
-+++ mosh-1.2/Makefile.am
-@@ -1,3 +1,3 @@
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = third src scripts man
-+SUBDIRS = src scripts man
- EXTRA_DIST = autogen.sh ocb-license.html README.md
diff --git a/net-misc/mosh/files/mosh-1.2-shared-skalibs-fix-configure.patch b/net-misc/mosh/files/mosh-1.2-shared-skalibs-fix-configure.patch
deleted file mode 100644
index 498967f94fae..000000000000
--- a/net-misc/mosh/files/mosh-1.2-shared-skalibs-fix-configure.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mosh-1.2/configure
-+++ mosh-1.2/configure
-@@ -6147,6 +6147,7 @@
- ;
- return 0;
- }
-+char const * PROG = "mosh-test";
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_stddjb_main=yes
diff --git a/net-misc/mosh/files/mosh-1.2-shared-skalibs.patch b/net-misc/mosh/files/mosh-1.2-shared-skalibs.patch
deleted file mode 100644
index c22a77410e38..000000000000
--- a/net-misc/mosh/files/mosh-1.2-shared-skalibs.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- mosh-1.2/configure.ac
-+++ mosh-1.2/configure.ac
-@@ -163,7 +163,7 @@
- [with_skalibs=$withval
- AS_IF([test x"$withval" != xyes],
- [SKALIBS_CPPFLAGS="-I$withval/include"
-- SKALIBS_LDFLAGS="-L$withval/lib"])],
-+ SKALIBS_LDFLAGS="-L$withval/lib -lrt"])],
- [with_skalibs=no])
- AC_ARG_WITH([skalibs-include],
- [AS_HELP_STRING([--with-skalibs-include=DIR],
-@@ -172,7 +172,7 @@
- AC_ARG_WITH([skalibs-libdir],
- [AS_HELP_STRING([--with-skalibs-libdir=DIR],
- [specify exact library dir for skalibs libraries])],
-- [SKALIBS_LDFLAGS="-L$withval"])
-+ [SKALIBS_LDFLAGS="-L$withval -lrt"])
-
- STDDJB_CPPFLAGS=""
- STDDJB_LDFLAGS=""
-@@ -360,9 +360,6 @@
-
- AC_CONFIG_FILES([
- Makefile
-- third/Makefile
-- third/libstddjb/Makefile
-- third/poll/Makefile
- src/Makefile
- src/crypto/Makefile
- src/frontend/Makefile
---- mosh-1.2/src/frontend/mosh-server.cc
-+++ mosh-1.2/src/frontend/mosh-server.cc
-@@ -750,3 +750,5 @@
- struct stat buf;
- return (0 == lstat( ".hushlogin", &buf ));
- }
-+
-+char const * PROG = "mosh-server" ;
---- mosh-1.2/src/frontend/mosh-client.cc
-+++ mosh-1.2/src/frontend/mosh-client.cc
-@@ -140,3 +140,5 @@
-
- return 0;
- }
-+
-+char const * PROG = "mosh-client" ;
---- mosh-1.2/src/examples/termemu.cc
-+++ mosh-1.2/src/examples/termemu.cc
-@@ -324,3 +324,5 @@
-
- swrite( STDOUT_FILENO, Terminal::Emulator::close().c_str() );
- }
-+
-+char const * PROG = "termemu" ;
---- mosh-1.2/Makefile.am
-+++ mosh-1.2/Makefile.am
-@@ -1,3 +1,3 @@
- ACLOCAL_AMFLAGS = -I m4
--SUBDIRS = third src scripts man
-+SUBDIRS = src scripts man
- EXTRA_DIST = autogen.sh ocb-license.html README.md
diff --git a/net-misc/mosh/mosh-1.2-r1.ebuild b/net-misc/mosh/mosh-1.2-r1.ebuild
deleted file mode 100644
index 5d2f1d2beac8..000000000000
--- a/net-misc/mosh/mosh-1.2-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2-r1.ebuild,v 1.5 2012/05/05 03:20:43 jdhore Exp $
-
-EAPI=4
-
-inherit autotools eutils linux-info toolchain-funcs
-
-DESCRIPTION="Mobile shell that supports roaming and intelligent local echo"
-HOMEPAGE="http://mosh.mit.edu"
-SRC_URI="https://github.com/downloads/keithw/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+client examples +server skalibs +utempter"
-REQUIRED_USE="|| ( client server )
- examples? ( client )"
-
-RDEPEND="dev-libs/protobuf
- sys-libs/ncurses:5
- virtual/ssh
- client? ( dev-lang/perl
- dev-perl/IO-Tty )
- skalibs? ( dev-libs/skalibs )
- utempter? ( sys-libs/libutempter )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-pkg_setup() {
- if ! use skalibs ; then
- if kernel_is -lt 2 6 27 ; then
- ewarn
- ewarn "Consider activating the skalibs USE flag, iff the build fauls"
- ewarn
- fi
- fi
-}
-
-src_prepare() {
- einfo remove bundled skalibs
- rm -r third || die
- if use skalibs ; then
- epatch "${FILESDIR}"/${P}-shared-skalibs.patch
- eautoreconf
- epatch "${FILESDIR}"/${P}-shared-skalibs-fix-configure.patch
- else
- epatch "${FILESDIR}"/${PF}-remove-skalibs.patch
- eautoreconf
- fi
-}
-
-src_configure() {
- local my_args=""
- if use skalibs ; then
- my_args=" --with-skalibs="${EPREFIX}
- my_args+=" --with-skalibs-include="${EPREFIX}/usr/include/skalibs
- my_args+=" --with-skalibs-libdir="${EPREFIX}/usr/$(get_libdir)/skalibs
- fi
- econf ${my_args} \
- $(use_enable client) \
- $(use_enable server) \
- $(use_enable examples) \
- $(use_with utempter)
-}
-
-src_compile() {
- emake V=1
-}
-
-src_install() {
- default
-
- for myprog in $(find src/examples -type f -perm /0111) ; do
- newbin ${myprog} ${PN}-$(basename ${myprog})
- elog "${myprog} installed as ${PN}-$(basename ${myprog})"
- done
-}
diff --git a/net-misc/mosh/mosh-1.2.ebuild b/net-misc/mosh/mosh-1.2.0.95.ebuild
similarity index 69%
rename from net-misc/mosh/mosh-1.2.ebuild
rename to net-misc/mosh/mosh-1.2.0.95.ebuild
index 380356535162..77b0f870e536 100644
--- a/net-misc/mosh/mosh-1.2.ebuild
+++ b/net-misc/mosh/mosh-1.2.0.95.ebuild
@@ -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/net-misc/mosh/mosh-1.2.ebuild,v 1.3 2012/05/05 03:20:43 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mosh/mosh-1.2.0.95.ebuild,v 1.1 2012/05/23 08:38:15 xmw Exp $
EAPI=4
@@ -18,7 +18,6 @@ REQUIRED_USE="|| ( client server )
examples? ( client )"
RDEPEND="dev-libs/protobuf
- dev-libs/skalibs
sys-libs/ncurses:5
virtual/ssh
client? ( dev-lang/perl
@@ -28,24 +27,21 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
- einfo remove bundled skalibs
- rm -r third || die
- epatch "${FILESDIR}"/${P}-shared-skalibs.patch
eautoreconf
- epatch "${FILESDIR}"/${P}-shared-skalibs-fix-configure.patch
}
src_configure() {
econf \
- --with-skalibs="${EPREFIX}"/ \
- --with-skalibs-include="${EPREFIX}"/usr/include/skalibs \
- --with-skalibs-libdir="${EPREFIX}"/usr/$(get_libdir)/skalibs \
$(use_enable client) \
$(use_enable server) \
$(use_enable examples) \
$(use_with utempter)
}
+src_compile() {
+ emake V=1
+}
+
src_install() {
default
diff --git a/sci-chemistry/cluster/cluster-1.3.081231.ebuild b/sci-chemistry/cluster/cluster-1.3.081231.ebuild
index 4d3d59c17599..a294d7f5a720 100644
--- a/sci-chemistry/cluster/cluster-1.3.081231.ebuild
+++ b/sci-chemistry/cluster/cluster-1.3.081231.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cluster/cluster-1.3.081231.ebuild,v 1.1 2010/07/18 08:27:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cluster/cluster-1.3.081231.ebuild,v 1.2 2012/05/23 08:00:27 jlec Exp $
-EAPI="3"
+EAPI=4
inherit eutils toolchain-funcs
@@ -24,15 +24,10 @@ src_prepare() {
epatch \
"${FILESDIR}"/${PV}-ldflags.patch \
"${FILESDIR}"/${PV}-includes.patch
-}
-
-src_compile() {
- emake \
- CXX="$(tc-getCXX)" \
- || die
+ tc-export CXX
}
src_install() {
- dobin ${PN} || die
- dodoc README.cluster || die
+ dobin ${PN}
+ dodoc README.cluster
}
diff --git a/sci-chemistry/cluster/files/1.3.081231-ldflags.patch b/sci-chemistry/cluster/files/1.3.081231-ldflags.patch
index d407e0bc8b8f..1b99f6d662f2 100644
--- a/sci-chemistry/cluster/files/1.3.081231-ldflags.patch
+++ b/sci-chemistry/cluster/files/1.3.081231-ldflags.patch
@@ -1,8 +1,11 @@
+ Makefile | 12 ++++++------
+ 1 files changed, 6 insertions(+), 6 deletions(-)
+
diff --git a/Makefile b/Makefile
-index 7892054..938a8c8 100644
+index 7892054..929564b 100644
--- a/Makefile
+++ b/Makefile
-@@ -3,7 +3,7 @@ PROG_FLGS = -D BOOLPREDEFINED
+@@ -3,27 +3,27 @@ PROG_FLGS = -D BOOLPREDEFINED
SRCS = cluster.cpp DisjointSets.cpp utility.cpp
@@ -11,16 +14,19 @@ index 7892054..938a8c8 100644
LFLAGS =
-@@ -12,7 +12,7 @@ OBJLIST = cluster.o DisjointSets.o utility.o
- CXX = g++
+ OBJLIST = cluster.o DisjointSets.o utility.o
+
+-CXX = g++
++CXX ?= g++
.cpp.o:
- $(CXX) -c $*.cpp $(CFLAGS)
+ $(CXX) $(CXXFLAGS) -c $*.cpp
- OPT = -O3
+-OPT = -O3
++OPT =
DEBUG = $(CXXDEBUGFLAGS)
-@@ -20,10 +20,10 @@ DEBUG = $(CXXDEBUGFLAGS)
+
all: cluster
cluster: $(OBJLIST)
diff --git a/sci-chemistry/cluster/metadata.xml b/sci-chemistry/cluster/metadata.xml
index 6950f7c61ee3..c411bdbae890 100644
--- a/sci-chemistry/cluster/metadata.xml
+++ b/sci-chemistry/cluster/metadata.xml
@@ -1,11 +1,11 @@
-sci-chemistry
-
- jlec@gentoo.org
-
-
+ sci-chemistry
+
+ jlec@gentoo.org
+
+
Cluster is a simple UNIX C++ program to build lists of collections
of interacting items from records containing interacting pairs
and larger fragments.
diff --git a/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild b/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
index fbca1431dc3e..c86fddd7b9cf 100644
--- a/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
+++ b/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild,v 1.6 2012/02/03 11:52:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/msms-bin/msms-bin-2.6.1-r1.ebuild,v 1.7 2012/05/23 07:56:19 jlec Exp $
-EAPI=3
+EAPI=4
DESCRIPTION="MSMS allows to compute very efficiently triangulations of Solvent Excluded Surfaces"
HOMEPAGE="http://mgl.scripps.edu/people/sanner/html/msms_home.html"
@@ -20,26 +20,26 @@ RESTRICT="fetch"
S="${WORKDIR}"
-QA_DT_HASH="${EROOT#/}opt/bin/.*"
+QA_PREBUILT="${EROOT#/}opt/bin/.*"
pkg_nofetch() {
einfo "Please download ${A} from http://mgltools.scripps.edu/downloads#msms and place it to ${DISTDIR}"
}
src_install() {
- doman msms.1 || die
- dodoc README msms.html ReleaseNotes || die
+ doman msms.1
+ dodoc README msms.html ReleaseNotes
exeinto /opt/bin
if use amd64; then
- newexe ${PN%-bin}.x86_64Linux2.${PV} msms || die
+ newexe ${PN%-bin}.x86_64Linux2.${PV} msms
elif use x86; then
- newexe ${PN%-bin}.i86Linux2.${PV} msms || die
+ newexe ${PN%-bin}.i86Linux2.${PV} msms
fi
insinto /usr/share/${PN}/
- doins atmtypenumbers || die
+ doins atmtypenumbers
sed \
-e 's:nawk:awk:g' \
-e "s:./atmtypenumbers:${EPREFIX}/usr/share/${PN}/atmtypenumbers:g" \
-i pdb_to_xyz* || die
- dobin pdb_to_xyz* || die
+ dobin pdb_to_xyz*
}
diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 8c1de38b309b..c44fcb26ab88 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -1,9 +1,3 @@
-DIST aufs3-3_p20110815.tar.xz 391672 RMD160 f99b997401f1d983cb46ceb355445b94e6103c56 SHA1 f1d91e872cc75ee8bb76f6f4a08ddbe3c3a9c6b8 SHA256 e7d71097ba949c9a42b726f0e13ada8bed41f3630a4749f46a0eb7823851e337
-DIST aufs3-3_p20111031.tar.xz 432796 RMD160 1321f3233578ac563d998fac5430b78e0c74eab3 SHA1 18c5244bb3ca28babd09a6350df42bc53a3a8bd0 SHA256 c9d9332fe9fab6c8cdadfa890591ef872cdf68ea1091cbaf60e79cdfb2113355
-DIST aufs3-3_p20111114.tar.xz 472760 RMD160 60c030fc9f7c5e5297a0c68efb6501039de281bf SHA1 6c1c4535156e9c8115417f336d5745a46618133a SHA256 3e68f7ffe4feee593f786b3f335e0ec83ff576d40a262535fa2b2f79d872bc0a
-DIST aufs3-3_p20111205.tar.xz 478084 RMD160 33a545ec241a855b5e1d675334da6cc77417b58d SHA1 bf4e4d728cfe8a551f334eef57c6d850c93b072d SHA256 c522eaf622d7efb9489cde47c6fe2ac49ffe24d86871191ab76bfb7684a4824b
DIST aufs3-3_p20120109.tar.xz 572140 RMD160 0e36afa641ea51bb1d102a6b4381573f6deb71a7 SHA1 5ad014f188b1673eaf1dba08d90ab56f9b88a392 SHA256 7d83bee04871def490193fd9c2e5af1b386caaedd980bee7856c7389db9c8444
-DIST aufs3-3_p20120319.tar.xz 699072 RMD160 ffed47615fbbbe4b0746d1e5957737832b2f2e03 SHA1 a33d019c73a1b5a919b02bbb563700ebc4072ea9 SHA256 4eb25133344c329926813586adf6736dfe57ce2c64a940115dc71a1a2cc03da8
-DIST aufs3-3_p20120329.tar.xz 981864 RMD160 deea937b4f209282135fcb0dc139f7e89f250109 SHA1 b20ae435c2b70d933191f6336e7649fb709be2fd SHA256 e3de219bc7018c3e245131e85aa62f60230f654788c2eb72753c3c7e3d9a7004
-DIST aufs3-3_p20120402.tar.xz 1042724 RMD160 dfe8ae1b4676daa8b1341bd872b20d89db01735c SHA1 36289be6e75dd9787479144cedee395999bd6ef7 SHA256 8ff21ed0f5e472ffb1c5954188fd45ec5758c16856e7cac21b61496af2d455c8
DIST aufs3-3_p20120430.tar.xz 1085556 RMD160 3d6d8f8a11f1bf3a958036c079b55b268710f24b SHA1 375ea311f5540c57eed0636f1c0f13accafaf1df SHA256 1b6ce1cf87377033e3741111db4f40cafdcb969b22f80b406c9407535e71788c
+DIST aufs3-3_p20120523.tar.xz 1108480 RMD160 3b0db00430b934301b68fcf945856debe6ccbc0c SHA1 de3b0d2a1fc49e9196075e760ae76be64516e247 SHA256 694d0a89653959d6175ee52cfd29e5bb7a8c026d00200310b198fff57ad188f0
diff --git a/sys-fs/aufs3/aufs3-3_p20110815.ebuild b/sys-fs/aufs3/aufs3-3_p20110815.ebuild
deleted file mode 100644
index e8ffbc6c3ac6..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20110815.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20110815.ebuild,v 1.1 2011/08/28 09:48:57 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
-
-DEPEND="dev-vcs/git"
-RDEPEND="
- !sys-fs/aufs
- !sys-fs/aufs2"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
- CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
- use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
- use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
- use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
- use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
-
- # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
- [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
- get_version
- kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
- kernel_is gt 3 0 99 && die "kernel too new"
-
- linux-mod_pkg_setup
- if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${KV_MINOR}.patch >/dev/null && \
- patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${KV_MINOR}.patch >/dev/null ); then
- if use kernel-patch; then
- cd ${KV_DIR}
- ewarn "Patching your kernel..."
- patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${KV_MINOR}.patch >/dev/null
- patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${KV_MINOR}.patch >/dev/null
- epatch "${FILESDIR}"/${PN}-{base,standalone}-${KV_MINOR}.patch
- ewarn "You need to compile your kernel with the applied patch"
- ewarn "to be able to load and use the aufs kernel module"
- else
- eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
- eerror "Either enable the kernel-patch useflag to do it with this ebuild"
- eerror "or apply ${FILESDIR}/${PN}-base-${KV_MINOR}.patch and"
- eerror "${FILESDIR}/${PN}-standalone-${KV_MINOR}.patch by hand"
- die "missing kernel patch, please apply it first"
- fi
- fi
- export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
- for option in $*; do
- grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
- sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
- done
-}
-
-src_prepare() {
-# local branch=origin/${PN}-${KV_MINOR}
- local branch=origin/${PN}.0
- git checkout -q $branch || die
-
- # All config options to off
- sed "s:= y:=:g" -i config.mk || die
-
- set_config RDU BRANCH_MAX_127 SBILIST
-
- use debug && set_config DEBUG
- use fuse && set_config BR_FUSE POLL
- use hfs && set_config BR_HFSPLUS
- use inotify && set_config HNOTIFY HFSNOTIFY
- use nfs && set_config EXPORT
- use nfs && use amd64 && set_config INO_T_64
- use ramfs && set_config BR_RAMFS
-
- use pax_kernel && epatch "${FILESDIR}"/pax.patch
-
- sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
- sed -i "s:__user::g" include/linux/aufs_type.h || die
-
- cd "${WORKDIR}"/${PN/3}-util
- git checkout -q origin/${PN}.0
- sed -i "/LDFLAGS += -static -s/d" Makefile || die
- sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
-}
-
-src_compile() {
- local ARCH=x86
-
- emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
-
- cd "${WORKDIR}"/${PN/3}-util
- emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
-}
-
-src_install() {
- linux-mod_src_install
-
- insinto /usr/share/doc/${PF}
-
- use doc && doins -r Documentation
-
- dodoc README
-
- cd "${WORKDIR}"/${PN/3}-util
- emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
- newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20111031.ebuild b/sys-fs/aufs3/aufs3-3_p20111031.ebuild
deleted file mode 100644
index 22e166ff6328..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20111031.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20111031.ebuild,v 1.1 2011/10/31 14:01:21 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-#PATCH_VER=x-rcN
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
-
-DEPEND="dev-vcs/git"
-RDEPEND="
- !sys-fs/aufs
- !sys-fs/aufs2"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
- CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
- use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
- use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
- use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
- use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
-
- # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
- [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
- get_version
- kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
- kernel_is gt 3 1 99 && die "kernel too new"
-
- linux-mod_pkg_setup
-
- [[ -n ${PATCH_VER} ]] || PATCH_VER=${KV_MINOR}
-
- if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_VER}.patch >/dev/null && \
- patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_VER}.patch >/dev/null ); then
- if use kernel-patch; then
- cd ${KV_DIR}
- ewarn "Patching your kernel..."
- patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_VER}.patch >/dev/null
- patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_VER}.patch >/dev/null
- epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_VER}.patch
- ewarn "You need to compile your kernel with the applied patch"
- ewarn "to be able to load and use the aufs kernel module"
- else
- eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
- eerror "Either enable the kernel-patch useflag to do it with this ebuild"
- eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_VER}.patch and"
- eerror "${FILESDIR}/${PN}-standalone-${PATCH_VER}.patch by hand"
- die "missing kernel patch, please apply it first"
- fi
- fi
- export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
- for option in $*; do
- grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
- sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
- done
-}
-
-src_prepare() {
- local branch=origin/${PN}.${PATCH_VER}
-
- git checkout -q -b local-gentoo $branch || die
-
- # All config options to off
- sed "s:= y:=:g" -i config.mk || die
-
- set_config RDU BRANCH_MAX_127 SBILIST
-
- use debug && set_config DEBUG
- use fuse && set_config BR_FUSE POLL
- use hfs && set_config BR_HFSPLUS
- use inotify && set_config HNOTIFY HFSNOTIFY
- use nfs && set_config EXPORT
- use nfs && use amd64 && set_config INO_T_64
- use ramfs && set_config BR_RAMFS
-
- use pax_kernel && epatch "${FILESDIR}"/pax.patch
-
- sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
- sed -i "s:__user::g" include/linux/aufs_type.h || die
-
- cd "${WORKDIR}"/${PN/3}-util
- PATCH_VER=0
- git checkout -b local-gentoo origin/${PN}.${PATCH_VER}
- epatch "${FILESDIR}"/aufs-util-31.patch
- sed -i "/LDFLAGS += -static -s/d" Makefile || die
- sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
-}
-
-src_compile() {
- local ARCH=x86
-
- emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
-
- cd "${WORKDIR}"/${PN/3}-util
- emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
-}
-
-src_install() {
- linux-mod_src_install
-
- insinto /usr/share/doc/${PF}
-
- use doc && doins -r Documentation
-
- dodoc README
-
- cd "${WORKDIR}"/${PN/3}-util
- emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
- newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20111114.ebuild b/sys-fs/aufs3/aufs3-3_p20111114.ebuild
deleted file mode 100644
index b4fad62af637..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20111114.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20111114.ebuild,v 1.1 2011/11/14 10:50:01 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-#PATCH_VER=x-rcN
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
-
-DEPEND="dev-vcs/git"
-RDEPEND="
- !sys-fs/aufs
- !sys-fs/aufs2"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
- CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
- use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
- use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
- use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
- use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
-
- # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
- [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
- get_version
- kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
- kernel_is gt 3 1 99 && die "kernel too new"
-
- linux-mod_pkg_setup
-
- [[ -n ${PATCH_VER} ]] || PATCH_VER=${KV_MINOR}
-
- if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_VER}.patch >/dev/null && \
- patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_VER}.patch >/dev/null ); then
- if use kernel-patch; then
- cd ${KV_DIR}
- ewarn "Patching your kernel..."
- patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_VER}.patch >/dev/null
- patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_VER}.patch >/dev/null
- epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_VER}.patch
- ewarn "You need to compile your kernel with the applied patch"
- ewarn "to be able to load and use the aufs kernel module"
- else
- eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
- eerror "Either enable the kernel-patch useflag to do it with this ebuild"
- eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_VER}.patch and"
- eerror "${FILESDIR}/${PN}-standalone-${PATCH_VER}.patch by hand"
- die "missing kernel patch, please apply it first"
- fi
- fi
- export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
- for option in $*; do
- grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
- sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
- done
-}
-
-src_prepare() {
- local branch=origin/${PN}.${PATCH_VER}
-
- git checkout -q -b local-gentoo $branch || die
-
- # All config options to off
- sed "s:= y:=:g" -i config.mk || die
-
- set_config RDU BRANCH_MAX_127 SBILIST
-
- use debug && set_config DEBUG
- use fuse && set_config BR_FUSE POLL
- use hfs && set_config BR_HFSPLUS
- use inotify && set_config HNOTIFY HFSNOTIFY
- use nfs && set_config EXPORT
- use nfs && use amd64 && set_config INO_T_64
- use ramfs && set_config BR_RAMFS
-
- use pax_kernel && epatch "${FILESDIR}"/pax.patch
-
- sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
- sed -i "s:__user::g" include/linux/aufs_type.h || die
-
- cd "${WORKDIR}"/${PN/3}-util
- PATCH_VER=0
- git checkout -b local-gentoo origin/${PN}.${PATCH_VER}
- sed -i "/LDFLAGS += -static -s/d" Makefile || die
- sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
-}
-
-src_compile() {
- local ARCH=x86
-
- emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
-
- cd "${WORKDIR}"/${PN/3}-util
- emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
-}
-
-src_install() {
- linux-mod_src_install
-
- insinto /usr/share/doc/${PF}
-
- use doc && doins -r Documentation
-
- dodoc README
-
- cd "${WORKDIR}"/${PN/3}-util
- emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
- newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20111205-r1.ebuild b/sys-fs/aufs3/aufs3-3_p20111205-r1.ebuild
deleted file mode 100644
index e39efccbacf5..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20111205-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20111205-r1.ebuild,v 1.1 2012/01/08 13:31:17 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-PATCH_MAX_VER="1"
-UTIL_MAX_VER="0"
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
-
-DEPEND="dev-vcs/git"
-RDEPEND="
- !sys-fs/aufs
- !sys-fs/aufs2"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
- CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
- use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
- use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
- use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
- use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
-
- # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
- [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
- get_version
- kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
- kernel_is gt 3 2 99 && die "kernel too new"
-
- linux-mod_pkg_setup
-
- if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
- PATCH_BRANCH="x-rcN"
- else
- PATCH_BRANCH="${KV_MINOR}"
- fi
-
- if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
- UTIL_BRANCH="x-rcN"
- elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
- UTIL_BRANCH="${UTIL_MAX_VER}"
- else
- UTIL_BRANCH="${KV_MINOR}"
- fi
-
- if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \
- patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then
- if use kernel-patch; then
- cd ${KV_DIR}
- ewarn "Patching your kernel..."
- patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null
- patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null
- epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.patch
- [[ ${KV_MINOR} -gt ${PATCH_MAX_VER} ]] && \
- epatch "${FILESDIR}"/${PN}-fix-export-__devcgroup_inode_permission.patch
- ewarn "You need to compile your kernel with the applied patch"
- ewarn "to be able to load and use the aufs kernel module"
- else
- eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
- eerror "Either enable the kernel-patch useflag to do it with this ebuild"
- eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and"
- eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand"
- die "missing kernel patch, please apply it first"
- fi
- fi
- export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
- for option in $*; do
- grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
- sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
- done
-}
-
-src_prepare() {
- local module_branch=origin/${PN}.${PATCH_BRANCH}
- local util_branch=origin/${PN}.${UTIL_BRANCH}
-
- einfo "Using for module creation branch ${module_branch}"
- git checkout -q -b local-gentoo ${module_branch} || die
-
- # All config options to off
- sed "s:= y:=:g" -i config.mk || die
-
- set_config RDU BRANCH_MAX_127 SBILIST
-
- use debug && set_config DEBUG
- use fuse && set_config BR_FUSE POLL
- use hfs && set_config BR_HFSPLUS
- use inotify && set_config HNOTIFY HFSNOTIFY
- use nfs && set_config EXPORT
- use nfs && use amd64 && set_config INO_T_64
- use ramfs && set_config BR_RAMFS
-
- use pax_kernel && epatch "${FILESDIR}"/pax.patch
-
- sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
- sed -i "s:__user::g" include/linux/aufs_type.h || die
-
- cd "${WORKDIR}"/${PN/3}-util
-
- einfo "Using for utils building branch ${util_branch}"
- git checkout -b local-gentoo ${util_branch} || die
- sed -i "/LDFLAGS += -static -s/d" Makefile || die
- sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
-}
-
-src_compile() {
- local ARCH=x86
-
- emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
-
- cd "${WORKDIR}"/${PN/3}-util
- emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
-}
-
-src_install() {
- linux-mod_src_install
-
- insinto /usr/share/doc/${PF}
-
- use doc && doins -r Documentation
-
- dodoc README
-
- cd "${WORKDIR}"/${PN/3}-util
- emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
- newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20120319.ebuild b/sys-fs/aufs3/aufs3-3_p20120319.ebuild
deleted file mode 100644
index 0e847fbf5061..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20120319.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120319.ebuild,v 1.1 2012/03/19 21:25:20 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-PATCH_MAX_VER="2"
-UTIL_MAX_VER="0"
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
-
-DEPEND="dev-vcs/git"
-RDEPEND="
- !sys-fs/aufs
- !sys-fs/aufs2"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
- CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
- use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
- use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
- use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
- use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
-
- # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
- [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
- get_version
- kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
- kernel_is gt 3 3 99 && die "kernel too new"
-
- linux-mod_pkg_setup
-
- if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
- PATCH_BRANCH="x-rcN"
- else
- PATCH_BRANCH="${KV_MINOR}"
- fi
-
- if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
- UTIL_BRANCH="x-rcN"
- elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
- UTIL_BRANCH="${UTIL_MAX_VER}"
- else
- UTIL_BRANCH="${KV_MINOR}"
- fi
-
- if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \
- patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then
- if use kernel-patch; then
- cd ${KV_DIR}
- ewarn "Patching your kernel..."
- patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null
- patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null
- epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.patch
- ewarn "You need to compile your kernel with the applied patch"
- ewarn "to be able to load and use the aufs kernel module"
- else
- eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
- eerror "Either enable the kernel-patch useflag to do it with this ebuild"
- eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and"
- eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand"
- die "missing kernel patch, please apply it first"
- fi
- fi
- export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
- for option in $*; do
- grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
- sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
- done
-}
-
-src_prepare() {
- local module_branch=origin/${PN}.${PATCH_BRANCH}
- local util_branch=origin/${PN}.${UTIL_BRANCH}
-
- einfo "Using for module creation branch ${module_branch}"
- git checkout -q -b local-gentoo ${module_branch} || die
-
- # All config options to off
- sed "s:= y:=:g" -i config.mk || die
-
- set_config RDU BRANCH_MAX_127 SBILIST
-
- use debug && set_config DEBUG
- use fuse && set_config BR_FUSE POLL
- use hfs && set_config BR_HFSPLUS
- use inotify && set_config HNOTIFY HFSNOTIFY
- use nfs && set_config EXPORT
- use nfs && use amd64 && set_config INO_T_64
- use ramfs && set_config BR_RAMFS
-
- use pax_kernel && epatch "${FILESDIR}"/pax.patch
-
- sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
- sed -i "s:__user::g" include/linux/aufs_type.h || die
-
- cd "${WORKDIR}"/${PN/3}-util
-
- einfo "Using for utils building branch ${util_branch}"
- git checkout -b local-gentoo ${util_branch} || die
- sed -i "/LDFLAGS += -static -s/d" Makefile || die
- sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
-}
-
-src_compile() {
- local ARCH=x86
-
- emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
-
- cd "${WORKDIR}"/${PN/3}-util
- emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
-}
-
-src_install() {
- linux-mod_src_install
-
- insinto /usr/share/doc/${PF}
-
- use doc && doins -r Documentation
-
- dodoc README
-
- cd "${WORKDIR}"/${PN/3}-util
- emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
- newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20120402.ebuild b/sys-fs/aufs3/aufs3-3_p20120402.ebuild
deleted file mode 100644
index b29eeb5bb162..000000000000
--- a/sys-fs/aufs3/aufs3-3_p20120402.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120402.ebuild,v 1.2 2012/04/28 06:59:11 jlec Exp $
-
-EAPI=4
-
-inherit linux-mod multilib toolchain-funcs
-
-AUFS_VERSION="${PV%%_p*}"
-PATCH_MAX_VER="3"
-UTIL_MAX_VER="0"
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
-
-DEPEND="dev-vcs/git"
-RDEPEND="
- !sys-fs/aufs
- !sys-fs/aufs2"
-
-S="${WORKDIR}"/${PN}-standalone
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
- CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
- use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
- use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
- use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
- use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
-
- # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
- [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
-
- get_version
- kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
- kernel_is gt 3 3 99 && die "kernel too new"
-
- linux-mod_pkg_setup
-
- if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
- PATCH_BRANCH="x-rcN"
- else
- PATCH_BRANCH="${KV_MINOR}"
- fi
-
- if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
- UTIL_BRANCH="x-rcN"
- elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
- UTIL_BRANCH="${UTIL_MAX_VER}"
- else
- UTIL_BRANCH="${KV_MINOR}"
- fi
-
- if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \
- patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then
- if use kernel-patch; then
- cd ${KV_DIR}
- ewarn "Patching your kernel..."
- patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null
- patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null
- epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.patch
- ewarn "You need to compile your kernel with the applied patch"
- ewarn "to be able to load and use the aufs kernel module"
- else
- eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
- eerror "Either enable the kernel-patch useflag to do it with this ebuild"
- eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and"
- eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand"
- die "missing kernel patch, please apply it first"
- fi
- fi
- export PKG_SETUP_HAS_BEEN_RAN=1
-}
-
-set_config() {
- for option in $*; do
- grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
- sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
- done
-}
-
-src_prepare() {
- local module_branch=origin/${PN}.${PATCH_BRANCH}
- local util_branch=origin/${PN}.${UTIL_BRANCH}
-
- einfo "Using for module creation branch ${module_branch}"
- git checkout -q -b local-gentoo ${module_branch} || die
-
- # All config options to off
- sed "s:= y:=:g" -i config.mk || die
-
- set_config RDU BRANCH_MAX_127 SBILIST
-
- use debug && set_config DEBUG
- use fuse && set_config BR_FUSE POLL
- use hfs && set_config BR_HFSPLUS
- use inotify && set_config HNOTIFY HFSNOTIFY
- use nfs && set_config EXPORT
- use nfs && use amd64 && set_config INO_T_64
- use ramfs && set_config BR_RAMFS
-
- use pax_kernel && epatch "${FILESDIR}"/pax.patch
-
- sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
- sed -i "s:__user::g" include/linux/aufs_type.h || die
-
- epatch "${FILESDIR}"/parallel.patch
-
- cd "${WORKDIR}"/${PN/3}-util
-
- einfo "Using for utils building branch ${util_branch}"
- git checkout -b local-gentoo ${util_branch} || die
- sed -i "/LDFLAGS += -static -s/d" Makefile || die
- sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
-}
-
-src_compile() {
- local ARCH=x86
-
- emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
-
- cd "${WORKDIR}"/${PN/3}-util
- emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
-}
-
-src_install() {
- linux-mod_src_install
-
- insinto /usr/share/doc/${PF}
-
- use doc && doins -r Documentation
-
- dodoc README
-
- cd "${WORKDIR}"/${PN/3}-util
- emake DESTDIR="${D}" KDIR=${KV_DIR} install
-
- newdoc README README-utils
-}
diff --git a/sys-fs/aufs3/aufs3-3_p20120329.ebuild b/sys-fs/aufs3/aufs3-3_p20120523.ebuild
similarity index 94%
rename from sys-fs/aufs3/aufs3-3_p20120329.ebuild
rename to sys-fs/aufs3/aufs3-3_p20120523.ebuild
index acb6421f240a..bb5fd55d786c 100644
--- a/sys-fs/aufs3/aufs3-3_p20120329.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20120523.ebuild
@@ -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/sys-fs/aufs3/aufs3-3_p20120329.ebuild,v 1.1 2012/03/29 07:48:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120523.ebuild,v 1.1 2012/05/23 06:31:29 jlec Exp $
EAPI=4
inherit linux-mod multilib toolchain-funcs
AUFS_VERSION="${PV%%_p*}"
-PATCH_MAX_VER="3"
-UTIL_MAX_VER="0"
+PATCH_MAX_VER=4
+UTIL_MAX_VER=0
DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
HOMEPAGE="http://aufs.sourceforge.net/"
@@ -40,7 +40,7 @@ pkg_setup() {
get_version
kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
- kernel_is gt 3 3 99 && die "kernel too new"
+ kernel_is gt 3 4 99 && die "kernel too new"
linux-mod_pkg_setup
@@ -135,7 +135,7 @@ src_install() {
use doc && doins -r Documentation
- dodoc README
+ dodoc Documentation/filesystems/aufs/README
cd "${WORKDIR}"/${PN/3}-util
emake DESTDIR="${D}" KDIR=${KV_DIR} install
diff --git a/sys-fs/aufs3/files/aufs3-base-4.patch b/sys-fs/aufs3/files/aufs3-base-4.patch
new file mode 100644
index 000000000000..d639d79bd228
--- /dev/null
+++ b/sys-fs/aufs3/files/aufs3-base-4.patch
@@ -0,0 +1,70 @@
+aufs3.4 base patch
+
+diff --git a/fs/namei.c b/fs/namei.c
+index c427919..7ff959b 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1831,7 +1831,7 @@ int vfs_path_lookup(struct dentry *dentry, struct vfsmount *mnt,
+ * needs parent already locked. Doesn't follow mounts.
+ * SMP-safe.
+ */
+-static struct dentry *lookup_hash(struct nameidata *nd)
++struct dentry *lookup_hash(struct nameidata *nd)
+ {
+ return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
+diff --git a/fs/splice.c b/fs/splice.c
+index f847684..f871233 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1084,8 +1084,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
+ /*
+ * Attempt to initiate a splice from pipe to file.
+ */
+-static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+- loff_t *ppos, size_t len, unsigned int flags)
++long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++ loff_t *ppos, size_t len, unsigned int flags)
+ {
+ ssize_t (*splice_write)(struct pipe_inode_info *, struct file *,
+ loff_t *, size_t, unsigned int);
+@@ -1112,9 +1112,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+ /*
+ * Attempt to initiate a splice from a file to a pipe.
+ */
+-static long do_splice_to(struct file *in, loff_t *ppos,
+- struct pipe_inode_info *pipe, size_t len,
+- unsigned int flags)
++long do_splice_to(struct file *in, loff_t *ppos,
++ struct pipe_inode_info *pipe, size_t len,
++ unsigned int flags)
+ {
+ ssize_t (*splice_read)(struct file *, loff_t *,
+ struct pipe_inode_info *, size_t, unsigned int);
+diff --git a/include/linux/namei.h b/include/linux/namei.h
+index ffc0213..ef35a31 100644
+--- a/include/linux/namei.h
++++ b/include/linux/namei.h
+@@ -85,6 +85,7 @@ extern int vfs_path_lookup(struct dentry *, struct vfsmount *,
+ extern struct file *lookup_instantiate_filp(struct nameidata *nd, struct dentry *dentry,
+ int (*open)(struct inode *, struct file *));
+
++extern struct dentry *lookup_hash(struct nameidata *nd);
+ extern struct dentry *lookup_one_len(const char *, struct dentry *, int);
+
+ extern int follow_down_one(struct path *);
+diff --git a/include/linux/splice.h b/include/linux/splice.h
+index 26e5b61..3ffef2f 100644
+--- a/include/linux/splice.h
++++ b/include/linux/splice.h
+@@ -91,4 +91,10 @@ extern void splice_shrink_spd(struct pipe_inode_info *,
+ extern void spd_release_page(struct splice_pipe_desc *, unsigned int);
+
+ extern const struct pipe_buf_operations page_cache_pipe_buf_ops;
++
++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
++ loff_t *ppos, size_t len, unsigned int flags);
++extern long do_splice_to(struct file *in, loff_t *ppos,
++ struct pipe_inode_info *pipe, size_t len,
++ unsigned int flags);
+ #endif
diff --git a/sys-fs/aufs3/files/aufs3-standalone-4.patch b/sys-fs/aufs3/files/aufs3-standalone-4.patch
new file mode 100644
index 000000000000..67cd853bd87b
--- /dev/null
+++ b/sys-fs/aufs3/files/aufs3-standalone-4.patch
@@ -0,0 +1,257 @@
+aufs3.4 standalone patch
+
+diff --git a/fs/file_table.c b/fs/file_table.c
+index 70f2a0f..146a3d7 100644
+--- a/fs/file_table.c
++++ b/fs/file_table.c
+@@ -442,6 +442,8 @@ void file_sb_list_del(struct file *file)
+ }
+ }
+
++EXPORT_SYMBOL(file_sb_list_del);
++
+ #ifdef CONFIG_SMP
+
+ /*
+diff --git a/fs/inode.c b/fs/inode.c
+index 9f4f5fe..bb0f3ba 100644
+--- a/fs/inode.c
++++ b/fs/inode.c
+@@ -56,6 +56,7 @@ static struct hlist_head *inode_hashtable __read_mostly;
+ static __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_hash_lock);
+
+ __cacheline_aligned_in_smp DEFINE_SPINLOCK(inode_sb_list_lock);
++EXPORT_SYMBOL(inode_sb_list_lock);
+
+ /*
+ * Empty aops. Can be used for the cases where the user does not
+diff --git a/fs/namei.c b/fs/namei.c
+index 7ff959b..b170167 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1835,6 +1835,7 @@ struct dentry *lookup_hash(struct nameidata *nd)
+ {
+ return __lookup_hash(&nd->last, nd->path.dentry, nd);
+ }
++EXPORT_SYMBOL(lookup_hash);
+
+ /**
+ * lookup_one_len - filesystem helper to lookup single pathname component
+diff --git a/fs/namespace.c b/fs/namespace.c
+index e608199..38fcc2e 100644
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -1339,6 +1339,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+ }
+ return 0;
+ }
++EXPORT_SYMBOL(iterate_mounts);
+
+ static void cleanup_group_ids(struct mount *mnt, struct mount *end)
+ {
+diff --git a/fs/notify/group.c b/fs/notify/group.c
+index 63fc294..6f4adca 100644
+--- a/fs/notify/group.c
++++ b/fs/notify/group.c
+@@ -22,6 +22,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include
+ #include "fsnotify.h"
+@@ -70,6 +71,7 @@ void fsnotify_put_group(struct fsnotify_group *group)
+ if (atomic_dec_and_test(&group->refcnt))
+ fsnotify_destroy_group(group);
+ }
++EXPORT_SYMBOL(fsnotify_put_group);
+
+ /*
+ * Create a new fsnotify_group and hold a reference for the group returned.
+@@ -102,3 +104,4 @@ struct fsnotify_group *fsnotify_alloc_group(const struct fsnotify_ops *ops)
+
+ return group;
+ }
++EXPORT_SYMBOL(fsnotify_alloc_group);
+diff --git a/fs/notify/mark.c b/fs/notify/mark.c
+index f104d56..54f36db 100644
+--- a/fs/notify/mark.c
++++ b/fs/notify/mark.c
+@@ -112,6 +112,7 @@ void fsnotify_put_mark(struct fsnotify_mark *mark)
+ if (atomic_dec_and_test(&mark->refcnt))
+ mark->free_mark(mark);
+ }
++EXPORT_SYMBOL(fsnotify_put_mark);
+
+ /*
+ * Any time a mark is getting freed we end up here.
+@@ -191,6 +192,7 @@ void fsnotify_destroy_mark(struct fsnotify_mark *mark)
+ if (unlikely(atomic_dec_and_test(&group->num_marks)))
+ fsnotify_final_destroy_group(group);
+ }
++EXPORT_SYMBOL(fsnotify_destroy_mark);
+
+ void fsnotify_set_mark_mask_locked(struct fsnotify_mark *mark, __u32 mask)
+ {
+@@ -278,6 +280,7 @@ err:
+
+ return ret;
+ }
++EXPORT_SYMBOL(fsnotify_add_mark);
+
+ /*
+ * clear any marks in a group in which mark->flags & flags is true
+@@ -333,6 +336,7 @@ void fsnotify_init_mark(struct fsnotify_mark *mark,
+ atomic_set(&mark->refcnt, 1);
+ mark->free_mark = free_mark;
+ }
++EXPORT_SYMBOL(fsnotify_init_mark);
+
+ static int fsnotify_mark_destroy(void *ignored)
+ {
+diff --git a/fs/open.c b/fs/open.c
+index 5720854..ec59242 100644
+--- a/fs/open.c
++++ b/fs/open.c
+@@ -60,6 +60,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
+ mutex_unlock(&dentry->d_inode->i_mutex);
+ return ret;
+ }
++EXPORT_SYMBOL(do_truncate);
+
+ static long do_sys_truncate(const char __user *pathname, loff_t length)
+ {
+diff --git a/fs/splice.c b/fs/splice.c
+index f871233..70f5481 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1108,6 +1108,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
+
+ return splice_write(pipe, out, ppos, len, flags);
+ }
++EXPORT_SYMBOL(do_splice_from);
+
+ /*
+ * Attempt to initiate a splice from a file to a pipe.
+@@ -1134,6 +1135,7 @@ long do_splice_to(struct file *in, loff_t *ppos,
+
+ return splice_read(in, ppos, pipe, len, flags);
+ }
++EXPORT_SYMBOL(do_splice_to);
+
+ /**
+ * splice_direct_to_actor - splices data directly between two non-pipes
+diff --git a/security/commoncap.c b/security/commoncap.c
+index 71a166a..5d63aac 100644
+--- a/security/commoncap.c
++++ b/security/commoncap.c
+@@ -972,3 +972,4 @@ int cap_file_mmap(struct file *file, unsigned long reqprot,
+ }
+ return ret;
+ }
++EXPORT_SYMBOL(cap_file_mmap);
+diff --git a/security/device_cgroup.c b/security/device_cgroup.c
+index c43a332..0c37289 100644
+--- a/security/device_cgroup.c
++++ b/security/device_cgroup.c
+@@ -7,6 +7,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
+@@ -499,6 +500,7 @@ found:
+
+ return -EPERM;
+ }
++EXPORT_SYMBOL(__devcgroup_inode_permission);
+
+ int devcgroup_inode_mknod(int mode, dev_t dev)
+ {
+diff --git a/security/security.c b/security/security.c
+index bf619ff..60b996a 100644
+--- a/security/security.c
++++ b/security/security.c
+@@ -380,6 +380,7 @@ int security_path_rmdir(struct path *dir, struct dentry *dentry)
+ return 0;
+ return security_ops->path_rmdir(dir, dentry);
+ }
++EXPORT_SYMBOL(security_path_rmdir);
+
+ int security_path_unlink(struct path *dir, struct dentry *dentry)
+ {
+@@ -396,6 +397,7 @@ int security_path_symlink(struct path *dir, struct dentry *dentry,
+ return 0;
+ return security_ops->path_symlink(dir, dentry, old_name);
+ }
++EXPORT_SYMBOL(security_path_symlink);
+
+ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+ struct dentry *new_dentry)
+@@ -404,6 +406,7 @@ int security_path_link(struct dentry *old_dentry, struct path *new_dir,
+ return 0;
+ return security_ops->path_link(old_dentry, new_dir, new_dentry);
+ }
++EXPORT_SYMBOL(security_path_link);
+
+ int security_path_rename(struct path *old_dir, struct dentry *old_dentry,
+ struct path *new_dir, struct dentry *new_dentry)
+@@ -422,6 +425,7 @@ int security_path_truncate(struct path *path)
+ return 0;
+ return security_ops->path_truncate(path);
+ }
++EXPORT_SYMBOL(security_path_truncate);
+
+ int security_path_chmod(struct path *path, umode_t mode)
+ {
+@@ -429,6 +433,7 @@ int security_path_chmod(struct path *path, umode_t mode)
+ return 0;
+ return security_ops->path_chmod(path, mode);
+ }
++EXPORT_SYMBOL(security_path_chmod);
+
+ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+ {
+@@ -436,6 +441,7 @@ int security_path_chown(struct path *path, uid_t uid, gid_t gid)
+ return 0;
+ return security_ops->path_chown(path, uid, gid);
+ }
++EXPORT_SYMBOL(security_path_chown);
+
+ int security_path_chroot(struct path *path)
+ {
+@@ -512,6 +518,7 @@ int security_inode_readlink(struct dentry *dentry)
+ return 0;
+ return security_ops->inode_readlink(dentry);
+ }
++EXPORT_SYMBOL(security_inode_readlink);
+
+ int security_inode_follow_link(struct dentry *dentry, struct nameidata *nd)
+ {
+@@ -526,6 +533,7 @@ int security_inode_permission(struct inode *inode, int mask)
+ return 0;
+ return security_ops->inode_permission(inode, mask);
+ }
++EXPORT_SYMBOL(security_inode_permission);
+
+ int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
+ {
+@@ -641,6 +649,7 @@ int security_file_permission(struct file *file, int mask)
+
+ return fsnotify_perm(file, mask);
+ }
++EXPORT_SYMBOL(security_file_permission);
+
+ int security_file_alloc(struct file *file)
+ {
+@@ -668,6 +677,7 @@ int security_file_mmap(struct file *file, unsigned long reqprot,
+ return ret;
+ return ima_file_mmap(file, prot);
+ }
++EXPORT_SYMBOL(security_file_mmap);
+
+ int security_file_mprotect(struct vm_area_struct *vma, unsigned long reqprot,
+ unsigned long prot)
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index c8355c83de68..c64b7ee8b5f8 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,3 +1,3 @@
DIST parallel-20120122.tar.bz2 187858 RMD160 90616ea027ad697c5274ebad5b5cf366f5bd327a SHA1 4451129c285f0fc10155949f11b4f523450a599f SHA256 cab27e2c853fb06654a2da5b3d0ba7b471fb8104dbfd2c506dd9920ca8d64e9a
-DIST parallel-20120322.tar.bz2 224794 RMD160 12bf540fba07a585d03bff886da688bfa18bbdc3 SHA1 2f99a28eb3dd904b7aa0817dcfacf65bded4f845 SHA256 b267b684d20a674eeada9e8498964a601efdc3c8895fee9a7859c0ae9ea4a3da
DIST parallel-20120422.tar.bz2 224881 RMD160 81101d138752be6c9d24d422cf249b3f0cea3dc6 SHA1 1f0e9bdca7271fa6932a570980b8a3b335b2eaa5 SHA256 29210b77f0729486b7dda51ba54ac9b5e6aa2e57305f3d661259c99e8cc1937c
+DIST parallel-20120522.tar.bz2 226625 RMD160 f1bff4bff0585e06c43d3827e2c9dc141979863d SHA1 bc8118949f900c05ef232c6946c4ebfa779cafed SHA256 697cd39b089d5b302fe8965650c5c6d9e8a6653f59e90a6c1a297aba0df31471
diff --git a/sys-process/parallel/parallel-20120422.ebuild b/sys-process/parallel/parallel-20120422.ebuild
index d4c6eadf676a..8b693d0774e9 100644
--- a/sys-process/parallel/parallel-20120422.ebuild
+++ b/sys-process/parallel/parallel-20120422.ebuild
@@ -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/sys-process/parallel/parallel-20120422.ebuild,v 1.1 2012/04/22 21:29:20 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/parallel/parallel-20120422.ebuild,v 1.2 2012/05/23 07:03:03 jdhore Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND="dev-lang/perl
diff --git a/sys-process/parallel/parallel-20120322.ebuild b/sys-process/parallel/parallel-20120522.ebuild
similarity index 94%
rename from sys-process/parallel/parallel-20120322.ebuild
rename to sys-process/parallel/parallel-20120522.ebuild
index 3a0a009fdf65..a9bc7fe216b5 100644
--- a/sys-process/parallel/parallel-20120322.ebuild
+++ b/sys-process/parallel/parallel-20120522.ebuild
@@ -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/sys-process/parallel/parallel-20120322.ebuild,v 1.1 2012/03/22 10:20:01 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/parallel/parallel-20120522.ebuild,v 1.1 2012/05/23 06:34:34 radhermit Exp $
EAPI=4
diff --git a/x11-libs/qscintilla/qscintilla-2.6.1.ebuild b/x11-libs/qscintilla/qscintilla-2.6.1.ebuild
index 24b4fe645c84..a0ad9af462ec 100644
--- a/x11-libs/qscintilla/qscintilla-2.6.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.6.1.ebuild
@@ -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/x11-libs/qscintilla/qscintilla-2.6.1.ebuild,v 1.3 2012/04/24 17:01:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qscintilla/qscintilla-2.6.1.ebuild,v 1.4 2012/05/23 04:46:39 jdhore Exp $
EAPI="3"
@@ -14,7 +14,7 @@ SRC_URI="http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/${MY_P
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="doc python"
DEPEND="x11-libs/qt-gui:4"