diff --git a/app-arch/freeze/files/freeze-2.5.0-gentoo.patch b/app-arch/freeze/files/freeze-2.5.0-gentoo.patch
new file mode 100644
index 000000000000..3be357c25309
--- /dev/null
+++ b/app-arch/freeze/files/freeze-2.5.0-gentoo.patch
@@ -0,0 +1,55 @@
+--- a/Makefile.in 1999-05-20 11:07:51.000000000 +0200
++++ b/Makefile.in 2012-12-12 17:22:36.444775985 +0100
+@@ -3,7 +3,7 @@
+ VPATH = $(srcdir)
+
+ CC = @CC@
+-CFLAGS = -I. # -O2 # for gcc 2.2.2
++CFLAGS += -I.
+
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+@@ -79,15 +79,15 @@
+
+ freeze$(EXE): $(OBJS)
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
+- -strip $@
++
+
+ statist$(EXE): statist.$(OBJ) lz.$(OBJ)
+ $(CC) $(LDFLAGS) -o $@ statist.$(OBJ) lz.$(OBJ) $(LIBS)
+- -strip $@
++
+
+ showhuf$(EXE): showhuf.$(OBJ)
+ $(CC) $(LDFLAGS) -o $@ showhuf.$(OBJ) $(LIBS)
+- -strip $@
++
+
+ clobber: clean
+ rm -f freeze$(EXE) statist$(EXE) showhuf$(EXE) *.man \#* *~ config.h Makefile
+@@ -101,18 +101,18 @@
+
+ $(DEST)/freeze: freeze
+ $(INSTALL_PROGRAM) freeze $@
+- -ln -f $@ $(DEST)/melt
+- -ln -f $@ $(DEST)/unfreeze
+- -ln -f $@ $(DEST)/fcat
++ ln -sf $< $(DEST)/melt
++ ln -sf $< $(DEST)/unfreeze
++ ln -sf $< $(DEST)/fcat
+
+ $(DEST)/statist: statist
+ $(INSTALL_PROGRAM) statist $@
+
+ $(MANDEST)/freeze.$(SEC): freeze.1
+ $(INSTALL_DATA) $(srcdir)/freeze.1 $@
+- -ln -f $@ $(MANDEST)/melt.$(SEC)
+- -ln -f $@ $(MANDEST)/unfreeze.$(SEC)
+- -ln -f $@ $(MANDEST)/fcat.$(SEC)
++ ln -sf $< $(MANDEST)/melt.$(SEC)
++ ln -sf $< $(MANDEST)/unfreeze.$(SEC)
++ ln -sf $< $(MANDEST)/fcat.$(SEC)
+ # This is much better for places which keep preformated manpages.
+ # echo ".so man1/freeze.$(SEC)" > $(MANDEST)/melt.$(SEC)
+ # echo ".so man1/freeze.$(SEC)" > $(MANDEST)/unfreeze.$(SEC)
diff --git a/app-arch/freeze/freeze-2.5.0-r1.ebuild b/app-arch/freeze/freeze-2.5.0-r1.ebuild
new file mode 100644
index 000000000000..89526629de73
--- /dev/null
+++ b/app-arch/freeze/freeze-2.5.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/freeze/freeze-2.5.0-r1.ebuild,v 1.2 2012/12/12 16:29:58 jer Exp $
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Freeze/unfreeze compression program"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/utils/compress/"
+SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/utils/compress/${P}.tar.gz"
+
+LICENSE="GPL-1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+ !<=media-libs/mlt-0.4.2
+ !media-libs/mlt[melt]
+"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+ emake \
+ CC=$(tc-getCC) \
+ OPTIONS="-DDEFFILE=\\\"/etc/freeze.cnf\\\""
+}
+
+src_install() {
+ dodir /usr/bin /usr/share/man/man1
+
+ emake \
+ DEST="${D}/usr/bin" \
+ MANDEST="${D}/usr/share/man/man1" \
+ install
+
+ # these symlinks collide with app-forensics/sleuthkit (bug #444872)
+ rm "${D}"/usr/bin/fcat "${D}"/usr/share/man/man1/fcat.1 || die
+
+ dobin showhuf
+ dodoc README *.lsm
+}
diff --git a/app-arch/freeze/freeze-2.5.0.ebuild b/app-arch/freeze/freeze-2.5.0.ebuild
index f001065da873..147144535aba 100644
--- a/app-arch/freeze/freeze-2.5.0.ebuild
+++ b/app-arch/freeze/freeze-2.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-arch/freeze/freeze-2.5.0.ebuild,v 1.21 2012/12/09 18:57:25 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/freeze/freeze-2.5.0.ebuild,v 1.22 2012/12/12 16:14:01 jer Exp $
EAPI="2"
inherit toolchain-funcs
@@ -16,7 +16,7 @@ IUSE=""
RDEPEND="
!<=media-libs/mlt-0.4.2
- !app-forensics/sleuthkit
+ !>=app-forensics/sleuthkit-4.0.1
!media-libs/mlt[melt]
"
DEPEND="${RDEPEND}
diff --git a/app-emulation/vmware-modules/vmware-modules-238.6.ebuild b/app-emulation/vmware-modules/vmware-modules-238.6.ebuild
index 930c41ac04e7..d4c527aefe90 100644
--- a/app-emulation/vmware-modules/vmware-modules-238.6.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-238.6.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-238.6.ebuild,v 1.1 2012/06/17 13:09:10 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-238.6.ebuild,v 1.2 2012/12/12 11:46:57 ssuominen Exp $
EAPI="4"
-inherit eutils flag-o-matic linux-info linux-mod user versionator
+inherit eutils flag-o-matic linux-info linux-mod user versionator udev
PV_MAJOR=$(get_major_version)
PV_MINOR=$(get_version_component_range 2)
@@ -77,6 +77,5 @@ src_install() {
KERNEL=="vmmon", GROUP="vmware", MODE=660
KERNEL=="vsock", GROUP="vmware", MODE=660
EOF
- insinto /lib/udev/rules.d/
- doins "${udevrules}"
+ udev_dorules "${udevrules}"
}
diff --git a/app-emulation/vmware-modules/vmware-modules-264.4.ebuild b/app-emulation/vmware-modules/vmware-modules-264.4.ebuild
index 6a4edfd21851..64f5d39a5970 100644
--- a/app-emulation/vmware-modules/vmware-modules-264.4.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-264.4.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.4.ebuild,v 1.1 2012/06/17 13:09:10 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-264.4.ebuild,v 1.2 2012/12/12 11:46:57 ssuominen Exp $
EAPI="4"
-inherit eutils flag-o-matic linux-info linux-mod user versionator
+inherit eutils flag-o-matic linux-info linux-mod user versionator udev
PV_MAJOR=$(get_major_version)
PV_MINOR=$(get_version_component_range 2)
@@ -77,6 +77,5 @@ src_install() {
KERNEL=="vmmon", GROUP="vmware", MODE=660
KERNEL=="vsock", GROUP="vmware", MODE=660
EOF
- insinto /lib/udev/rules.d/
- doins "${udevrules}"
+ udev_dorules "${udevrules}"
}
diff --git a/app-emulation/vmware-modules/vmware-modules-271.1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.1.ebuild
index 0110e10b3a44..c894bb31e259 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-271.1.ebuild,v 1.1 2012/12/09 14:29:00 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-271.1.ebuild,v 1.2 2012/12/12 11:46:57 ssuominen Exp $
EAPI="4"
-inherit eutils flag-o-matic linux-info linux-mod user versionator
+inherit eutils flag-o-matic linux-info linux-mod user versionator udev
PV_MAJOR=$(get_major_version)
PV_MINOR=$(get_version_component_range 2)
@@ -74,6 +74,5 @@ src_install() {
KERNEL=="vmmon", GROUP="vmware", MODE=660
KERNEL=="vsock", GROUP="vmware", MODE=660
EOF
- insinto /lib/udev/rules.d/
- doins "${udevrules}"
+ udev_dorules "${udevrules}"
}
diff --git a/app-forensics/sleuthkit/sleuthkit-4.0.0.ebuild b/app-forensics/sleuthkit/sleuthkit-4.0.0.ebuild
index 25dd194ac7ca..3b0d097931a1 100644
--- a/app-forensics/sleuthkit/sleuthkit-4.0.0.ebuild
+++ b/app-forensics/sleuthkit/sleuthkit-4.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-forensics/sleuthkit/sleuthkit-4.0.0.ebuild,v 1.1 2012/10/23 09:09:24 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/sleuthkit/sleuthkit-4.0.0.ebuild,v 1.2 2012/12/12 16:15:56 jer Exp $
EAPI="5"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2 IBM"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+KEYWORDS="~amd64 hppa ~ppc ~x86"
IUSE="aff ewf static-libs"
DEPEND="dev-db/sqlite:3
diff --git a/app-portage/esearch/esearch-1.3.ebuild b/app-portage/esearch/esearch-1.3.ebuild
index a602c5ea5f18..e49597dd7881 100644
--- a/app-portage/esearch/esearch-1.3.ebuild
+++ b/app-portage/esearch/esearch-1.3.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-portage/esearch/esearch-1.3.ebuild,v 1.2 2012/12/11 08:17:36 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/esearch/esearch-1.3.ebuild,v 1.3 2012/12/12 15:39:09 pinkbyte Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE="linguas_fr linguas_it"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
DEPEND="sys-apps/portage"
RDEPEND="${DEPEND}"
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild
index 143585ee698f..daddb3d939c4 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.0.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-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild,v 1.2 2012/11/07 15:30:41 fuzzyray Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0.7.ebuild,v 1.3 2012/12/12 15:35:16 pinkbyte Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
SLOT="0"
IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Note: dev-lang/python dependencies are so emerge will print a blocker if any
# installed slot of python is not built with +xml. This is used since
diff --git a/app-text/calibre/calibre-0.9.9.ebuild b/app-text/calibre/calibre-0.9.9.ebuild
index 2f01c7f79e8c..d11b755f13d6 100644
--- a/app-text/calibre/calibre-0.9.9.ebuild
+++ b/app-text/calibre/calibre-0.9.9.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.9.9.ebuild,v 1.1 2012/12/08 03:26:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.9.9.ebuild,v 1.2 2012/12/12 10:25:59 zmedico Exp $
EAPI=4
PYTHON_DEPEND=2:2.7
@@ -88,6 +88,12 @@ src_prepare() {
'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
'-i', 'Makefile'])" \
-i setup/extensions.py || die "sed failed to patch extensions.py"
+
+ # Disable destructive regex for Bug #446790.
+ if has_version '>=dev-python/PyQt4-4.9.6' ; then
+ sed -e "s|dat = re\.compile(r'QtGui\.QApplication\.translate.*|#\\0|" \
+ -i src/calibre/gui2/__init__.py || die
+ fi
}
src_install() {
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index 40f191d5ec1f..565d1041a97b 100644
--- a/app-text/psutils/Manifest
+++ b/app-text/psutils/Manifest
@@ -1 +1,2 @@
DIST psutils-1.17.tar.gz 62039 SHA256 3853eb79584ba8fbe27a815425b65a9f7f15b258e0d43a05a856bdb75d588ae4 SHA512 91feff88c885173ab1c4ba6b5ffd0d9e90bfa6105479b074065584fc2a87e78fbe71e4bc90d2e7079d86b467caf092b6744b0ea4234880ba78cad8dd7820de77 WHIRLPOOL 65422c05953bd4f0000c1b097f7f3651766ad36b70f5bfe06dd23ecc8d1f1c478434fb8c4d99d2fc271fa098173a8feb4b8582e681e20de61e48feaa49d18c2f
+DIST psutils_1.17.dfsg.orig.tar.gz 40296 SHA256 53e24aff04895b47fb2178dc9df3acb78d91c33c2d6bd524c49e9641479c4f6c SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3 WHIRLPOOL a621251c2956f40eeacbae77a68287a808446655b15d9c17b5d51d3f1946ddb427ae12a6172d49f5c82f31afb3b54fcf00f12aeb258e0cd08b7c9a60df1524f6
diff --git a/app-text/psutils/files/psutils-1.17-no-fixmacps.patch b/app-text/psutils/files/psutils-1.17-no-fixmacps.patch
new file mode 100644
index 000000000000..16a3c13484a2
--- /dev/null
+++ b/app-text/psutils/files/psutils-1.17-no-fixmacps.patch
@@ -0,0 +1,26 @@
+Files md68_0.ps md71_0.ps have unknown copyright and license and are
+therefore not included in the "DFSG" tarball. Suppress these files
+(and the fixmacps program that references them) in Makefile.
+https://bugs.gentoo.org/show_bug.cgi?id=440938
+
+--- psutils-1.17.orig/Makefile.unix
++++ psutils/Makefile.unix
+@@ -44,15 +44,15 @@
+ BIN = psbook psselect pstops epsffit psnup \
+ psresize
+ SHELLSCRIPTS = getafm showchar
+-PERLSCRIPTS = fixfmps fixmacps fixpsditps fixpspps \
++PERLSCRIPTS = fixfmps fixpsditps fixpspps \
+ fixtpps fixwfwps fixwpps fixscribeps fixwwps \
+ fixdlsrps extractres includeres psmerge
+ MANPAGES = psbook.$(MANEXT) psselect.$(MANEXT) pstops.$(MANEXT) epsffit.$(MANEXT) psnup.$(MANEXT) \
+ psresize.$(MANEXT) psmerge.$(MANEXT) fixscribeps.$(MANEXT) getafm.$(MANEXT) \
+- fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixmacps.$(MANEXT) fixpsditps.$(MANEXT) \
++ fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixpsditps.$(MANEXT) \
+ fixpspps.$(MANEXT) fixtpps.$(MANEXT) fixwfwps.$(MANEXT) fixwpps.$(MANEXT) \
+ fixwwps.$(MANEXT) extractres.$(MANEXT) includeres.$(MANEXT)
+-INCLUDES = md68_0.ps md71_0.ps
++INCLUDES =
+
+ all: $(BIN) $(PERLSCRIPTS) $(MANPAGES) $(SHELLSCRIPTS)
+
diff --git a/app-text/psutils/psutils-1.17-r2.ebuild b/app-text/psutils/psutils-1.17-r2.ebuild
new file mode 100644
index 000000000000..28727e249a47
--- /dev/null
+++ b/app-text/psutils/psutils-1.17-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/psutils/psutils-1.17-r2.ebuild,v 1.1 2012/12/12 08:16:41 ulm Exp $
+
+EAPI=3
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="PostScript Utilities"
+HOMEPAGE="http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/"
+SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
+
+LICENSE="psutils"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ dev-lang/perl"
+
+S="${WORKDIR}/${P}.orig"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-ldflags.patch"
+ epatch "${FILESDIR}/${P}-no-fixmacps.patch"
+ sed \
+ -e "s:/usr/local:\$(DESTDIR)${EPREFIX}/usr:" \
+ "${S}/Makefile.unix" > "${S}/Makefile"
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" || die
+}
+
+src_install () {
+ dodir /usr/{bin,share/man}
+ emake DESTDIR="${D}" install || die
+ dodoc README
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 571dc74f5c01..ee2fa83328b1 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -4,4 +4,5 @@ DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 a52e7f2abf0fbdd9665ca398d2b3
DIST apache-tomcat-6.0.36-src.tar.gz 3411736 SHA256 8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c SHA512 6646c54c6e2ce440b07401b0560617204cf6e8d65885120165cb38a9cabe8f3dc61d07330e5b03be1ad480bb131f2d63aef86e367d180df96e053200587384b3 WHIRLPOOL 5e168a6cd3389cb98d0a01a2bd23f4fb49eaa82af134175c21eca3975c1ca1a6003db023d8bc069f95d4ba43dd053e28e03ff626a5b09da74dc2ba365b8c9821
DIST apache-tomcat-7.0.32-src.tar.gz 4236930 SHA256 ab4a752a9f833340dc3ceea85edff84a4b0cd697cf6fb2a5348a14096b348dcb SHA512 ac6141713f05437834617df4113aad629e61d3d28e603f63d8ccd50f9a463c4bc0679cd853dc332660396bc84c9a437ec323767edba20cb4ed0650510d653577 WHIRLPOOL 9182666e580368e54d864271c407a8c2d21e024f156d33f823bbde0b9382a78e89dcecae01d691725c5a09e2a66cff590f8f3e75d427c26caf0526e3b1946ca6
DIST apache-tomcat-7.0.33-src.tar.gz 4240455 SHA256 f665b4b39471b6f7ddd10845058a76308694a8be24b7651971de86a34ca66243 SHA512 c0daaa785ac90c78fa52db576a9cbe67ab51d52fcc2f2155ccab188489e9c81cd9a6dc4302ec0a43b1628fad85245f382dc39adb62e8f8c1a65cde0439e1e62f WHIRLPOOL db7ddd69e8227c37278e5f2f95a365ddf0ad4d7d27dd697352fdc9e6138a9d0b3192ada7ffc5e9079ef6493e1a999c1cc979ba192219878b45003f0042138f3a
+DIST apache-tomcat-7.0.34-src.tar.gz 4245974 SHA256 c05b85928ff870244a061700166ee781e66bad68f4a7867ba22c48beeec19fc0 SHA512 288dfb93e3999b336e06411012d11be94cfc799602bf226f6b61343928bf1b1f746cf92042ac1917be35a059a9bd32e1521b47facd7596b4515387a5d9a9d3c6 WHIRLPOOL 8f9e912179f452478466ed09f63731462eb83e6b3e3f46a5125ac6336b24579d297e65b00c1fa286d1d2afd446238b052d4935df3a7409ecc7e4c3497e7ed1d3
DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.34.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.34.ebuild
new file mode 100644
index 000000000000..557dee9cb76e
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.34.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-7.0.34.ebuild,v 1.1 2012/12/12 11:16:49 fordfrog Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.6"
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+ cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+ rm -fR */*/build.xml
+ einfo "Removing bundled jars and classes"
+ find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -delete
+}
+
+src_install() {
+ java-pkg_dojar "${S}"/output/build/lib/*.jar
+ use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index fd1350236995..063afcfd4c25 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -1,10 +1,12 @@
DIST pl-6.2.0.tar.gz 14353730 SHA256 be358eacd50bc7013cdcdd1aa763e67c5b1d40f7bbf1833a7a48c0123a6455a8 SHA512 a8e265eecd26fde41732bd965a6201ee61101a31ffbc8ead89f9563e91a6bc85382c7aa0eb6e3eb79cfa7e3f3f7fe89f50776553dd2198eba48b2369c20f5616 WHIRLPOOL 0812b03c4a8e61a17afa7835d2f21ef5b68b8fa0badc09aeba8e7179aff41a783a928a22e55b3773caeaa15d384054ba0e948e0c4111fc067c65c3173dc68b04
DIST pl-6.2.1.tar.gz 14349946 SHA256 c5ceac0a23e6a2ab706a10987cb87a0cfe4e5c3d01600f6c5e178846310ea7e8 SHA512 090294477b319d761f0bad0c4fa11b3c16ed8377167b0eba4391f7498068d2c75cee10bc8c40e87c928ec701c5ffcb5cf6aa0f9e483dcef93d6e46997b52b611 WHIRLPOOL 65246d63243383f3e97c5dabf593a678a21d70e7afef86b9a65f51c1dd2eade2f610894d8aa261e05dd27ac7805bc50c933c91f2a41cb4544507da362bbaf0d8
DIST pl-6.2.2.tar.gz 14353692 SHA256 e2d5a62756ea0001f65a2411dfe7d380e1d2ab7b365fe12bc6e110d966fe43dd SHA512 fad8bd48ef496258b86527e9764c748b25a83c25dcc7aa4921fcc78df730e7c442a8c3524356b36f2cb92cdb71a116475f7039e4c829c7f41fc6994ce0fa636e WHIRLPOOL f133afa09055d506e4fbf8e3214b5f290b890a7c42e6bb046d97318fbc8f961be33d788a79076597b4434974d7444bf67ba193829faebe2c768ff13c2ed7801e
+DIST pl-6.2.3.tar.gz 14349678 SHA256 4421251d6ff74a410b5c42cd31d688cbfe80043bcc719f71d13bd57ecc2483f4 SHA512 a22f00652431fb32516dadcd92180971319002276642f520003dc1fce6b8962e0fdae282d75da06232b2440f4214bd4a1c4fca5c9a9ea9582fa55ace065c8dd7 WHIRLPOOL ac2e387a16a5741db55cdc168d25ab44814b61f0374de3a662e98acad72f9a798f8028f1ba8d49e2a544a8bd883c4af3126ff8f606ffd49cfefdaa79d6b8fc64
DIST pl-6.3.3.tar.gz 14467750 SHA256 6ea09e5a07eb80f6eee49282ed669f9ef89a86443b58061677345e17675041d1 SHA512 5664fb7bbad3cceb430387542f11fbd394fc088738cec69510f192ab6df2052a99f0a57d4bdaa21d0e01259ab83d122cbf4ca1343d30e3cd1f43833254c60d2e WHIRLPOOL 98240880a50e3a318f06ad8cecb153acaf3b20c84e180039188f628ffe5f701285043da6dc41ca7cccdf099a932758fa7e85c0b996c542d16fb40b669f2a53ce
DIST pl-6.3.4.tar.gz 14470255 SHA256 fb660fe0c117b7c8f144fcb27ace47c6955533abe8728b21e06761685f7fb79d SHA512 1268d47e13f3f87acdc1cb5307a1141e7847f8db05460646027b0b3febebc3d9422f6a09aee3f259f3fd8d3cb46467b8aa6eaf84fb1e3c04911bfc73fc579f2c WHIRLPOOL a137cfa1ed044b6dbda1c3382092273813fa0ff299d16908bd5b730a592971f0940aca4a3c2877aae90d2ea4cf7793e04892ba94f7b287ba04e2ef86c2f94e7b
DIST swi-prolog-6.2.0-gentoo-patchset-5.tar.gz 5340 SHA256 94d1ca1c17bba09c00e8d29bf599598574667f2093996651a357eb168e5a3f7a SHA512 2a7bc9998c117a9e509f1bab73898f668922225af97f31a2569f689b89edba6776f6117f32e7023db22354e4fedefb557e7603be31fc5a696f939d271f1aebf2 WHIRLPOOL 5e05b315ff8914eb54ec4b91ce455c98604ae7b514acbafea9f72d70fcb6f68a77579e03a3b292a57c0f8dfe0d3cb6d07fe5fb9b29cdcbd051919dffc5fd5904
DIST swi-prolog-6.2.1-gentoo-patchset-4.tar.gz 4765 SHA256 2d08ec0f5d74794c8d9df48cff8cccce17fd427fa25fc14472aecb40dfc34481 SHA512 46d7af77b78bab4873b3c2456d65337cf051b5b015d6421c62024df9707265a140809ed843eac0e13e38122366bb5b433a626b340075f6b4e906df46a8abd819 WHIRLPOOL 84d1fc399ee945a9ea06a164b2dae9f4b57df4794b9da4eb84294435e5f8f5d091be8e8ce03b03a720d48a9d3554fdb01d3769842cff68d09a16a71170ae9c33
DIST swi-prolog-6.2.2-gentoo-patchset-0.tar.gz 4303 SHA256 824dd784cf3b7e1b45b65e6a923289de6e6e28d3cf0b797e071e4185f2c05f9f SHA512 5c9c579971172e7300c01120bb70c273ea37a9f962d9ede3d0e7bd45dba6441b7f3244b568643bc6f16b8eabd3099b4cbee25f5be17ac4cebe54c06547cf530f WHIRLPOOL db8349096acd6341de46465ee7c914d19087227fb31064cf3bc21593f2c25660bff2d7d7080e78dff92508bb29dde4da0248ce8b290809aa8543882c82cd0638
+DIST swi-prolog-6.2.3-gentoo-patchset-0.tar.gz 3737 SHA256 1254555d3c1927ffeca05b619f18ad7d48f27bdac33709996823fa4561e50983 SHA512 22feeb13ff09c3f1024ab395cc152943b1ee473c3faeda78f3868446dbf754fb30606d055911eabacb875b1e0c74ca421faf3382199882c7686f1d0d7c509aea WHIRLPOOL d0cd6c77c54fa0aac27c6f427839131f35beae07d3108351a998b362ff31f2aff98c3740c5c46b97213f98ed7fa01a8ee8ec6b17f14c44730673eb4870a3947a
DIST swi-prolog-6.3.3-gentoo-patchset-0.tar.gz 2732 SHA256 a1d1af6730cb0edb217e2705b1253ea44b5704e69b95230934cafbc2a4cc488f SHA512 c2e9aa945220dc4a0945639665ed041e694cb0940d9df3e19505a267bd1f2c135e001c5e7745cfb96e3ed462aa7837fad4079cd26dc44fe92c9e6de774f53186 WHIRLPOOL 48f1f848e39e7d5084b3e7b5ca411df72808ac44303ba192bb2da09dd96e66fe60c900e9cb4088e3eeb5f8cede0829f332682e07f53af6fc484731365cabddda
DIST swi-prolog-6.3.4-gentoo-patchset-0.tar.gz 2708 SHA256 8e589b63503355cd64746a38f95ea921791d6eea437d4d84ded3efd079408ccd SHA512 118d5fb931c1d499e57ee63977a7747a835e8a8329fa65b823c21a02661e117be8a7b611420ac4469292d390c2eecf4d0613c6f4286b2d87f03d4ec0a15053c0 WHIRLPOOL c171f1f35ddf2274e6925ac6f90de908ae3929bfbceacd31524821c1b2dc47cf5875cb3d5c0190de09bc79d5e9a9ade53135f2c48cc6ecc9b713ac15a0bf5ef0
diff --git a/dev-lang/swi-prolog/swi-prolog-6.2.3.ebuild b/dev-lang/swi-prolog/swi-prolog-6.2.3.ebuild
new file mode 100644
index 000000000000..69c3337012be
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-6.2.3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.2.3.ebuild,v 1.1 2012/12/12 14:38:01 keri Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/stable/src/pl-${PV}.tar.gz
+ mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="archive debug doc gmp hardened java minimal odbc readline ssl static-libs test zlib X"
+
+RDEPEND="sys-libs/ncurses
+ archive? ( app-arch/libarchive )
+ zlib? ( sys-libs/zlib )
+ odbc? ( dev-db/unixODBC )
+ readline? ( sys-libs/readline )
+ gmp? ( dev-libs/gmp )
+ ssl? ( dev-libs/openssl )
+ java? ( >=virtual/jdk-1.4 )
+ X? (
+ virtual/jpeg
+ x11-libs/libX11
+ x11-libs/libXft
+ x11-libs/libXpm
+ x11-libs/libXt
+ x11-libs/libICE
+ x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+ X? ( x11-proto/xproto )
+ java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/pl-${PV}"
+
+src_prepare() {
+ EPATCH_FORCE=yes
+ EPATCH_SUFFIX=patch
+ epatch "${WORKDIR}"/${PV}
+
+ # OSX/Intel ld doesn't like an archive without table of contents
+ sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ use ppc && append-flags -mno-altivec
+ use hardened && append-flags -fno-unit-at-a-time
+ use debug && append-flags -DO_DEBUG
+
+ # ARCH is used in the configure script to figure out host and target
+ # specific stuff
+ export ARCH=${CHOST}
+
+ cd "${S}"/src
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_enable gmp) \
+ $(use_enable readline) \
+ $(use_enable static-libs static) \
+ --enable-shared \
+ --enable-custom-flags COFLAGS="${CFLAGS}"
+
+ if ! use minimal ; then
+ local jpltestconf
+ if use java && use test ; then
+ jpltestconf="--with-junit=$(java-config --classpath junit)"
+ fi
+
+ cd "${S}/packages"
+ econf \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ $(use_with archive) \
+ --with-chr \
+ --with-clib \
+ --with-clpqr \
+ --with-cpp \
+ --with-http \
+ $(use_with java jpl) \
+ ${jpltestconf} \
+ --with-nlp \
+ $(use_with odbc) \
+ --with-PDT \
+ --with-pldoc \
+ --with-plunit \
+ --with-protobufs \
+ --with-R \
+ --with-RDF \
+ --with-semweb \
+ --with-sgml \
+ $(use_with ssl) \
+ --with-table \
+ --with-tipc \
+ --with-utf8proc \
+ $(use_with X xpce) \
+ $(use_with zlib) \
+ COFLAGS='"${CFLAGS}"'
+ fi
+}
+
+src_compile() {
+ cd "${S}"/src
+ emake
+
+ if ! use minimal ; then
+ cd "${S}/packages"
+ emake
+ fi
+}
+
+src_test() {
+ cd "${S}/src"
+ emake check
+
+ if ! use minimal ; then
+ cd "${S}/packages"
+ emake check
+ fi
+}
+
+src_install() {
+ emake -C src DESTDIR="${D}" install
+
+ if ! use minimal ; then
+ emake -C packages DESTDIR="${D}" install
+ if use doc ; then
+ emake -C packages DESTDIR="${D}" html-install
+ fi
+ fi
+
+ dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
+}
diff --git a/dev-lang/teyjus/files/teyjus-2.0.2-flags.patch b/dev-lang/teyjus/files/teyjus-2.0.2-flags.patch
index 86c67e7f52b0..dcccd25f9fe4 100644
--- a/dev-lang/teyjus/files/teyjus-2.0.2-flags.patch
+++ b/dev-lang/teyjus/files/teyjus-2.0.2-flags.patch
@@ -1,12 +1,14 @@
--- teyjus-orig/source/OMakefile 2008-11-17 07:52:31.000000000 +1100
-+++ teyjus/source/OMakefile 2012-03-24 00:27:22.431627679 +1100
-@@ -19,7 +19,8 @@
++++ teyjus/source/OMakefile 2012-12-12 21:24:24.318557107 +1100
+@@ -19,7 +19,10 @@
#
OCAMLINCLUDES += $(CMP) $(DIS) $(SIM) $(LOD)
-CFLAGS += -g
-+CFLAGS += -g -fPIC
-+OCAML_LINK_FLAGS += -shared
++CFLAGS +=
++LDFLAGS +=
++OCAMLFLAGS += -g
++OCAML_LINK_FLAGS +=
############################################################
# Compilation files
diff --git a/dev-lang/teyjus/teyjus-2.0.2.ebuild b/dev-lang/teyjus/teyjus-2.0.2.ebuild
index 8546b985ed00..65ed9826237c 100644
--- a/dev-lang/teyjus/teyjus-2.0.2.ebuild
+++ b/dev-lang/teyjus/teyjus-2.0.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/dev-lang/teyjus/teyjus-2.0.2.ebuild,v 1.1 2012/12/09 21:57:06 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/teyjus/teyjus-2.0.2.ebuild,v 1.2 2012/12/12 10:42:06 gienah Exp $
EAPI="5"
@@ -13,7 +13,7 @@ DESCRIPTION="Higher-order logic programming language Lambda Prolog"
HOMEPAGE="http://teyjus.cs.umn.edu/"
SRC_URI="http://teyjus.googlecode.com/files/${MY_P}.tar.gz"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
LICENSE="GPL-3"
IUSE="emacs examples +ocamlopt"
@@ -31,13 +31,32 @@ PATCHES=("${FILESDIR}/${PN}-2.0.2-flags.patch")
SITEFILE=50${PN}-gentoo.el
+src_prepare() {
+ base_src_prepare
+ local cflags=""
+ for i in ${CFLAGS}
+ do
+ cflags="${cflags} -ccopt ${i}"
+ done
+ local lflags=""
+ for i in ${LDFLAGS}
+ do
+ lflags="${lflags} -cclib ${i}"
+ done
+ sed -e "s@CFLAGS +=@CFLAGS += ${CFLAGS}@" \
+ -e "s@LDFLAGS +=@LDFLAGS += ${LDFLAGS}@" \
+ -e "s@OCAMLFLAGS +=@OCAMLFLAGS +=${cflags}${lflags}@" \
+ -i "${S}/source/OMakefile" \
+ || die "Could not set flags in ${S}/teyjus/source/OMakefile"
+}
+
src_compile() {
addpredict "/usr/$(get_libdir)/omake/Pervasives.omc"
addpredict "/usr/$(get_libdir)/omake/build/C.omc"
addpredict "/usr/$(get_libdir)/omake/build/Common.omc"
addpredict "/usr/$(get_libdir)/omake/configure/Configure.omc"
addpredict "/usr/$(get_libdir)/omake/build/OCaml.omc"
- omake all || die "omake all failed"
+ omake --verbose all || die "omake all failed"
if use emacs ; then
pushd "${S}/emacs" || die "Could change directory to emacs"
elisp-compile *.el || die "emacs elisp compile failed"
diff --git a/dev-lang/yasm/metadata.xml b/dev-lang/yasm/metadata.xml
index 98f9cab97482..e9e6c9bb5eb0 100644
--- a/dev-lang/yasm/metadata.xml
+++ b/dev-lang/yasm/metadata.xml
@@ -1,5 +1,9 @@
- amd64
+ base-system
+
+ ssuominen@gentoo.org
+ Samuli Suominen
+
diff --git a/dev-libs/geoip/files/geoipupdate.sh b/dev-libs/geoip/files/geoipupdate-r2.sh
similarity index 68%
rename from dev-libs/geoip/files/geoipupdate.sh
rename to dev-libs/geoip/files/geoipupdate-r2.sh
index cfe9cac2e33b..7812bb50285f 100755
--- a/dev-libs/geoip/files/geoipupdate.sh
+++ b/dev-libs/geoip/files/geoipupdate-r2.sh
@@ -4,7 +4,7 @@ GEOIP_MIRROR="http://geolite.maxmind.com/download/geoip/database"
GEOIPDIR=/usr/share/GeoIP
TMPDIR=
-DATABASES="GeoLiteCity GeoLiteCountry/GeoIP asnum/GeoIPASNum GeoIPv6"
+DATABASES="GeoLiteCity GeoLiteCountry/GeoIP asnum/GeoIPASNum GeoIPv6 GeoLiteCityv6-beta/GeoLiteCityv6"
if [ -d "${GEOIPDIR}" ]; then
cd $GEOIPDIR
@@ -17,9 +17,11 @@ if [ -d "${GEOIPDIR}" ]; then
fname=$(basename $db)
wget --no-verbose -t 3 -T 60 "${GEOIP_MIRROR}/${db}.dat.gz" -O "${TMPDIR}/${fname}.dat.gz"
- gunzip -fdc "${TMPDIR}/${fname}.dat.gz" > "${TMPDIR}/${fname}.dat"
- mv "${TMPDIR}/${fname}.dat" "${GEOIPDIR}/${fname}.dat"
- chmod 0644 "${GEOIPDIR}/${fname}.dat"
+ if [ $? -eq 0 ]; then
+ gunzip -fdc "${TMPDIR}/${fname}.dat.gz" > "${TMPDIR}/${fname}.dat"
+ mv "${TMPDIR}/${fname}.dat" "${GEOIPDIR}/${fname}.dat"
+ chmod 0644 "${GEOIPDIR}/${fname}.dat"
+ fi
done
[ -d "${TMPDIR}" ] && rm -rf $TMPDIR
fi
diff --git a/dev-libs/geoip/geoip-1.4.8-r2.ebuild b/dev-libs/geoip/geoip-1.4.8-r2.ebuild
new file mode 100644
index 000000000000..0107ca5c287f
--- /dev/null
+++ b/dev-libs/geoip/geoip-1.4.8-r2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.4.8-r2.ebuild,v 1.1 2012/12/12 15:30:06 jer Exp $
+
+EAPI=4
+inherit autotools
+
+MY_P=${P/geoip/GeoIP}
+
+DESCRIPTION="easily lookup countries by IP addresses, even when Reverse DNS entries don't exist"
+HOMEPAGE="http://www.maxmind.com/app/ip-location"
+SRC_URI="
+ http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz
+ http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz
+ ipv6? ( http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz
+ http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz )
+"
+
+# GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db
+LICENSE="LGPL-2.1 GPL-2 MaxMind2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6 perl-geoipupdate static-libs"
+
+RDEPEND="
+ perl-geoipupdate? (
+ dev-perl/PerlIO-gzip
+ dev-perl/libwww-perl
+ )
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ sed -e "s:usr local share GeoIP:usr share GeoIP:" \
+ -e "s:usr local etc:etc:" \
+ -i apps/geoipupdate-pureperl.pl || die
+ sed -e 's|yahoo.com|98.139.183.24|g' \
+ -i test/country_test_name.txt test/region_test.txt || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ use perl-geoipupdate && dobin apps/geoipupdate-pureperl.pl
+ dodoc AUTHORS ChangeLog README TODO conf/GeoIP.conf.default
+ rm "${ED}/etc/GeoIP.conf.default"
+ if ! use static-libs; then
+ rm -f "${ED}"/usr/lib*/lib*.la
+ fi
+
+ insinto /usr/share/GeoIP
+ doins "${WORKDIR}/GeoIPASNum.dat"
+
+ if use ipv6; then
+ doins "${WORKDIR}/GeoIPv6.dat"
+ doins "${WORKDIR}/GeoLiteCityv6.dat"
+ fi
+
+ newsbin "${FILESDIR}/geoipupdate-r2.sh" geoipupdate.sh
+}
diff --git a/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild b/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild
new file mode 100644
index 000000000000..3db8f557e96b
--- /dev/null
+++ b/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/FLV-AudioExtractor/FLV-AudioExtractor-0.010.0.ebuild,v 1.1 2012/12/12 09:53:30 pinkbyte Exp $
+
+EAPI=5
+
+MODULE_AUTHOR=FVOX
+MODULE_VERSION=0.01
+inherit perl-module
+
+DESCRIPTION="Extract audio from Flash Videos"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="virtual/perl-ExtUtils-MakeMaker"
+RDEPEND="dev-perl/Moose"
+
+SRC_TEST="do parallel"
diff --git a/dev-perl/FLV-AudioExtractor/Manifest b/dev-perl/FLV-AudioExtractor/Manifest
new file mode 100644
index 000000000000..e57b87ce35d4
--- /dev/null
+++ b/dev-perl/FLV-AudioExtractor/Manifest
@@ -0,0 +1 @@
+DIST FLV-AudioExtractor-0.01.tar.gz 14291 SHA256 02e8b2aae4a9258d9e4ca9aa33e35171806e06f334ac54b0535267d736f881e2 SHA512 060be09279aac3ebc57c3ba780320913f5219ef667ef7d394daf530bfe3c038a03ce0e6de1e4598577f1c50bca51e7221c1d42b00d4ab75b8d94d7d1dd529b87 WHIRLPOOL 1476d678c5a02e1f7be808677b4a504fc76a69f0aca53ed797cf3f4b1683412ec625e5e927f8dd4ad9e2cfa55caaa787e1a6d08a61bfb6f6d39bbc7a453f41fd
diff --git a/dev-perl/FLV-AudioExtractor/metadata.xml b/dev-perl/FLV-AudioExtractor/metadata.xml
new file mode 100644
index 000000000000..a0f314b05cb2
--- /dev/null
+++ b/dev-perl/FLV-AudioExtractor/metadata.xml
@@ -0,0 +1,15 @@
+
+
+
+ proxy-maintainers
+
+ zlog.gentoo@gmail.com
+ Mikle Kolyada
+ Maintainer. Assign bugs to him
+
+
+ pinkbyte@gentoo.org
+ Sergey Popov
+ Proxy maintainer. CC him on bugs
+
+
diff --git a/dev-python/pyproj/pyproj-1.9.2.ebuild b/dev-python/pyproj/pyproj-1.9.2.ebuild
index 143a59d7a61e..8b3414687867 100644
--- a/dev-python/pyproj/pyproj-1.9.2.ebuild
+++ b/dev-python/pyproj/pyproj-1.9.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/dev-python/pyproj/pyproj-1.9.2.ebuild,v 1.1 2012/09/29 23:53:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyproj/pyproj-1.9.2.ebuild,v 1.2 2012/12/12 14:13:13 heroxbd Exp $
EAPI="4"
SUPPORT_PYTHON_ABIS="1"
@@ -14,7 +14,7 @@ SRC_URI="http://pyproj.googlecode.com/files/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE="doc"
PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
diff --git a/dev-ruby/selenium-webdriver/Manifest b/dev-ruby/selenium-webdriver/Manifest
index 02891e62e41f..499fb42e56c0 100644
--- a/dev-ruby/selenium-webdriver/Manifest
+++ b/dev-ruby/selenium-webdriver/Manifest
@@ -1,3 +1,4 @@
DIST selenium-webdriver-2.25.0.gem 1978880 SHA256 d77f39f41c881678dd7647cd2c436bbdef9fc5bda67216db76a5fa66f3d33765 SHA512 d487a5949c2721eb060ec0687fc78ba1d375b02f71caf6cfdb998025c8d962ecededf303f3b7dcc3bc8698b4222a8ea8ba6b8ccd59044927f6d94923360baad1 WHIRLPOOL 11649e1d5fb4817cb3fdc3b61e64bf0538ba9ca1282132a9555d58194883877600906533f3aa9975095adcba92bb66ab52144594f0e7a393c5405dcb7cb0935b
DIST selenium-webdriver-2.26.0.gem 2094080 SHA256 0a67038cf228788c91123468ea032a78c0adbccf6ada7149c545763eb5c9f255 SHA512 278113461ef46f55eaa23b146e062f8cf0d29e8cf226d7c5fc0f52041ba32b5e6b354a2de8a7164924bf58b73684e5f8ddcf651e2605c30011fcbecadf47b0eb WHIRLPOOL 6bf07f87b2da64ef777a5122b752c7db26c6a677c1d6c174b3df4bd5db2b625e7a6e9dc95d8ec1e1ffa293593b81912d674c76b1b718db75501db2d4c4bf2c54
DIST selenium-webdriver-2.27.1.gem 2094592 SHA256 f28f289a549cef2a6e8af3f74766cc0c10489d3d5dc34c937f096bfbda6d57b7 SHA512 14c65aa033d7ac1e4286c2fe3e997c29b1bcde4ade25dfda5c01a8631e5068282fd7478c055f91a4461659b56f25c7633521f6f692454c057a880af288731afc WHIRLPOOL 9da3b0b299c586b7103ef375ff8f53554439cbb261f30d3a57a28df8cfc2a8e0c264d34641dff1852b01a6b975a2e1e0632a663f52f94a7630fe053d2dbf5645
+DIST selenium-webdriver-2.27.2.gem 2094080 SHA256 32531ca236156e2d6b7118d1c3b70814b540bb2a52701b489810b72578464020 SHA512 143d1647735b0cea66cc54cc5f9f8ff1cd8789a4b3e89cdf5338f60630eb32d97e71fb0d5d0b4c9c0fd1f4229819a2491a4955a601710644f0446ae14a856386 WHIRLPOOL db9b7652598d42a77ac5798a3d1528942db926da786665f8ffffd2fc334c91cca9132fdb245d5a124035042dc2395b3fdb096732b42e018476711e98528c21d8
diff --git a/dev-ruby/selenium-webdriver/selenium-webdriver-2.27.2.ebuild b/dev-ruby/selenium-webdriver/selenium-webdriver-2.27.2.ebuild
new file mode 100644
index 000000000000..f07c0bbe5a98
--- /dev/null
+++ b/dev-ruby/selenium-webdriver/selenium-webdriver-2.27.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/selenium-webdriver/selenium-webdriver-2.27.2.ebuild,v 1.1 2012/12/12 07:31:06 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18"
+
+# NOTE: this package contains precompiled code. It appears that all
+# source code can be found at http://code.google.com/p/selenium/ but the
+# repository is not organized in a way so that we can easily rebuild the
+# suited shared object. We'll just try our luck with the precompiled
+# objects for now.
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES README"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_QA_ALLOWED_LIBS="x_ignore_nofocus.so"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem provides Ruby bindings for WebDriver."
+HOMEPAGE="http://gemcutter.org/gems/selenium-webdriver"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/childprocess-0.2.5
+ >=dev-ruby/multi_json-1.0.4
+ dev-ruby/rubyzip"
+
+all_ruby_prepare() {
+ # Make websocket a development dependency since it is only needed
+ # for the safari driver which we don't support on Gentoo.
+ sed -i -e '/libwebsocket/,/version_requirements/ s/runtime/development/' ../metadata || die
+}
diff --git a/dev-util/ccache/ccache-3.1.8.ebuild b/dev-util/ccache/ccache-3.1.8.ebuild
index b3418625d6e5..e9362e3f02d8 100644
--- a/dev-util/ccache/ccache-3.1.8.ebuild
+++ b/dev-util/ccache/ccache-3.1.8.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/ccache/ccache-3.1.8.ebuild,v 1.7 2012/11/22 21:00:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ccache/ccache-3.1.8.ebuild,v 1.8 2012/12/12 14:33:56 jmorgan Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://samba.org/ftp/ccache/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
IUSE=""
RDEPEND="sys-libs/zlib"
diff --git a/dev-util/kdevelop-python/kdevelop-python-1.4.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-1.4.1.ebuild
index 4e7f6a772817..b2ad500c2e4b 100644
--- a/dev-util/kdevelop-python/kdevelop-python-1.4.1.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-1.4.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-util/kdevelop-python/kdevelop-python-1.4.1.ebuild,v 1.1 2012/12/04 19:49:44 dastergon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop-python/kdevelop-python-1.4.1.ebuild,v 1.2 2012/12/12 12:26:18 dastergon Exp $
EAPI=4
@@ -33,6 +33,7 @@ IUSE="debug"
DEPEND="
>=dev-util/kdevelop-pg-qt-1.0.0
+ >=dev-util/kdevplatform-1.3.60
dev-util/kdevelop
"
RDEPEND="${DEPEND}"
diff --git a/licenses/psutils b/licenses/psutils
new file mode 100644
index 000000000000..9e803be71f81
--- /dev/null
+++ b/licenses/psutils
@@ -0,0 +1,39 @@
+The constituent files of this package listed below are copyright (C) 1991-1995
+Angus J. C. Duggan.
+
+LICENSE Makefile.msc Makefile.nt Makefile.os2
+Makefile.unix README config.h descrip.mms
+epsffit.c epsffit.man extractres.man extractres.pl
+fixdlsrps.man fixdlsrps.pl fixfmps.man fixfmps.pl
+fixmacps.man fixmacps.pl fixpsditps.man fixpsditps.pl
+fixpspps.man fixpspps.pl fixscribeps.man fixscribeps.pl
+fixtpps.man fixtpps.pl fixwfwps.man fixwfwps.pl
+fixwpps.man fixwpps.pl fixwwps.man fixwwps.pl
+getafm getafm.man includeres.man includeres.pl
+maketext patchlev.h psbook.c psbook.man
+pserror.c pserror.h psmerge.man psmerge.pl
+psnup.c psnup.man psresize.c psresize.man
+psselect.c psselect.man psspec.c psspec.h
+pstops.c pstops.man psutil.c psutil.h
+showchar
+
+They may be copied and used for any purpose (including distribution as part of
+a for-profit product), provided:
+
+1) The original attribution of the programs is clearly displayed in the product
+ and/or documentation, even if the programs are modified and/or renamed as
+ part of the product.
+
+2) The original source code of the programs is provided free of charge (except
+ for reasonable distribution costs). For a definition of reasonable
+ distribution costs, see the Gnu General Public License or Larry Wall's
+ Artistic License (provided with the Perl 4 kit). The GPL and Artistic
+ License in NO WAY affect this license; they are merely used as examples of
+ the spirit in which it is intended.
+
+3) These programs are provided "as-is". No warranty or guarantee of their
+ fitness for any particular task is provided. Use of these programs is
+ completely at your own risk.
+
+Basically, I don't mind how you use the programs so long as you acknowledge
+the author, and give people the originals if they want them.
diff --git a/media-libs/chromaprint/chromaprint-0.7.ebuild b/media-libs/chromaprint/chromaprint-0.7.ebuild
index d71388cd1e8a..848e935e9913 100644
--- a/media-libs/chromaprint/chromaprint-0.7.ebuild
+++ b/media-libs/chromaprint/chromaprint-0.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/media-libs/chromaprint/chromaprint-0.7.ebuild,v 1.2 2012/11/08 11:11:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/chromaprint/chromaprint-0.7.ebuild,v 1.3 2012/12/12 16:25:32 ago Exp $
EAPI=4
inherit cmake-utils
@@ -11,7 +11,7 @@ SRC_URI="mirror://github/lalinsky/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
IUSE="test tools"
# note: use ffmpeg instead of fftw because it's recommended and required for tools
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 264d31b02ef9..79bed41fa751 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,3 +1,4 @@
DIST openal-soft-1.13.tar.bz2 113770 SHA256 dc735b8b2ab21f6ec54b4262f150a7e0527ae42aa975a1965b9342df1520443c SHA512 8820f03888e36614345806440ae74ba4d40faa6e93545cd9e67440334a89f3b5d1c280695f4eac14fcc0257affe3d6fed53f186d1a02ac20f56a7e0bfa8bb723 WHIRLPOOL 99f0821542d640a173f23e06500af037dd696a5a1f0732dea2d4f125fac06aaf6bcec30ba3fa5371a8b716b1db30e830b601b2e6b80e7500bd2ce7b1b94ce109
DIST openal-soft-1.14.tar.bz2 221579 SHA256 87bd8d61d5943387898c92b6a2bbbb26118e745dec57550c817526a70fad0914 SHA512 58ce4d1281aba790790e5cb88d4ff016ca5d053f8f78f68ca8ab3af59b69c74d473bd65f9ed1053351df40c6d2d909076a41a8be88c23927f37f9617d3c30f94 WHIRLPOOL 7fd8e6956d0f825cbf650329b5a5a0244d98052e55917d6f3377848f1b0b7e13457ee4f37139a5e684fbf05ab3246f273992ed833f52769c1ca768d54a0571e1
+DIST openal-soft-1.15.1.tar.bz2 253006 SHA256 0e29a162f0841ccb4135ce76e92e8a704589b680a85eddf76f898de5236eb056 SHA512 ca6dafdd503d06892dff08763bc00b974ec6e7c4bf3dcebb4cb41a486b4ea777c278299a198db182fee888a19a5716bd57d91a2859b764a532138a79f2bd672f WHIRLPOOL a47fcf4cc5da9576cb4683371979175111a1ec746c87ea1140bfb1b71433a3fe5d3df338e8844ab62adc0e6decb4b481d6d8fedb6f635b5bac715d5789077902
DIST openal-soft-1.15.tar.bz2 251957 SHA256 bf58ecaf178339e86db00403b6d5c6408c9a3dfd3a077b43ac5432c52b63702d SHA512 6d8303096087252e55cce1ff43b0ad4b06da1a1ce2a71e6717a1ea26579c3682a14a1af8f50c7fd8b49a65b7a479e7c2359b9c0981b6ee2283cd5ee22fa2ffe8 WHIRLPOOL 49ea1281343ad33e0c2be67ce8c3db35c6f9feffba4b03dc679211847524082b432a6578fc1f0205022c6154b7a3c7648ac6533150e2adaf96b0c66bad77d007
diff --git a/media-libs/openal/openal-1.15.1.ebuild b/media-libs/openal/openal-1.15.1.ebuild
new file mode 100644
index 000000000000..bbd513125b78
--- /dev/null
+++ b/media-libs/openal/openal-1.15.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openal/openal-1.15.1.ebuild,v 1.1 2012/12/12 10:33:38 ssuominen Exp $
+
+EAPI=5
+inherit cmake-utils
+
+MY_P=${PN}-soft-${PV}
+
+DESCRIPTION="A software implementation of the OpenAL 3D audio API"
+HOMEPAGE="http://kcat.strangesoft.net/openal.html"
+SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+IUSE="alsa alstream coreaudio debug neon oss portaudio pulseaudio sse"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+ alstream? ( virtual/ffmpeg )
+ portaudio? ( >=media-libs/portaudio-19_pre )
+ pulseaudio? ( media-sound/pulseaudio )"
+DEPEND="${RDEPEND}
+ oss? ( virtual/os-headers )"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS="alsoftrc.sample env-vars.txt hrtf.txt README"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use alsa)
+ $(cmake-utils_use coreaudio)
+ $(cmake-utils_use alstream EXAMPLES)
+ $(cmake-utils_use neon)
+ $(cmake-utils_use oss)
+ $(cmake-utils_use portaudio)
+ $(cmake-utils_use pulseaudio)
+ $(cmake-utils_use sse)
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 863b5072addc..cadd76ec86c6 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,5 +1,3 @@
DIST phonon-4.4.2.tar.bz2 629193 SHA256 f1404c3f326201b382c26ba37f2d885d30bc71ba5fd8e1479afb632f92d93486 SHA512 8b0e971f11820120cc70f78505a2e85c5b770772a5ee080bf82bf15473d4c048345e1f4a2516ae0d5b8e098cc99a70cd826528b26d9fcdb34577b1f5ffd7b440 WHIRLPOOL 6be22b38627f3d9d63613a7d42cdf2d0d9ac7a5329c76485046722545887aa335fceada44afd5dd745b4c155c7ba6da40eba4d621ef540c2c1b10fdeb8ea6fb8
DIST phonon-4.4.3.tar.bz2 648733 SHA256 60d17a70732df32cebad099e76f970d6d1aeab5e1f68ec305431f8c86a30a1d8
-DIST phonon-4.5.0.tar.bz2 322043 SHA256 66e8913a00dc5a59e4a30c9034757a2a0eb448a8cefcf677c73dc9387a8752dc SHA512 19833320431d7a0f1601a5a395fc9e3f808768fae4c2fd89f916b29406088c385467d36b618e26412b0739449fd1b14a6b06cbe20e60e1f9353e86b478589927 WHIRLPOOL 4892e30a77b065595c5cb91392bc4379dac6aae1bb26b0b34302b8e7d69510a4337c09847494a3f9757deb15c3c7b225b9f2a84601af2c7afc37b934d21b9c03
-DIST phonon-4.5.1.tar.xz 291088 SHA256 0180f01cb6cae907285adf76e4aece9be33af6a352dc057709e40b7838e2f4c8 SHA512 da6d994fb6c8477fb0c054c3dab9263fbb121d1ac4987fbc3dcae39f903360f884f24e2d547f648fbe6cd87523c76fa2e4316aa6f8d3f0bc29203f982db14add WHIRLPOOL dc8623af827995773e8e781931b3f4065ee8d71fd3a6b04765391ac80654975ba0a4909bd30d41a9092cc21734c4378b31ad760d672d8f91fea19fe5edc748f9
DIST phonon-4.6.0.tar.xz 280712 SHA256 2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4 SHA512 d07c0eaa1be04d80266f6630933bbe8e4f822dc9eb1c31946a08339530cd81e450f1764731c309ae4c661ea3416237521d2048d3e7c0f9cbb7528b1bbbc60f7d WHIRLPOOL 9ec4ae833e3824683ea5c469d3be4b2248645e47d9df199efb717364cf6f67eaffb1e5747e3e0cb0aa71fd5ec3c270119a187a8f5ef2bf6134427b48640740a9
diff --git a/media-libs/phonon/files/phonon-4.5.0-pow.patch b/media-libs/phonon/files/phonon-4.5.0-pow.patch
deleted file mode 100644
index 0111a20412ae..000000000000
--- a/media-libs/phonon/files/phonon-4.5.0-pow.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 436d5379abe83c53c652d8a251f7ab504a1523df
-Author: Colin Guthrie
-Date: Thu Aug 4 16:55:47 2011 +0100
-
- pulse: Use qPow() as pow() is sometimes not found.
-
-diff --git a/phonon/pulsestream.cpp b/phonon/pulsestream.cpp
-index d1e6711..e129f1b 100644
---- a/phonon/pulsestream.cpp
-+++ b/phonon/pulsestream.cpp
-@@ -21,6 +21,7 @@
- */
-
- #include "pulsestream_p.h"
-+#include
-
- QT_BEGIN_NAMESPACE
-
-@@ -81,7 +82,7 @@ void PulseStream::setVolume(const pa_cvolume *volume)
- // AudioOutput expects the "backend" to supply values that have been
- // adjusted for Stephens' law, so we need to fudge them accordingly
- // so that the %ages match up in KMix/the application's own slider.
-- emit volumeChanged(pow(vol, VOLTAGE_TO_LOUDNESS_EXPONENT));
-+ emit volumeChanged(qPow(vol, VOLTAGE_TO_LOUDNESS_EXPONENT));
- }
- }
-
diff --git a/media-libs/phonon/phonon-4.5.0.ebuild b/media-libs/phonon/phonon-4.5.0.ebuild
deleted file mode 100644
index 1a84d0e6cd34..000000000000
--- a/media-libs/phonon/phonon-4.5.0.ebuild
+++ /dev/null
@@ -1,52 +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/phonon/phonon-4.5.0.ebuild,v 1.12 2012/05/04 13:39:20 johu Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
-SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-SLOT="0"
-IUSE="aqua debug +gstreamer pulseaudio vlc"
-
-COMMON_DEPEND="
- >=x11-libs/qt-core-4.6.0:4
- >=x11-libs/qt-dbus-4.6.0:4
- >=x11-libs/qt-gui-4.6.0:4
- >=x11-libs/qt-test-4.6.0:4
- pulseaudio? (
- dev-libs/glib:2
- >=media-sound/pulseaudio-0.9.21[glib]
- )
- !!x11-libs/qt-phonon:4
-"
-# directshow? ( media-sound/phonon-directshow )
-# mmf? ( media-sound/phonon-mmf )
-# mplayer? ( media-sound/phonon-mplayer )
-# waveout? ( media-sound/phonon-waveout )
-PDEPEND="
- aqua? ( media-libs/phonon-qt7 )
- gstreamer? ( media-libs/phonon-gstreamer )
- vlc? ( >=media-libs/phonon-vlc-0.3.2 )
-"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/automoc-0.9.87
- virtual/pkgconfig
-"
-
-REQUIRED_USE="|| ( aqua gstreamer vlc )"
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with pulseaudio GLIB2)
- $(cmake-utils_use_with pulseaudio PulseAudio)
- )
- cmake-utils_src_configure
-}
diff --git a/media-libs/phonon/phonon-4.5.1-r1.ebuild b/media-libs/phonon/phonon-4.5.1-r1.ebuild
deleted file mode 100644
index 87a44dcd0c58..000000000000
--- a/media-libs/phonon/phonon-4.5.1-r1.ebuild
+++ /dev/null
@@ -1,63 +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/phonon/phonon-4.5.1-r1.ebuild,v 1.9 2012/07/25 21:18:57 maekke Exp $
-
-EAPI=4
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="mirror://kde/stable/phonon/${PV}/src/${P}.tar.xz"
- KEYWORDS="amd64 ~arm hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-else
- SCM_ECLASS="git-2"
- EGIT_REPO_URI="git://anongit.kde.org/${PN}"
- KEYWORDS=""
-fi
-
-inherit cmake-utils ${SCM_ECLASS}
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="https://projects.kde.org/projects/kdesupport/phonon"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aqua debug +gstreamer pulseaudio vlc"
-
-COMMON_DEPEND="
- !!x11-libs/qt-phonon:4
- >=x11-libs/qt-core-4.6.0:4
- >=x11-libs/qt-dbus-4.6.0:4
- >=x11-libs/qt-gui-4.6.0:4
- >=x11-libs/qt-test-4.6.0:4
- pulseaudio? (
- dev-libs/glib:2
- >=media-sound/pulseaudio-0.9.21[glib]
- )
-"
-# directshow? ( media-sound/phonon-directshow )
-# mmf? ( media-sound/phonon-mmf )
-# mplayer? ( media-sound/phonon-mplayer )
-# waveout? ( media-sound/phonon-waveout )
-PDEPEND="
- aqua? ( media-libs/phonon-qt7 )
- gstreamer? ( media-libs/phonon-gstreamer )
- vlc? ( >=media-libs/phonon-vlc-0.3.2 )
-"
-RDEPEND="${COMMON_DEPEND}"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/automoc-0.9.87
- virtual/pkgconfig
-"
-
-REQUIRED_USE="|| ( aqua gstreamer vlc )"
-
-PATCHES=( "${FILESDIR}/${P}-qmakeworkaround.patch" )
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_QZeitgeist=OFF
- $(cmake-utils_use_with pulseaudio GLIB2)
- $(cmake-utils_use_with pulseaudio PulseAudio)
- )
-
- cmake-utils_src_configure
-}
diff --git a/media-libs/phonon/phonon-4.6.0-r1.ebuild b/media-libs/phonon/phonon-4.6.0-r1.ebuild
index 70f22615fba7..4effe9a9a8f3 100644
--- a/media-libs/phonon/phonon-4.6.0-r1.ebuild
+++ b/media-libs/phonon/phonon-4.6.0-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/media-libs/phonon/phonon-4.6.0-r1.ebuild,v 1.14 2012/10/04 21:41:50 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/phonon/phonon-4.6.0-r1.ebuild,v 1.15 2012/12/12 14:05:39 kensington Exp $
EAPI=4
@@ -68,7 +68,7 @@ src_install() {
cmake-utils_src_install
# fixup broken cmake system library installs
if [[ ${CHOST} == *-darwin* ]] ; then
- local lib
+ local lib
for lib in "${EPREFIX}"/usr/lib/libphonon{.4,experimental.4.6.0}.dylib ; do
install_name_tool -id "${lib}" "${D}${lib}"
done
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index 491f417a1bc6..e6ac1bc558a0 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -1 +1 @@
-DIST kino-1.3.4.tar.gz 11090771 SHA256 114d046d76ad9980180e28ababd3c58a457cc9211d693705ce03a90a66011a08
+DIST kino-1.3.4.tar.gz 11090771 SHA256 114d046d76ad9980180e28ababd3c58a457cc9211d693705ce03a90a66011a08 SHA512 065695e6115f3f994ed89ebf52e64c4b8da100f7a973a8c686fd7e7377104b838968800c6a8e31913fd5e2be568076c60d588b840e51da3d082841546a53fc32 WHIRLPOOL 9d7ecc79d23dd8d8c4c0b64da2cd425f48305a81da6b6ae6acb2cad1f4b78fb9ade26ef0e8d36c560aa5f6340fb7221ac7ff3f08b1fecfcdea7d0b7d9614c034
diff --git a/media-video/kino/kino-1.3.4.ebuild b/media-video/kino/kino-1.3.4.ebuild
index d85c8336cb4a..70a79bec37e6 100644
--- a/media-video/kino/kino-1.3.4.ebuild
+++ b/media-video/kino/kino-1.3.4.ebuild
@@ -1,10 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.3.4.ebuild,v 1.8 2012/12/02 17:06:48 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.3.4.ebuild,v 1.9 2012/12/12 11:43:54 ssuominen Exp $
-EAPI="4"
-
-inherit eutils
+EAPI=5
+inherit eutils udev
DESCRIPTION="Kino is a non-linear DV editor for GNU/Linux"
HOMEPAGE="http://www.kinodv.org/"
@@ -54,10 +53,12 @@ RDEPEND="${CDEPEND}
sox? ( media-sound/sox )
vorbis? ( media-sound/vorbis-tools )"
+DOCS="AUTHORS BUGS ChangeLog NEWS README* TODO"
+
src_prepare() {
# Deactivating automagic alsa configuration, bug #134725
if ! use alsa ; then
- sed -i -e "s:HAVE_ALSA 1:HAVE_ALSA 0:" configure || die "sed failed"
+ sed -i -e "s:HAVE_ALSA 1:HAVE_ALSA 0:" configure || die
fi
# Fix bug #169590
@@ -66,7 +67,7 @@ src_prepare() {
-e '/\$(LIBQUICKTIME_LIBS) \\/d' \
-e '/^[[:space:]]*\$(SRC_LIBS)/ a\
\$(LIBQUICKTIME_LIBS) \\' \
- src/Makefile.in || die "sed failed"
+ src/Makefile.in || die
# Fix test failure discovered in bug #193947
# https://sourceforge.net/tracker/?func=detail&aid=3304499&group_id=14103&atid=314103
@@ -79,10 +80,9 @@ ffmpeg/libavutil/bswap.h\
ffmpeg/libswscale/yuv2rgb_template.c\
src/export.h\
src/message.cc\
-src/page_bttv.cc' po/POTFILES.in || die "sed failed"
+src/page_bttv.cc' po/POTFILES.in || die
- sed -i -e 's:^#include :#include :' \
- src/filehandler.h || die "sed failed"
+ sed -i -e 's:^#include :#include :' src/filehandler.h || die
epatch "${FILESDIR}/${P}-v4l1.patch"
epatch "${FILESDIR}/${P}-libav-0.7.patch"
epatch "${FILESDIR}/${P}-libav-0.8.patch"
@@ -90,16 +90,16 @@ src/page_bttv.cc' po/POTFILES.in || die "sed failed"
src_configure() {
econf \
- --disable-dependency-tracking \
--disable-local-ffmpeg \
$(use_enable quicktime) \
$(use_with sparc dv1394) \
+ --with-udev-rules-dir="$(udev_get_udevdir)"/rules.d \
CPPFLAGS="-I${ROOT}usr/include/libavcodec -I${ROOT}usr/include/libavformat -I${ROOT}usr/include/libswscale"
}
src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS BUGS ChangeLog NEWS README* TODO
+ default
+ mv "${ED}/$(udev_get_udevdir)"/rules.d/{,99-}kino.rules
fowners root:root -R /usr/share/kino/help #177378
- find "${ED}"usr -name '*.la' -exec rm -f {} + #385361
+ prune_libtool_files --all #385361
}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 0783cf4da0fc..9b6fc26ea47e 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 12 Dec 2012 06:36:51 +0000
+Wed, 12 Dec 2012 16:36:54 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 0783cf4da0fc..72479eefd82a 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 12 Dec 2012 06:36:51 +0000
+Wed, 12 Dec 2012 16:36:55 +0000
diff --git a/metadata/md5-cache/app-arch/freeze-2.5.0 b/metadata/md5-cache/app-arch/freeze-2.5.0
index b02af05b07d6..d232ea44077c 100644
--- a/metadata/md5-cache/app-arch/freeze-2.5.0
+++ b/metadata/md5-cache/app-arch/freeze-2.5.0
@@ -1,12 +1,12 @@
DEFINED_PHASES=compile install prepare
-DEPEND=!<=media-libs/mlt-0.4.2 !app-forensics/sleuthkit !media-libs/mlt[melt] >=sys-apps/sed-4
+DEPEND=!<=media-libs/mlt-0.4.2 !>=app-forensics/sleuthkit-4.0.1 !media-libs/mlt[melt] >=sys-apps/sed-4
DESCRIPTION=Freeze/unfreeze compression program
EAPI=2
HOMEPAGE=http://www.ibiblio.org/pub/Linux/utils/compress/
KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
LICENSE=GPL-1+
-RDEPEND=!<=media-libs/mlt-0.4.2 !app-forensics/sleuthkit !media-libs/mlt[melt]
+RDEPEND=!<=media-libs/mlt-0.4.2 !>=app-forensics/sleuthkit-4.0.1 !media-libs/mlt[melt]
SLOT=0
SRC_URI=ftp://ftp.ibiblio.org/pub/Linux/utils/compress/freeze-2.5.0.tar.gz
_eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=79175c094cc06f592c55e46d19421fd5
+_md5_=ab08003f67318c394886249535886cb9
diff --git a/metadata/md5-cache/app-arch/freeze-2.5.0-r1 b/metadata/md5-cache/app-arch/freeze-2.5.0-r1
new file mode 100644
index 000000000000..e59e86cdb3bf
--- /dev/null
+++ b/metadata/md5-cache/app-arch/freeze-2.5.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DESCRIPTION=Freeze/unfreeze compression program
+EAPI=4
+HOMEPAGE=http://www.ibiblio.org/pub/Linux/utils/compress/
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-1+
+RDEPEND=!<=media-libs/mlt-0.4.2 !media-libs/mlt[melt]
+SLOT=0
+SRC_URI=ftp://ftp.ibiblio.org/pub/Linux/utils/compress/freeze-2.5.0.tar.gz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2c6b9f9be2689b85515c82d5f6768d74
diff --git a/metadata/md5-cache/app-emulation/vmware-modules-238.6 b/metadata/md5-cache/app-emulation/vmware-modules-238.6
index 6a4ff9a812f3..e062223ea870 100644
--- a/metadata/md5-cache/app-emulation/vmware-modules-238.6
+++ b/metadata/md5-cache/app-emulation/vmware-modules-238.6
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=|| ( =app-emulation/vmware-player-3.1.6* =app-emulation/vmware-workstation-7.1.6* ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=|| ( =app-emulation/vmware-player-3.1.6* =app-emulation/vmware-workstation-7.1.6* ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
DESCRIPTION=VMware kernel modules
EAPI=4
HOMEPAGE=http://www.vmware.com/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=kernel_linux? ( virtual/modutils )
SLOT=0
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 linux-info f01ffb28843e2de3ea571f80f07e5078 linux-mod dbc722ed035721476f23ab7b0572985e multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=8f01db6ceec88c89cb5d3fb2362d3621
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 linux-info f01ffb28843e2de3ea571f80f07e5078 linux-mod dbc722ed035721476f23ab7b0572985e multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 udev 4f764d2b1e34e4ef12b9b0d6e680c0ee user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=4768b17700cf8cb4f50a2ba494529483
diff --git a/metadata/md5-cache/app-emulation/vmware-modules-264.4 b/metadata/md5-cache/app-emulation/vmware-modules-264.4
index 5029b23ccc8c..a428b5454215 100644
--- a/metadata/md5-cache/app-emulation/vmware-modules-264.4
+++ b/metadata/md5-cache/app-emulation/vmware-modules-264.4
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=|| ( =app-emulation/vmware-player-4.0.4* =app-emulation/vmware-workstation-8.0.4* ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=|| ( =app-emulation/vmware-player-4.0.4* =app-emulation/vmware-workstation-8.0.4* ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
DESCRIPTION=VMware kernel modules
EAPI=4
HOMEPAGE=http://www.vmware.com/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=kernel_linux? ( virtual/modutils )
SLOT=0
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 linux-info f01ffb28843e2de3ea571f80f07e5078 linux-mod dbc722ed035721476f23ab7b0572985e multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=7516ab7c273791b84aa09a3cda8da0e6
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 linux-info f01ffb28843e2de3ea571f80f07e5078 linux-mod dbc722ed035721476f23ab7b0572985e multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 udev 4f764d2b1e34e4ef12b9b0d6e680c0ee user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=b9c3722ab45981d01ecae274cc91d05a
diff --git a/metadata/md5-cache/app-emulation/vmware-modules-271.1 b/metadata/md5-cache/app-emulation/vmware-modules-271.1
index e7c053985232..e2d5929a49a5 100644
--- a/metadata/md5-cache/app-emulation/vmware-modules-271.1
+++ b/metadata/md5-cache/app-emulation/vmware-modules-271.1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
-DEPEND=|| ( =app-emulation/vmware-player-5.0.1* =app-emulation/vmware-workstation-9.0.1* ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+DEPEND=|| ( =app-emulation/vmware-player-5.0.1* =app-emulation/vmware-workstation-9.0.1* ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) virtual/pkgconfig
DESCRIPTION=VMware kernel modules
EAPI=4
HOMEPAGE=http://www.vmware.com/
@@ -8,5 +8,5 @@ KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=kernel_linux? ( virtual/modutils )
SLOT=0
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 linux-info f01ffb28843e2de3ea571f80f07e5078 linux-mod dbc722ed035721476f23ab7b0572985e multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=00187cdeccc8bf842c7ab2625eb7110d
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 linux-info f01ffb28843e2de3ea571f80f07e5078 linux-mod dbc722ed035721476f23ab7b0572985e multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 udev 4f764d2b1e34e4ef12b9b0d6e680c0ee user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=945f9773d27b697321071add5f3beea9
diff --git a/metadata/md5-cache/app-forensics/sleuthkit-4.0.0 b/metadata/md5-cache/app-forensics/sleuthkit-4.0.0
index e88d277c818a..39d8ce6866be 100644
--- a/metadata/md5-cache/app-forensics/sleuthkit-4.0.0
+++ b/metadata/md5-cache/app-forensics/sleuthkit-4.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=A collection of file system and media management forensic analysis t
EAPI=5
HOMEPAGE=http://www.sleuthkit.org/sleuthkit/
IUSE=aff ewf static-libs
-KEYWORDS=~amd64 ~hppa ~ppc ~x86
+KEYWORDS=~amd64 hppa ~ppc ~x86
LICENSE=GPL-2 IBM
RDEPEND=dev-db/sqlite:3 ewf? ( app-forensics/libewf ) aff? ( app-forensics/afflib ) dev-perl/DateManip
SLOT=0
SRC_URI=mirror://sourceforge/sleuthkit/sleuthkit-4.0.0.tar.gz
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=984c54e076c353aedcf558c529648727
+_md5_=c866bcc2ecb3947f3d0092e46c9d8851
diff --git a/metadata/md5-cache/app-portage/esearch-1.3 b/metadata/md5-cache/app-portage/esearch-1.3
index 4a6135c64f3b..be2f7d25ec43 100644
--- a/metadata/md5-cache/app-portage/esearch-1.3
+++ b/metadata/md5-cache/app-portage/esearch-1.3
@@ -4,10 +4,10 @@ DESCRIPTION=Replacement for 'emerge --search' with search-index
EAPI=3
HOMEPAGE=http://david-peter.de/esearch.html
IUSE=linguas_fr linguas_it
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
LICENSE=GPL-2
RDEPEND=sys-apps/portage dev-lang/python[readline] dev-lang/python
SLOT=0
SRC_URI=mirror://github/fuzzyray/esearch/esearch-1.3.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 4092929a66c8b47ffa8d314ca9314ea7 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b2ea1bd360d6928550c4fe6fc7072c1e
+_md5_=47190daec81d008fe51c331f9e4503a9
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.7 b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.7
index 497f80a727c6..9acb2eb3802c 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.7
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.7
@@ -3,10 +3,10 @@ DEPEND=sys-apps/portage dev-lang/python[xml] dev-lang/python
DESCRIPTION=Collection of administration scripts for Gentoo
EAPI=3
HOMEPAGE=http://www.gentoo.org/proj/en/portage/tools/index.xml
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
LICENSE=GPL-2
RDEPEND=sys-apps/portage >=dev-lang/python-2.6[xml] !>=dev-lang/python-2.6[-xml] !<=app-portage/gentoolkit-dev-0.2.7 || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep virtual/python-argparse dev-lang/python[xml] dev-lang/python
SLOT=0
SRC_URI=mirror://gentoo/gentoolkit-0.3.0.7.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 4092929a66c8b47ffa8d314ca9314ea7 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=4ccc53cc26794651641feb04d911cba5
+_md5_=a5d7aeaa4a86b963002b54e572057a48
diff --git a/metadata/md5-cache/app-text/calibre-0.9.9 b/metadata/md5-cache/app-text/calibre-0.9.9
index 7435f67ccd3a..0f43f9e4d717 100644
--- a/metadata/md5-cache/app-text/calibre-0.9.9
+++ b/metadata/md5-cache/app-text/calibre-0.9.9
@@ -10,4 +10,4 @@ RDEPEND=>=app-text/podofo-0.8.2 >=app-text/poppler-0.12.3-r3[qt4,xpdf-headers(+)
SLOT=0
SRC_URI=http://sourceforge.net/projects/calibre/files/0.9.9/calibre-0.9.9.tar.xz
_eclasses_=bash-completion-r1 fcc2dafb65a2b662dd4b076f2103f6a6 eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa multilib 9aa8a023e062fca0ba79362d9d0cc488 python 4092929a66c8b47ffa8d314ca9314ea7 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0cdd97cae40f6c84c111f8b2fb52760d
+_md5_=3323c970e2426c627f192388f77d326a
diff --git a/metadata/md5-cache/app-text/psutils-1.17-r2 b/metadata/md5-cache/app-text/psutils-1.17-r2
new file mode 100644
index 000000000000..9f390120300e
--- /dev/null
+++ b/metadata/md5-cache/app-text/psutils-1.17-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-lang/perl
+DESCRIPTION=PostScript Utilities
+EAPI=3
+HOMEPAGE=http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=psutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/p/psutils/psutils_1.17.dfsg.orig.tar.gz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=0f72848e61f873d00ceaced73ee5bfdb
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.34 b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.34
new file mode 100644
index 000000000000..cfca586ea244
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-7.0.34
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.6 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Tomcat's Servlet API 3.0/JSP API 2.2 implementation
+EAPI=2
+HOMEPAGE=http://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=3.0
+SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.34/src/apache-tomcat-7.0.34-src.tar.gz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 java-ant-2 daa6d2d0a12ebb700a69d9f1d2f02c5c java-pkg-2 65bbb59987d777c1106ae8aa4bf36e7b java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=573e91be89e93e1787e3b4d271110ead
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-6.2.3 b/metadata/md5-cache/dev-lang/swi-prolog-6.2.3
new file mode 100644
index 000000000000..fcc45aeb969a
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-6.2.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+DESCRIPTION=free, small, and standard compliant Prolog compiler
+EAPI=4
+HOMEPAGE=http://www.swi-prolog.org/
+IUSE=archive debug doc gmp hardened java minimal odbc readline ssl static-libs test zlib X elibc_FreeBSD java
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=LGPL-2.1
+RDEPEND=sys-libs/ncurses archive? ( app-arch/libarchive ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) readline? ( sys-libs/readline ) gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) X? ( virtual/jpeg x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.1.9-r1 )
+SLOT=0
+SRC_URI=http://www.swi-prolog.org/download/stable/src/pl-6.2.3.tar.gz mirror://gentoo/swi-prolog-6.2.3-gentoo-patchset-0.tar.gz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=22450365a4703d0089de3f0325633605
diff --git a/metadata/md5-cache/dev-lang/teyjus-2.0.2 b/metadata/md5-cache/dev-lang/teyjus-2.0.2
index d071e82e445c..9fd7c12235d7 100644
--- a/metadata/md5-cache/dev-lang/teyjus-2.0.2
+++ b/metadata/md5-cache/dev-lang/teyjus-2.0.2
@@ -7,7 +7,7 @@ IUSE=emacs examples +ocamlopt
KEYWORDS=~amd64 ~x86
LICENSE=GPL-3
RDEPEND=>=sys-devel/binutils-2.17 >=sys-devel/gcc-2.95.3 >=dev-lang/ocaml-3.10[ocamlopt?] emacs? ( virtual/emacs )
-SLOT=0
+SLOT=0/2.0.2
SRC_URI=http://teyjus.googlecode.com/files/teyjus-source-2.0-b2.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 elisp-common cdb887d0e278ea6e82ea2a5d4792c52a eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=129a38c17d0d06d55d23537d88f78208
+_md5_=2c253ea3ae00fe0a5bad0d4ef4c6326f
diff --git a/metadata/md5-cache/dev-libs/geoip-1.4.8-r2 b/metadata/md5-cache/dev-libs/geoip-1.4.8-r2
new file mode 100644
index 000000000000..ad0ea6751c2e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/geoip-1.4.8-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=|| ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=easily lookup countries by IP addresses, even when Reverse DNS entries don't exist
+EAPI=4
+HOMEPAGE=http://www.maxmind.com/app/ip-location
+IUSE=ipv6 perl-geoipupdate static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
+LICENSE=LGPL-2.1 GPL-2 MaxMind2
+RDEPEND=perl-geoipupdate? ( dev-perl/PerlIO-gzip dev-perl/libwww-perl )
+SLOT=0
+SRC_URI=http://www.maxmind.com/download/geoip/api/c/GeoIP-1.4.8.tar.gz http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz ipv6? ( http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz )
+_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
+_md5_=9fdb089e9a32fe7613a7685345ba3354
diff --git a/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0 b/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
new file mode 100644
index 000000000000..e050eb80e197
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/FLV-AudioExtractor-0.010.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl[-build]
+DESCRIPTION=Extract audio from Flash Videos
+EAPI=5
+HOMEPAGE=http://search.cpan.org/dist/FLV-AudioExtractor/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1 GPL-2 GPL-3 )
+RDEPEND=dev-perl/Moose dev-lang/perl[-build]
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/F/FV/FVOX/FLV-AudioExtractor-0.01.tar.gz
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 perl-module 825d3d7654c88c5c4dec7400d3612578 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5aad09450c37feeb2b44cb7d47f7e35b
diff --git a/metadata/md5-cache/dev-python/pyproj-1.9.2 b/metadata/md5-cache/dev-python/pyproj-1.9.2
index c0e2d0fc73d3..02472dde0371 100644
--- a/metadata/md5-cache/dev-python/pyproj-1.9.2
+++ b/metadata/md5-cache/dev-python/pyproj-1.9.2
@@ -4,10 +4,10 @@ DESCRIPTION=Python interface to PROJ.4 library
EAPI=4
HOMEPAGE=http://code.google.com/p/pyproj/ http://pypi.python.org/pypi/pyproj
IUSE=doc
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~x86 ~amd64-linux
LICENSE=MIT
RDEPEND=dev-lang/python
SLOT=0
SRC_URI=http://pyproj.googlecode.com/files/pyproj-1.9.2.tar.gz
_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 4092929a66c8b47ffa8d314ca9314ea7 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=2ef324c42bdc891159736a9c2822c37e
+_md5_=61e6d224fab9e561ec6db60a491b348b
diff --git a/metadata/md5-cache/dev-ruby/selenium-webdriver-2.27.2 b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.27.2
new file mode 100644
index 000000000000..6b11af05e102
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/selenium-webdriver-2.27.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby18] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby18] dev-ruby/rubyzip[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby19] dev-ruby/rubyzip[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ree18] >=dev-ruby/multi_json-1.0.4[ruby_targets_ree18] dev-ruby/rubyzip[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=This gem provides Ruby bindings for WebDriver.
+EAPI=4
+HOMEPAGE=http://gemcutter.org/gems/selenium-webdriver
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby18] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby18] dev-ruby/rubyzip[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ruby19] >=dev-ruby/multi_json-1.0.4[ruby_targets_ruby19] dev-ruby/rubyzip[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/childprocess-0.2.5[ruby_targets_ree18] >=dev-ruby/multi_json-1.0.4[ruby_targets_ree18] dev-ruby/rubyzip[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+SLOT=0
+SRC_URI=mirror://rubygems/selenium-webdriver-2.27.2.gem
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 9aa8a023e062fca0ba79362d9d0cc488 ruby-fakegem 2785c639b173dd603e95bd60b8d6c4c0 ruby-ng 10ca07a887e226622062d89bb959a175 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=403ca73d088fca0a8b1e8806fbfc869d
diff --git a/metadata/md5-cache/dev-util/ccache-3.1.8 b/metadata/md5-cache/dev-util/ccache-3.1.8
index 4fe59e5d3035..53aeaec01ec7 100644
--- a/metadata/md5-cache/dev-util/ccache-3.1.8
+++ b/metadata/md5-cache/dev-util/ccache-3.1.8
@@ -3,10 +3,10 @@ DEPEND=sys-libs/zlib app-arch/xz-utils
DESCRIPTION=fast compiler cache
EAPI=4
HOMEPAGE=http://ccache.samba.org/
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
LICENSE=GPL-3
RDEPEND=sys-libs/zlib
SLOT=0
SRC_URI=http://samba.org/ftp/ccache/ccache-3.1.8.tar.xz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=42dba931f697fb37a7686883a4993b89
+_md5_=14cb480c820fb91e40b505207c001e68
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-1.4.1 b/metadata/md5-cache/dev-util/kdevelop-python-1.4.1
index f8169cc3e68b..f3f1dadda98a 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-1.4.1
+++ b/metadata/md5-cache/dev-util/kdevelop-python-1.4.1
@@ -1,14 +1,14 @@
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-util/kdevelop-pg-qt-1.0.0 dev-util/kdevelop >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] =dev-lang/python-2*
+DEPEND=>=dev-util/kdevelop-pg-qt-1.0.0 >=dev-util/kdevplatform-1.3.60 dev-util/kdevelop >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] =dev-lang/python-2*
DESCRIPTION=Python plugin for KDevelop 4
EAPI=4
HOMEPAGE=http://www.kdevelop.org
IUSE=debug aqua
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
-RDEPEND=>=dev-util/kdevelop-pg-qt-1.0.0 dev-util/kdevelop >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] =dev-lang/python-2*
+RDEPEND=>=dev-util/kdevelop-pg-qt-1.0.0 >=dev-util/kdevplatform-1.3.60 dev-util/kdevelop >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-dbus-4.7.4:4 >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] =dev-lang/python-2*
RESTRICT=test
SLOT=4
SRC_URI=mirror://kde/stable/kdevelop/kdev-python/1.4.1/src/kdev-python-v1.4.1.tar.bz2
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 341ea44ed97a940b6ff74283ed5b94d7 eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 1a0b9986e891584bbc9f18928d126299 gnome2-utils 794d2847b4af390a1e020924876c8297 kde4-base 6e4e3fc3a36f43b71c84ad615e804a83 kde4-functions 37767566f9ffa88075c4d392a59100a9 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 4092929a66c8b47ffa8d314ca9314ea7 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=248156650a22c2cc5da36711807b9a2c
+_md5_=c8d2f929eba6045ff630d3a51ff60546
diff --git a/metadata/md5-cache/media-libs/chromaprint-0.7 b/metadata/md5-cache/media-libs/chromaprint-0.7
index 7809766438bf..28b187b42a24 100644
--- a/metadata/md5-cache/media-libs/chromaprint-0.7
+++ b/metadata/md5-cache/media-libs/chromaprint-0.7
@@ -4,10 +4,10 @@ DESCRIPTION=A client-side library that implements a custom algorithm for extract
EAPI=4
HOMEPAGE=http://acoustid.org/chromaprint
IUSE=test tools
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
LICENSE=LGPL-2.1
RDEPEND=>=virtual/ffmpeg-0.10 tools? ( >=media-libs/taglib-1.6 )
SLOT=0
SRC_URI=mirror://github/lalinsky/chromaprint/chromaprint-0.7.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 341ea44ed97a940b6ff74283ed5b94d7 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a142ee45f52e57e1ad4e6235e32f9f41
+_md5_=a9a76c368de782bcf7abea09cac38f20
diff --git a/metadata/md5-cache/media-libs/openal-1.15.1 b/metadata/md5-cache/media-libs/openal-1.15.1
new file mode 100644
index 000000000000..c2e36db1f8fb
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openal-1.15.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=alsa? ( media-libs/alsa-lib ) alstream? ( virtual/ffmpeg ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio ) oss? ( virtual/os-headers ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=A software implementation of the OpenAL 3D audio API
+EAPI=5
+HOMEPAGE=http://kcat.strangesoft.net/openal.html
+IUSE=alsa alstream coreaudio debug neon oss portaudio pulseaudio sse
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
+LICENSE=LGPL-2
+RDEPEND=alsa? ( media-libs/alsa-lib ) alstream? ( virtual/ffmpeg ) portaudio? ( >=media-libs/portaudio-19_pre ) pulseaudio? ( media-sound/pulseaudio )
+SLOT=0
+SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.15.1.tar.bz2
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 341ea44ed97a940b6ff74283ed5b94d7 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=f389854ad5a16646b8171a5aa678eba1
diff --git a/metadata/md5-cache/media-libs/phonon-4.5.0 b/metadata/md5-cache/media-libs/phonon-4.5.0
deleted file mode 100644
index 780e980c1d09..000000000000
--- a/metadata/md5-cache/media-libs/phonon-4.5.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=x11-libs/qt-core-4.6.0:4 >=x11-libs/qt-dbus-4.6.0:4 >=x11-libs/qt-gui-4.6.0:4 >=x11-libs/qt-test-4.6.0:4 pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] ) !!x11-libs/qt-phonon:4 >=dev-util/automoc-0.9.87 virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=KDE multimedia API
-EAPI=4
-HOMEPAGE=https://projects.kde.org/projects/kdesupport/phonon
-IUSE=aqua debug +gstreamer pulseaudio vlc
-KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=LGPL-2.1
-PDEPEND=aqua? ( media-libs/phonon-qt7 ) gstreamer? ( media-libs/phonon-gstreamer ) vlc? ( >=media-libs/phonon-vlc-0.3.2 )
-RDEPEND=>=x11-libs/qt-core-4.6.0:4 >=x11-libs/qt-dbus-4.6.0:4 >=x11-libs/qt-gui-4.6.0:4 >=x11-libs/qt-test-4.6.0:4 pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] ) !!x11-libs/qt-phonon:4
-REQUIRED_USE=|| ( aqua gstreamer vlc )
-SLOT=0
-SRC_URI=mirror://kde/stable/phonon/4.5.0/src/phonon-4.5.0.tar.bz2
-_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 341ea44ed97a940b6ff74283ed5b94d7 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bb001c014248573ebc7e3762aae9fb95
diff --git a/metadata/md5-cache/media-libs/phonon-4.5.1-r1 b/metadata/md5-cache/media-libs/phonon-4.5.1-r1
deleted file mode 100644
index c331dbfa5107..000000000000
--- a/metadata/md5-cache/media-libs/phonon-4.5.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!!x11-libs/qt-phonon:4 >=x11-libs/qt-core-4.6.0:4 >=x11-libs/qt-dbus-4.6.0:4 >=x11-libs/qt-gui-4.6.0:4 >=x11-libs/qt-test-4.6.0:4 pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] ) >=dev-util/automoc-0.9.87 virtual/pkgconfig >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
-DESCRIPTION=KDE multimedia API
-EAPI=4
-HOMEPAGE=https://projects.kde.org/projects/kdesupport/phonon
-IUSE=aqua debug +gstreamer pulseaudio vlc
-KEYWORDS=amd64 ~arm hppa ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=LGPL-2.1
-PDEPEND=aqua? ( media-libs/phonon-qt7 ) gstreamer? ( media-libs/phonon-gstreamer ) vlc? ( >=media-libs/phonon-vlc-0.3.2 )
-RDEPEND=!!x11-libs/qt-phonon:4 >=x11-libs/qt-core-4.6.0:4 >=x11-libs/qt-dbus-4.6.0:4 >=x11-libs/qt-gui-4.6.0:4 >=x11-libs/qt-test-4.6.0:4 pulseaudio? ( dev-libs/glib:2 >=media-sound/pulseaudio-0.9.21[glib] )
-REQUIRED_USE=|| ( aqua gstreamer vlc )
-SLOT=0
-SRC_URI=mirror://kde/stable/phonon/4.5.1/src/phonon-4.5.1.tar.xz
-_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 341ea44ed97a940b6ff74283ed5b94d7 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8ade258a1c0b14ffbbf68e53a750e776
diff --git a/metadata/md5-cache/media-libs/phonon-4.6.0-r1 b/metadata/md5-cache/media-libs/phonon-4.6.0-r1
index d622980c07b7..071d5d98a25e 100644
--- a/metadata/md5-cache/media-libs/phonon-4.6.0-r1
+++ b/metadata/md5-cache/media-libs/phonon-4.6.0-r1
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( aqua gstreamer vlc )
SLOT=0
SRC_URI=mirror://kde/stable/phonon/4.6.0/src/phonon-4.6.0.tar.xz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 341ea44ed97a940b6ff74283ed5b94d7 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6c213b687e1dbb29d6ee1227f94a65a7
+_md5_=0b53746b195c1aa6ad5da42b5e54d811
diff --git a/metadata/md5-cache/media-video/kino-1.3.4 b/metadata/md5-cache/media-video/kino-1.3.4
index d30e35379387..a5c202404bf0 100644
--- a/metadata/md5-cache/media-video/kino-1.3.4
+++ b/metadata/md5-cache/media-video/kino-1.3.4
@@ -1,7 +1,7 @@
DEFINED_PHASES=configure install prepare
-DEPEND=>=x11-libs/gtk+-2.6.0 >=gnome-base/libglade-2.5.0 >=dev-libs/glib-2 x11-libs/libXv dev-libs/libxml2 media-libs/audiofile >=sys-libs/libraw1394-1.0.0 >=sys-libs/libavc1394-0.4.1 >=media-libs/libdv-0.103 media-libs/libsamplerate media-libs/libiec61883 media-libs/libv4l alsa? ( >=media-libs/alsa-lib-1.0.9 ) virtual/ffmpeg quicktime? ( >=media-libs/libquicktime-0.9.5 ) dev-util/intltool
+DEPEND=>=x11-libs/gtk+-2.6.0 >=gnome-base/libglade-2.5.0 >=dev-libs/glib-2 x11-libs/libXv dev-libs/libxml2 media-libs/audiofile >=sys-libs/libraw1394-1.0.0 >=sys-libs/libavc1394-0.4.1 >=media-libs/libdv-0.103 media-libs/libsamplerate media-libs/libiec61883 media-libs/libv4l alsa? ( >=media-libs/alsa-lib-1.0.9 ) virtual/ffmpeg quicktime? ( >=media-libs/libquicktime-0.9.5 ) dev-util/intltool virtual/pkgconfig
DESCRIPTION=Kino is a non-linear DV editor for GNU/Linux
-EAPI=4
+EAPI=5
HOMEPAGE=http://www.kinodv.org/
IUSE=alsa dvdr gpac lame gstreamer quicktime sox vorbis
KEYWORDS=amd64 ppc ppc64 ~sparc x86
@@ -9,5 +9,5 @@ LICENSE=GPL-2
RDEPEND=>=x11-libs/gtk+-2.6.0 >=gnome-base/libglade-2.5.0 >=dev-libs/glib-2 x11-libs/libXv dev-libs/libxml2 media-libs/audiofile >=sys-libs/libraw1394-1.0.0 >=sys-libs/libavc1394-0.4.1 >=media-libs/libdv-0.103 media-libs/libsamplerate media-libs/libiec61883 media-libs/libv4l alsa? ( >=media-libs/alsa-lib-1.0.9 ) virtual/ffmpeg quicktime? ( >=media-libs/libquicktime-0.9.5 ) media-video/mjpegtools media-sound/rawrec dvdr? ( media-video/dvdauthor app-cdr/dvd+rw-tools ) gpac? ( media-video/gpac ) lame? ( media-sound/lame ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) sox? ( media-sound/sox ) vorbis? ( media-sound/vorbis-tools )
SLOT=0
SRC_URI=mirror://sourceforge/kino/kino-1.3.4.tar.gz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e13ff056d9fccc8dbf641e88af3ca72a
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 udev 4f764d2b1e34e4ef12b9b0d6e680c0ee user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e9e9da88c83d2dcb371ee4d1c3785b40
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.5-r1 b/metadata/md5-cache/net-analyzer/munin-2.0.5-r1
deleted file mode 100644
index c706b378ff09..000000000000
--- a/metadata/md5-cache/net-analyzer/munin-2.0.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare setup
-DEPEND=dev-lang/perl sys-process/procps asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) syslog? ( virtual/perl-Sys-Syslog ) ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 virtual/awk ) http? ( dev-perl/libwww-perl ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] ) virtual/perl-Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-DESCRIPTION=Munin Server Monitoring Tool
-EAPI=4
-HOMEPAGE=http://munin-monitoring.org/
-IUSE=asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http elibc_FreeBSD java
-KEYWORDS=amd64 ~mips ~ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl sys-process/procps asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) syslog? ( virtual/perl-Sys-Syslog ) ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 virtual/awk ) http? ( dev-perl/libwww-perl ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) java? ( >=dev-java/java-config-2.1.9-r1 )
-REQUIRED_USE=cgi? ( !minimal )
-SLOT=0
-SRC_URI=mirror://sourceforge/munin/munin-2.0.5.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.5-patches-2.tar.xz
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=9a309c354195826ff9bd35d6ecd31d7b
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.8-r2 b/metadata/md5-cache/net-analyzer/munin-2.0.8-r2
index 20f9f07adbcc..69a6964b03d7 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.8-r2
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.8-r2
@@ -8,7 +8,8 @@ KEYWORDS=amd64 ~arm ~mips ~ppc x86
LICENSE=GPL-2
RDEPEND=dev-lang/perl[berkdb] sys-process/procps doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) java? ( >=dev-java/java-config-2.1.9-r1 )
REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
+RESTRICT=test
SLOT=0
SRC_URI=mirror://sourceforge/munin/munin-2.0.8.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.8-patches-4.tar.xz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=c163a191a8caff528bd86de2bf74a298
+_md5_=3609511f5bbaedc5b1cf301c64d554e7
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.9 b/metadata/md5-cache/net-analyzer/munin-2.0.9
new file mode 100644
index 000000000000..23ce29327df8
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst preinst prepare setup test
+DEPEND=dev-lang/perl[berkdb] sys-process/procps doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] virtual/ssh ) virtual/perl-Module-Build java? ( >=virtual/jdk-1.5 ) test? ( dev-perl/Test-Deep dev-perl/Test-LongString dev-perl/Test-Differences dev-perl/Test-MockModule dev-perl/Test-MockObject dev-perl/File-Slurp dev-perl/IO-stringy dev-perl/IO-Socket-INET6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
+DESCRIPTION=Munin Server Monitoring Tool
+EAPI=5
+HOMEPAGE=http://munin-monitoring.org/
+IUSE=asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd doc apache elibc_FreeBSD java
+KEYWORDS=~amd64 ~mips ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/perl[berkdb] sys-process/procps doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) java? ( >=dev-java/java-config-2.1.9-r1 )
+REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
+SLOT=0
+SRC_URI=mirror://sourceforge/munin/munin-2.0.9.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.9-patches-1.tar.xz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 java-pkg-opt-2 f9bbbe5092225a2059aa9e6a3a2b52f1 java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=863cfce2de27f9d835e7d7ed25f8e917
diff --git a/metadata/md5-cache/net-im/mcabber-0.10.0 b/metadata/md5-cache/net-im/mcabber-0.10.0
deleted file mode 100644
index d275fbe749f9..000000000000
--- a/metadata/md5-cache/net-im/mcabber-0.10.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=ssl? ( net-libs/loudmouth[ssl] ) crypt? ( >=app-crypt/gpgme-1.0.0 ) >=net-libs/loudmouth-1.4.3 otr? ( >=net-libs/libotr-3.1.0 ) spell? ( app-text/aspell ) >=dev-libs/glib-2.0.0 sys-libs/ncurses virtual/pkgconfig
-DESCRIPTION=A small Jabber console client with various features, like MUC, SSL, PGP
-EAPI=2
-HOMEPAGE=http://mcabber.com/
-IUSE=crypt otr spell ssl linguas_de linguas_en linguas_fr linguas_nl linguas_pl linguas_uk linguas_ru
-KEYWORDS=~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( net-libs/loudmouth[ssl] ) crypt? ( >=app-crypt/gpgme-1.0.0 ) >=net-libs/loudmouth-1.4.3 otr? ( >=net-libs/libotr-3.1.0 ) spell? ( app-text/aspell ) >=dev-libs/glib-2.0.0 sys-libs/ncurses
-SLOT=0
-SRC_URI=http://mcabber.com/files/mcabber-0.10.0.tar.bz2
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c25c10fb8169929f9cd4c990531e5f4d
diff --git a/metadata/md5-cache/net-im/mcabber-0.10.1 b/metadata/md5-cache/net-im/mcabber-0.10.2
similarity index 50%
rename from metadata/md5-cache/net-im/mcabber-0.10.1
rename to metadata/md5-cache/net-im/mcabber-0.10.2
index b74125f03c53..76ec9c9979d6 100644
--- a/metadata/md5-cache/net-im/mcabber-0.10.1
+++ b/metadata/md5-cache/net-im/mcabber-0.10.2
@@ -1,13 +1,13 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 sys-libs/ncurses >=net-libs/loudmouth-1.4.3-r1[ssl?] virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 sys-libs/ncurses >=net-libs/loudmouth-1.4.3-r1[ssl?] virtual/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
DESCRIPTION=A small Jabber console client with various features, like MUC, SSL, PGP
-EAPI=3
+EAPI=4
HOMEPAGE=http://mcabber.com/
IUSE=aspell crypt idn modules otr spell ssl vim-syntax linguas_cs linguas_de linguas_fr linguas_it linguas_nl linguas_pl linguas_ru linguas_uk
-KEYWORDS=~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
LICENSE=GPL-2
RDEPEND=crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) aspell? ( app-text/aspell ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) idn? ( net-dns/libidn ) spell? ( app-text/enchant ) dev-libs/glib:2 sys-libs/ncurses >=net-libs/loudmouth-1.4.3-r1[ssl?]
SLOT=0
-SRC_URI=http://mcabber.com/files/mcabber-0.10.1.tar.bz2
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=d84454eb77eff94799f3d0d012c2275e
+SRC_URI=http://mcabber.com/files/mcabber-0.10.2.tar.bz2
+_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2e06ca45d4bfb90b9ff2abe7d4a242c6
diff --git a/metadata/md5-cache/net-im/mcabber-0.9.10 b/metadata/md5-cache/net-im/mcabber-0.9.10
deleted file mode 100644
index 38599ef742bb..000000000000
--- a/metadata/md5-cache/net-im/mcabber-0.9.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DEPEND=ssl? ( >=dev-libs/openssl-0.9.7-r1 ) crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) spell? ( app-text/aspell ) >=dev-libs/glib-2.0.0 sys-libs/ncurses virtual/pkgconfig
-DESCRIPTION=A small Jabber console client with various features, like MUC, SSL, PGP
-HOMEPAGE=http://mcabber.com/
-IUSE=crypt otr spell ssl linguas_de linguas_en linguas_fr linguas_nl linguas_pl linguas_uk linguas_ru
-KEYWORDS=~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( >=dev-libs/openssl-0.9.7-r1 ) crypt? ( >=app-crypt/gpgme-1.0.0 ) otr? ( >=net-libs/libotr-3.1.0 ) spell? ( app-text/aspell ) >=dev-libs/glib-2.0.0 sys-libs/ncurses
-SLOT=0
-SRC_URI=http://mcabber.com/files/mcabber-0.9.10.tar.bz2
-_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=b9567540dde16ee6afbd1dbe93166856
diff --git a/metadata/md5-cache/net-libs/serf-1.1.1 b/metadata/md5-cache/net-libs/serf-1.1.1
index 22060c877d55..53354e92e6da 100644
--- a/metadata/md5-cache/net-libs/serf-1.1.1
+++ b/metadata/md5-cache/net-libs/serf-1.1.1
@@ -4,10 +4,10 @@ DESCRIPTION=HTTP client library
EAPI=4
HOMEPAGE=http://code.google.com/p/serf/
IUSE=static-libs
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos
LICENSE=Apache-2.0
RDEPEND=dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib
SLOT=1
SRC_URI=http://serf.googlecode.com/files/serf-1.1.1.tar.bz2
_eclasses_=autotools f4bee52a728da1f76470f4b8d246c50f eutils d40dc948067bd3db1c8ebf7d51897313 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2f089f969476a5d3ab9f079d7876bdca
+_md5_=4e75f4c211eb7f55167dec85e4d424df
diff --git a/metadata/md5-cache/net-misc/jwhois-4.0-r1 b/metadata/md5-cache/net-misc/jwhois-4.0-r1
index 2804400d2491..cae009fe895e 100644
--- a/metadata/md5-cache/net-misc/jwhois-4.0-r1
+++ b/metadata/md5-cache/net-misc/jwhois-4.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Advanced Internet Whois client capable of recursive queries
EAPI=4
HOMEPAGE=http://www.gnu.org/software/jwhois/
IUSE=idn nls
-KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86
LICENSE=GPL-3
RDEPEND=idn? ( net-dns/libidn )
SLOT=0
SRC_URI=mirror://gnu/jwhois/jwhois-4.0.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=254574346ffbe8617540e2f8bf509504
+_md5_=dd614bd30024b182e5e4dcf0775a0e73
diff --git a/metadata/md5-cache/sci-biology/primer3-2.3.1 b/metadata/md5-cache/sci-biology/primer3-2.3.1
index f86cf8202335..21a5197326cf 100644
--- a/metadata/md5-cache/sci-biology/primer3-2.3.1
+++ b/metadata/md5-cache/sci-biology/primer3-2.3.1
@@ -6,6 +6,6 @@ HOMEPAGE=http://primer3.sourceforge.net/
KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
LICENSE=GPL-2
SLOT=0
-SRC_URI=mirror://sourceforge/primer3/primer3-2.3.1.tar.gz
-_eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
-_md5_=b3d409a253185bdc3b9a0a60b24ca587
+SRC_URI=mirror://sourceforge/primer3/2.3.1/primer3-2.3.1.tar.gz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=d9c2c320604a318c1e7afa375b72d58a
diff --git a/metadata/md5-cache/sci-biology/primer3-1.1.4-r2 b/metadata/md5-cache/sci-biology/primer3-2.3.4
similarity index 77%
rename from metadata/md5-cache/sci-biology/primer3-1.1.4-r2
rename to metadata/md5-cache/sci-biology/primer3-2.3.4
index a46d670fdae3..c54466b0dc06 100644
--- a/metadata/md5-cache/sci-biology/primer3-1.1.4-r2
+++ b/metadata/md5-cache/sci-biology/primer3-2.3.4
@@ -1,11 +1,11 @@
DEFINED_PHASES=compile install prepare test
DEPEND=dev-lang/perl
DESCRIPTION=Primer Design for PCR reactions
-EAPI=3
+EAPI=4
HOMEPAGE=http://primer3.sourceforge.net/
KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=whitehead
+LICENSE=GPL-2
SLOT=0
-SRC_URI=mirror://sourceforge/primer3/primer3-1.1.4.tar.gz
+SRC_URI=mirror://sourceforge/primer3/2.3.4/primer3-2.3.4.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=76dff299135d78ac1db07831204a66ed
+_md5_=13df612109a34123c8658bbe577e0bcb
diff --git a/metadata/md5-cache/sci-libs/clapack-3.2.1-r7 b/metadata/md5-cache/sci-libs/clapack-3.2.1-r7
new file mode 100644
index 000000000000..91febc655a31
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/clapack-3.2.1-r7
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/libf2c-20090407-r1 virtual/blas >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=f2c'ed version of LAPACK
+EAPI=4
+HOMEPAGE=http://www.netlib.org/clapack/
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-libs/libf2c-20090407-r1 virtual/blas
+SLOT=0
+SRC_URI=http://www.netlib.org/clapack/clapack-3.2.1-CMAKE.tgz
+_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 cmake-utils 341ea44ed97a940b6ff74283ed5b94d7 eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=2996840a5b8276ab77fb7b2dde890321
diff --git a/metadata/md5-cache/sci-mathematics/twelf-1.7.1 b/metadata/md5-cache/sci-mathematics/twelf-1.7.1
index f494e08c7332..63d1d1ece2de 100644
--- a/metadata/md5-cache/sci-mathematics/twelf-1.7.1
+++ b/metadata/md5-cache/sci-mathematics/twelf-1.7.1
@@ -1,5 +1,5 @@
DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=dev-lang/mlton doc? ( virtual/latex-base ) emacs? ( virtual/emacs ) dev-util/omake
+DEPEND=dev-lang/mlton doc? ( virtual/latex-base ) emacs? ( virtual/emacs )
DESCRIPTION=Twelf is an implementation of the logical framework LF.
EAPI=5
HOMEPAGE=http://twelf.org/
@@ -8,7 +8,7 @@ KEYWORDS=~amd64 ~x86
LICENSE=BSD-2
RDEPEND=dev-lang/mlton doc? ( virtual/latex-base ) emacs? ( virtual/emacs )
RESTRICT=test
-SLOT=0
+SLOT=0/1.7.1
SRC_URI=http://twelf.plparty.org/releases/twelf-src-1.7.1.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 elisp-common cdb887d0e278ea6e82ea2a5d4792c52a eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7fdb042b34a0b54a99540d7d2bd71864
+_md5_=1d5257f90c33cf105aa9cbd121091c05
diff --git a/metadata/md5-cache/sys-apps/bleachbit-0.9.4 b/metadata/md5-cache/sys-apps/bleachbit-0.9.4
new file mode 100644
index 000000000000..95f1e7662629
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/bleachbit-0.9.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm prepare setup
+DEPEND=>=dev-python/pygtk-2 nls? ( sys-devel/gettext ) =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+DESCRIPTION=Clean junk to free disk space and to maintain privacy
+EAPI=5
+HOMEPAGE=http://bleachbit.sourceforge.net/
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-python/pygtk-2 =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+SLOT=0
+SRC_URI=mirror://sourceforge/bleachbit/bleachbit-0.9.4.tar.bz2
+_eclasses_=distutils 15ae23f6f8219a009bfcfff7724fe727 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 python 4092929a66c8b47ffa8d314ca9314ea7 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28
+_md5_=b048eff1517eb9d90429f95b3cc18b5e
diff --git a/metadata/md5-cache/sys-fs/eudev-9999 b/metadata/md5-cache/sys-fs/eudev-9999
index efb3ce021cef..542e62d75b66 100644
--- a/metadata/md5-cache/sys-fs/eudev-9999
+++ b/metadata/md5-cache/sys-fs/eudev-9999
@@ -5,9 +5,9 @@ EAPI=4
HOMEPAGE=https://github.com/gentoo/udev-ng
IUSE=doc gudev hwdb kmod introspection keymap +modutils +openrc selinux static-libs
LICENSE=LGPL-2.1 MIT GPL-2
-PDEPEND=>=virtual/udev-80
-RDEPEND=gudev? ( dev-libs/glib:2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20 !=sys-fs/udev-init-scripts-18 ) !sys-apps/coldplug !sys-apps/systemd !=virtual/udev-180
+RDEPEND=gudev? ( dev-libs/glib:2 ) introspection? ( >=dev-libs/gobject-introspection-1.31.1 ) selinux? ( sys-libs/libselinux ) >=sys-apps/util-linux-2.20 !=sys-fs/udev-init-scripts-18 ) !sys-fs/udev !sys-apps/coldplug !sys-apps/systemd !=sys-libs/talloc-2.0.7[python] >=sys-libs/tevent-0.9.16 >=sys-libs/tdb-1.2.10[python] net-nds/openldap !!=net-fs/samba-4.0.0[ldb] =dev-lang/python-2* dev-lang/python !dev-lang/python[-threads]
+DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig dev-libs/popt >=sys-libs/talloc-2.0.7[python] >=sys-libs/tevent-0.9.17 >=sys-libs/tdb-1.2.10[python] net-nds/openldap !!=net-fs/samba-4.0.0[ldb] =dev-lang/python-2* dev-lang/python !dev-lang/python[-threads]
DESCRIPTION=An LDAP-like embedded database
EAPI=4
HOMEPAGE=http://ldb.samba.org
IUSE=doc
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
LICENSE=LGPL-3
-RDEPEND=dev-libs/popt >=sys-libs/talloc-2.0.7[python] >=sys-libs/tevent-0.9.16 >=sys-libs/tdb-1.2.10[python] net-nds/openldap !!=net-fs/samba-4.0.0[ldb] =dev-lang/python-2*
+RDEPEND=dev-libs/popt >=sys-libs/talloc-2.0.7[python] >=sys-libs/tevent-0.9.17 >=sys-libs/tdb-1.2.10[python] net-nds/openldap !!=net-fs/samba-4.0.0[ldb] =dev-lang/python-2*
SLOT=0
-SRC_URI=http://www.samba.org/ftp/pub/ldb/ldb-1.1.10.tar.gz
+SRC_URI=http://www.samba.org/ftp/pub/ldb/ldb-1.1.14.tar.gz
_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python 4092929a66c8b47ffa8d314ca9314ea7 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 waf-utils 681b3e9181d1a20ad8d0c186333ddcf7
-_md5_=61578b2e927f63878e77c157d2f3b067
+_md5_=3af560374a9f4dc5ed1a68019d195145
diff --git a/metadata/md5-cache/sys-libs/ldb-1.1.4 b/metadata/md5-cache/sys-libs/ldb-1.1.4
deleted file mode 100644
index c015f12b7cb7..000000000000
--- a/metadata/md5-cache/sys-libs/ldb-1.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig dev-libs/popt >=sys-libs/talloc-2.0.7[python] ~sys-libs/tevent-0.9.14 ~sys-libs/tdb-1.2.9[python] net-nds/openldap !!=net-fs/samba-4.0.0[ldb] =dev-lang/python-2* dev-lang/python !dev-lang/python[-threads]
-DESCRIPTION=An LDAP-like embedded database
-EAPI=3
-HOMEPAGE=http://ldb.samba.org
-IUSE=doc
-KEYWORDS=~alpha amd64 ~hppa ~ppc ~ppc64 x86 ~x86-fbsd
-LICENSE=LGPL-3
-RDEPEND=dev-libs/popt >=sys-libs/talloc-2.0.7[python] ~sys-libs/tevent-0.9.14 ~sys-libs/tdb-1.2.9[python] net-nds/openldap !!=net-fs/samba-4.0.0[ldb] =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.samba.org/ftp/pub/ldb/ldb-1.1.4.tar.gz
-_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python 4092929a66c8b47ffa8d314ca9314ea7 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 waf-utils 681b3e9181d1a20ad8d0c186333ddcf7
-_md5_=9566fefe5b9a60a8d13923461b6db704
diff --git a/metadata/md5-cache/sys-libs/ldb-1.1.9 b/metadata/md5-cache/sys-libs/ldb-1.1.9
deleted file mode 100644
index 920d18aedb85..000000000000
--- a/metadata/md5-cache/sys-libs/ldb-1.1.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig dev-libs/popt >=sys-libs/talloc-2.0.7[python] >=sys-libs/tevent-0.9.16 >=sys-libs/tdb-1.2.10[python] net-nds/openldap !!=net-fs/samba-4.0.0[ldb] =dev-lang/python-2* dev-lang/python !dev-lang/python[-threads]
-DESCRIPTION=An LDAP-like embedded database
-EAPI=4
-HOMEPAGE=http://ldb.samba.org
-IUSE=doc
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-3
-RDEPEND=dev-libs/popt >=sys-libs/talloc-2.0.7[python] >=sys-libs/tevent-0.9.16 >=sys-libs/tdb-1.2.10[python] net-nds/openldap !!=net-fs/samba-4.0.0[ldb] =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://www.samba.org/ftp/pub/ldb/ldb-1.1.9.tar.gz
-_eclasses_=base ec46b36a6f6fd1d0b505a33e0b74e413 eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 python 4092929a66c8b47ffa8d314ca9314ea7 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 waf-utils 681b3e9181d1a20ad8d0c186333ddcf7
-_md5_=c15ed32d4ef314ee4e8851a429307db8
diff --git a/metadata/md5-cache/virtual/udev-0 b/metadata/md5-cache/virtual/udev-0
index 6852d2f8e7ee..6c66faede495 100644
--- a/metadata/md5-cache/virtual/udev-0
+++ b/metadata/md5-cache/virtual/udev-0
@@ -1,8 +1,8 @@
DEFINED_PHASES=-
DESCRIPTION=Virtual for udev implementation and number of its features
EAPI=2
-IUSE=acl gudev hwdb keymap selinux static-libs
+IUSE=gudev hwdb keymap selinux static-libs
KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-RDEPEND=acl? ( || ( =sys-fs/udev-196-r1[acl?,gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] >=sys-fs/eudev-1_beta1[gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] )
+RDEPEND=|| ( >=sys-fs/udev-196-r1[gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] >=sys-fs/eudev-1_beta1[gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] )
SLOT=0
-_md5_=339076fedf5a64b55be8dd169e930d00
+_md5_=c360ad6e9f64fc50bcff10eb0a3666af
diff --git a/metadata/md5-cache/www-client/chromium-23.0.1271.97 b/metadata/md5-cache/www-client/chromium-23.0.1271.97
index f3b9502e305d..d3675d05b096 100644
--- a/metadata/md5-cache/www-client/chromium-23.0.1271.97
+++ b/metadata/md5-cache/www-client/chromium-23.0.1271.97
@@ -4,10 +4,10 @@ DESCRIPTION=Open-source version of Google Chrome web browser
EAPI=4
HOMEPAGE=http://chromium.org/
IUSE=bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=BSD
RDEPEND=app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.11.10.6 >=dev-libs/elfutils-0.149 dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac >=media-libs/libjpeg-turbo-1.2.0-r1 media-libs/libpng >=media-libs/libwebp-0.2.0_rc1 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-apps/dbus virtual/udev virtual/libusb:1 x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium sys-libs/libselinux ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
SLOT=0
SRC_URI=http://commondatastorage.googleapis.com/chromium-browser-official/chromium-23.0.1271.97.tar.bz2
_eclasses_=chromium 10deb47dfb7657ba0fc7814da0bad35e eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic 1a0b9986e891584bbc9f18928d126299 gnome2-utils 794d2847b4af390a1e020924876c8297 linux-info f01ffb28843e2de3ea571f80f07e5078 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf portability 536c5e70c5fb252ed3b769e04aa3f05b python 4092929a66c8b47ffa8d314ca9314ea7 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4 virtualx 73cfc129b4b9ba23aed1abb10c825d86
-_md5_=9a0677e6b15030404cacab9f64825066
+_md5_=048ab706853e2d22a881a40caeffef2a
diff --git a/metadata/md5-cache/www-client/opera-next-12.12_pre1693 b/metadata/md5-cache/www-client/opera-next-12.12_pre1693
new file mode 100644
index 000000000000..143fa756aacc
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-next-12.12_pre1693
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare unpack
+DEPEND=>=sys-apps/sed-4 app-arch/xz-utils >=sys-apps/sed-4
+DESCRIPTION=A fast and secure web browser and Internet suite
+EAPI=4
+HOMEPAGE=http://www.opera.com/
+IUSE=elibc_FreeBSD gtk kde +gstreamer multilib linguas_af linguas_ar linguas_az linguas_be linguas_bg linguas_bn linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_ES linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fr linguas_fr_CA linguas_fy linguas_gd linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_ka linguas_kk linguas_ko linguas_lt linguas_lv linguas_me linguas_mk linguas_ms linguas_nb linguas_nl linguas_nn linguas_pa linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tl linguas_tr linguas_uk linguas_ur linguas_uz linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=OPERA-12 LGPL-2 LGPL-3
+RDEPEND=media-libs/fontconfig media-libs/freetype sys-apps/util-linux sys-libs/zlib virtual/opengl x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXrender x11-libs/libXt gtk? ( dev-libs/atk dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) x11-libs/pango x11-libs/pixman ) kde? ( kde-base/kdelibs x11-libs/qt-core:4 x11-libs/qt-gui:4 ) gstreamer? ( dev-libs/glib:2 dev-libs/libxml2 media-libs/gst-plugins-base:0.10 media-libs/gstreamer:0.10 media-plugins/gst-plugins-meta:0.10 )
+SLOT=0
+SRC_URI=amd64? ( http://snapshot.opera.com/unix/143_12.12-1693/opera-next-12.12-1693.x86_64.linux.tar.xz ) x86? ( http://snapshot.opera.com/unix/143_12.12-1693/opera-next-12.12-1693.i386.linux.tar.xz ) x86-fbsd? ( http://snapshot.opera.com/unix/143_12.12-1693/opera-next-12.12-1693.i386.freebsd.tar.xz )
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa gnome2-utils 794d2847b4af390a1e020924876c8297 multilib 9aa8a023e062fca0ba79362d9d0cc488 pax-utils 0ace932c4045349c7fc1af0fe7091acf toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=091f0046c9a040eafb5d3eb4f34fd258
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-10.3.183.43 b/metadata/md5-cache/www-plugins/adobe-flash-10.3.183.48
similarity index 89%
rename from metadata/md5-cache/www-plugins/adobe-flash-10.3.183.43
rename to metadata/md5-cache/www-plugins/adobe-flash-10.3.183.48
index 1c2099cad462..3edb32e0abcd 100644
--- a/metadata/md5-cache/www-plugins/adobe-flash-10.3.183.43
+++ b/metadata/md5-cache/www-plugins/adobe-flash-10.3.183.48
@@ -9,6 +9,6 @@ LICENSE=AdobeFlash-10.3
RDEPEND=x86? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) amd64? ( vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 ) >=app-emulation/emul-linux-x86-gtklibs-20100409-r1 app-emulation/emul-linux-x86-soundlibs ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) amd64? ( www-plugins/nspluginwrapper )
RESTRICT=strip mirror
SLOT=0
-SRC_URI=http://fpdownload.macromedia.com/get/flashplayer/pdc/10.3.183.43/install_flash_player_10_linux.tar.gz -> adobe-flash-10.3.183.43.i386.tar.gz
+SRC_URI=http://fpdownload.macromedia.com/get/flashplayer/pdc/10.3.183.48/install_flash_player_10_linux.tar.gz -> adobe-flash-10.3.183.48.i386.tar.gz
_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 nsplugins b195a1306f4ee7cf507037dc6aa5ba89 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=41e17feaa1d72cafb0669939255fa112
+_md5_=9c46fa0fcf5bac650b988ea125310629
diff --git a/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.258 b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.258
new file mode 100644
index 000000000000..fd7eeaf63757
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/adobe-flash-11.2.202.258
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst pretend setup unpack
+DEPEND=amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )
+DESCRIPTION=Adobe Flash Player
+EAPI=4
+HOMEPAGE=http://www.adobe.com/products/flashplayer.html
+IUSE=multilib -32bit +64bit vdpau kde +sse2check
+KEYWORDS=-* amd64 ~x86
+LICENSE=AdobeFlash-10.3
+RDEPEND=x86? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) amd64? ( multilib? ( 64bit? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) 32bit? ( vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 ) >=app-emulation/emul-linux-x86-gtklibs-20100409-r1 app-emulation/emul-linux-x86-soundlibs ) ) !multilib? ( x11-libs/gtk+:2 media-libs/fontconfig dev-libs/nss net-misc/curl vdpau? ( x11-libs/libvdpau ) kde? ( kde-base/kcmshell ) >=sys-libs/glibc-2.4 ) ) || ( media-fonts/liberation-fonts media-fonts/corefonts ) amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=x86? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.258/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.258.i386.tar.gz ) amd64? ( multilib? ( 32bit? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.258/install_flash_player_11_linux.i386.tar.gz -> adobe-flash-11.2.202.258.i386.tar.gz ) 64bit? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.258/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.258.x86_64.tar.gz ) ) !multilib? ( http://fpdownload.macromedia.com/get/flashplayer/pdc/11.2.202.258/install_flash_player_11_linux.x86_64.tar.gz -> adobe-flash-11.2.202.258.x86_64.tar.gz ) )
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 multilib 9aa8a023e062fca0ba79362d9d0cc488 nsplugins b195a1306f4ee7cf507037dc6aa5ba89 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=a47ab9109a1ca222e8765a6b8d3e9394
diff --git a/metadata/md5-cache/www-servers/tomcat-7.0.34 b/metadata/md5-cache/www-servers/tomcat-7.0.34
new file mode 100644
index 000000000000..4d6926778fe9
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-7.0.34
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.2 ~dev-java/tomcat-servlet-api-7.0.34 extra-webapps? ( dev-java/jakarta-jstl:0 ) >=virtual/jdk-1.6 >=dev-java/ant-core-1.8.1:0 test? ( dev-java/ant-junit:0 dev-java/junit:4 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=Tomcat Servlet-3.0/JSP-2.2 Container
+EAPI=4
+HOMEPAGE=http://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.2 ~dev-java/tomcat-servlet-api-7.0.34 extra-webapps? ( dev-java/jakarta-jstl:0 ) !=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=7
+SRC_URI=mirror://apache/tomcat/tomcat-7/v7.0.34/src/apache-tomcat-7.0.34-src.tar.gz
+_eclasses_=eutils d40dc948067bd3db1c8ebf7d51897313 java-ant-2 daa6d2d0a12ebb700a69d9f1d2f02c5c java-pkg-2 65bbb59987d777c1106ae8aa4bf36e7b java-utils-2 2d9eb3508fa5d6759e39354b74545567 multilib 9aa8a023e062fca0ba79362d9d0cc488 prefix 21058c21ca48453d771df15500873ede toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=715eb47e3dff59f2990bd9c7066f5ed9
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.3-r1 b/metadata/md5-cache/www-servers/uwsgi-1.3-r1
deleted file mode 100644
index 548d2fc704ab..000000000000
--- a/metadata/md5-cache/www-servers/uwsgi-1.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
-DESCRIPTION=uWSGI server for Python web applications
-EAPI=4
-HOMEPAGE=http://projects.unbit.it/uwsgi/
-IUSE=apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios pam perl +pcre php +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq apache2 php_targets_php5-3 php_targets_php5-4 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) php? ( || ( =www-servers/uwsgi-1.3-r1[php_targets_php5-3] =www-servers/uwsgi-1.3-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
-REQUIRED_USE=|| ( cgi erlang lua perl php python ruby )
-SLOT=0
-SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.3.tar.gz
-_eclasses_=apache-module 1f60370f9dceba046ec036cd6bbb0c8b autotools f4bee52a728da1f76470f4b8d246c50f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 java-utils-2 2d9eb3508fa5d6759e39354b74545567 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf php-ext-source-r2 fdd92230a8379a1fcebd1a8978703083 python 4092929a66c8b47ffa8d314ca9314ea7 ruby-ng 10ca07a887e226622062d89bb959a175 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=6dc6df237ef83d07bbe12d4eb146ea7c
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.4.1-r1 b/metadata/md5-cache/www-servers/uwsgi-1.4.1-r1
deleted file mode 100644
index f87799659a62..000000000000
--- a/metadata/md5-cache/www-servers/uwsgi-1.4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
-DESCRIPTION=uWSGI server for Python web applications
-EAPI=4
-HOMEPAGE=http://projects.unbit.it/uwsgi/
-IUSE=apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios pam perl +pcre php +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq apache2 php_targets_php5-3 php_targets_php5-4 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) php? ( || ( =www-servers/uwsgi-1.4.1-r1[php_targets_php5-3] =www-servers/uwsgi-1.4.1-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
-REQUIRED_USE=|| ( cgi erlang lua perl php python ruby )
-SLOT=0
-SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.4.1.tar.gz
-_eclasses_=apache-module 1f60370f9dceba046ec036cd6bbb0c8b autotools f4bee52a728da1f76470f4b8d246c50f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 java-utils-2 2d9eb3508fa5d6759e39354b74545567 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf php-ext-source-r2 fdd92230a8379a1fcebd1a8978703083 python 4092929a66c8b47ffa8d314ca9314ea7 ruby-ng 10ca07a887e226622062d89bb959a175 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
-_md5_=e72a72d91bceed3994be848dcaa7340c
diff --git a/metadata/md5-cache/www-servers/uwsgi-1.4.3 b/metadata/md5-cache/www-servers/uwsgi-1.4.3
new file mode 100644
index 000000000000..d47e11e1fb9a
--- /dev/null
+++ b/metadata/md5-cache/www-servers/uwsgi-1.4.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) virtual/pkgconfig apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
+DESCRIPTION=uWSGI server for Python web applications
+EAPI=5
+HOMEPAGE=http://projects.unbit.it/uwsgi/
+IUSE=apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios pam perl +pcre php probepg +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq apache2 php_targets_php5-3 php_targets_php5-4 elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=caps? ( sys-libs/libcap ) json? ( dev-libs/jansson ) erlang? ( dev-lang/erlang ) gevent? ( >=dev-python/gevent-1.0_beta2 ) graylog2? ( sys-libs/zlib ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) pcre? ( dev-libs/libpcre ) perl? ( dev-lang/perl ) php? ( php_targets_php5-3? ( dev-lang/php:5.3[embed] ) php_targets_php5-4? ( dev-lang/php:5.4[embed] ) ) probepg? ( dev-db/postgresql-base:= ) ruby? ( ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ) sqlite? ( dev-db/sqlite:3 ) rsyslog? ( app-admin/rsyslog ) xml? ( dev-libs/libxml2 ) yaml? ( dev-libs/libyaml ) zeromq? ( net-libs/zeromq sys-apps/util-linux ) rrdtool? ( net-analyzer/rrdtool ) apache2? ( =www-servers/apache-2.2* ) python? ( dev-lang/python ) php? ( || ( =www-servers/uwsgi-1.4.3[php_targets_php5-3] =www-servers/uwsgi-1.4.3[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) )
+REQUIRED_USE=|| ( cgi erlang lua perl php python ruby )
+SLOT=0
+SRC_URI=http://projects.unbit.it/downloads/uwsgi-1.4.3.tar.gz
+_eclasses_=apache-module 1f60370f9dceba046ec036cd6bbb0c8b autotools f4bee52a728da1f76470f4b8d246c50f depend.apache 1a38534d3f755d1ab1d92ce120bd7dbd eutils d40dc948067bd3db1c8ebf7d51897313 flag-o-matic 1a0b9986e891584bbc9f18928d126299 java-utils-2 2d9eb3508fa5d6759e39354b74545567 libtool 2b273eea1976cfaed3449345d94331ac multilib 9aa8a023e062fca0ba79362d9d0cc488 multiprocessing a2130e6fc4aa4c6a24b265ca0cbcc2b6 pax-utils 0ace932c4045349c7fc1af0fe7091acf php-ext-source-r2 fdd92230a8379a1fcebd1a8978703083 python 4092929a66c8b47ffa8d314ca9314ea7 ruby-ng 10ca07a887e226622062d89bb959a175 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4 user d0a4d0735a6c0183d707ca919bd72f28 versionator 6601b4c5b3f019a993db59a50e1854e4
+_md5_=ae57f49b70dd5a07c7795506c8d6f23c
diff --git a/metadata/md5-cache/x11-wm/i3-4.4 b/metadata/md5-cache/x11-wm/i3-4.4
new file mode 100644
index 000000000000..794f9587dbac
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/i3-4.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/libxcb x11-libs/libXcursor x11-libs/libX11 x11-libs/startup-notification x11-libs/xcb-util pango? ( >=x11-libs/pango-1.30.0[X] >=x11-libs/cairo-1.12.2[X,xcb] ) virtual/pkgconfig sys-devel/flex sys-devel/bison
+DESCRIPTION=An improved dynamic tiling window manager
+EAPI=4
+HOMEPAGE=http://i3wm.org/
+IUSE=+pango
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/libev dev-libs/libpcre dev-libs/yajl x11-libs/libxcb x11-libs/libXcursor x11-libs/libX11 x11-libs/startup-notification x11-libs/xcb-util pango? ( >=x11-libs/pango-1.30.0[X] >=x11-libs/cairo-1.12.2[X,xcb] ) x11-apps/xmessage
+SLOT=0
+SRC_URI=http://i3wm.org/downloads/i3-4.4.tar.bz2
+_eclasses_=multilib 9aa8a023e062fca0ba79362d9d0cc488 toolchain-funcs 134429b842a6c67254bfd76a8753e4d4
+_md5_=a5624ffb814cf38d8eb564fdae4ad40c
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 88e8c61ba33f..feed9c405e62 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 12 Dec 2012 06:36:53 +0000
+Wed, 12 Dec 2012 16:36:57 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 5bdda0b3b7e1..e5e2f0f5d77f 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Dec 12 06:36:51 UTC 2012
+Wed Dec 12 16:36:54 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index f8f6cb1ef49f..925ec4babc03 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 12 Dec 2012 07:00:01 +0000
+Wed, 12 Dec 2012 17:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 5fec3aaa49b1..9e2435b39dac 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1355294101 Wed Dec 12 06:35:01 2012 UTC
+1355330101 Wed Dec 12 16:35:01 2012 UTC
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 5e99f55042cc..d51db180c772 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,5 +1,5 @@
DIST munin-1.4.6.tar.gz 1238782 SHA256 1795812d9ad60e60f81c7f08c8be455ce44e1d4f966f7dd6be620e4c356de9c6 SHA512 f1ec1b79b4c90d899fc661656426b4cf7fdcc7f896d6de0938310b49b66e009cd1a85570005fd1a85a8168ce3568ea55c255c3511174cdf1d72bd88f162be5e0 WHIRLPOOL 43d2296bbbd476ffc0cf356fc5a191d723993735769e6f88f3581c0804b82781be38f78bfe34337e2b4e9680ade8c569a6006c0ea107e4a5c60a82b879e08404
-DIST munin-2.0.5-patches-2.tar.xz 9448 SHA256 9a58ff84e33cf5c912eb504f176d689fa8531da01b3541396a03f05fde19d079 SHA512 7f75c6f4a7034327a99820bd0c1fd2272f2cd2a5bc037096e6a142a317a068ffb4217b162578da089cb0f83667d35aee413ecaeb58fdb548dfbff78b97d36e07 WHIRLPOOL 0d128cbc9955e174902670c2a66e5e0c66d4262bd20832065ed220a227a9efba25a93e192a4cd08c85819df91d1552870e6dfc2cd1bd0f3870b0154d6c0f294a
-DIST munin-2.0.5.tar.gz 1319398 SHA256 927b9b557343ad031b55b401eb1542db03d78a48a64797f5fed6ad58fc2c8785 SHA512 e52ce2f44a4322000dc38d0b8ae6e5f406211b7a081e1f4300938dfe10bff1559d9e84f454885c70bae9aabfa4b7fde8c3b3d8b239d35596f678baaba6d7d7bc WHIRLPOOL 7751eee653a0b80a9a3283a8940a270db0c5ece7de67f1b253004901db2fd06f6d8c104497ced6d3659ac6a45f4d8e37bbb362f6dec6f7181cb2d30ca115f495
DIST munin-2.0.8-patches-4.tar.xz 16600 SHA256 badd20ae9d7d74667b6a96764c8caaf156e34aa22be5bb08c10535270a99f3d3 SHA512 81084c9b46127f425c89ff76a0c807bbc36859b2fd7ac37734bd202cae92610333f4793aa4630595147d96ad9099da99283c7bcf107351d6ec4931e64451a415 WHIRLPOOL 7e7aed4f0e23f88b0fa2eba548af5573d3e1fab20a910a8568c641ae539c58acc9e020eec01a3323243d6f6ae6f69dd7200818df3a14b5ca3b7100557fc4c8dd
DIST munin-2.0.8.tar.gz 1328805 SHA256 ae645daee35214c1ba3d771d990fa781df741751b7b79e9d9fe48c583890dca6 SHA512 f767e586aee68c389ce0ae250376bc43d6bfe73df8e193bb7ba8b373d887301e0c1d3574c3fe456be3b93dc86cc8ec8ce27e3c36836a0048b80afb55a3a3cc1e WHIRLPOOL 312f006c21af98f5d9e548a77d43fe7396dcc69072e06faedb3d8262e70599da91bfecdfd06e859d6ff8706506e73308cbcac38e658a28e428fd50399f3f3c3e
+DIST munin-2.0.9-patches-1.tar.xz 10888 SHA256 da45fb8988a0e2640d16bda012a33a42fcf06f719cbfe01c00cad9d786efd1a2 SHA512 d6940f4f02584470382c8dc5b089be42cb438414f02335e677da58a2728c64ee883f60f68a4bc543b31245a9f18666bb3bbb31f96d7f8ab61384a494432f633e WHIRLPOOL 34c7ef8091fbda05367167f53983d2c8a472e2ef9221da3e190e36651389f5cc6012c3c359b25f6efb11745d5d7a06e87610cc7c80cdee2eda99d0fa56577337
+DIST munin-2.0.9.tar.gz 1328972 SHA256 6bb2b42de29a438ad80f1d6c53f4a35e9a74cb5a2103ea7a9530cba2d75c7309 SHA512 3db797283fc8ee8042869ace9c24871a8317fe0f826a4f8a3cebe1152ab621b62e2ddfd44a32a7516dabdaf44e4dde6aeaae014674cb544328665b63990c16d0 WHIRLPOOL 4110992995ac52f7903573b809a776281fe48e0406944b127ee8b2fede3ab12deef98f578070466721c72efc7a6418e9dc872d2fdfe1d4d5690f1648e33e49c1
diff --git a/net-analyzer/munin/munin-2.0.8-r2.ebuild b/net-analyzer/munin/munin-2.0.8-r2.ebuild
index 046c733245ca..1274347a2ef9 100644
--- a/net-analyzer/munin/munin-2.0.8-r2.ebuild
+++ b/net-analyzer/munin/munin-2.0.8-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/net-analyzer/munin/munin-2.0.8-r2.ebuild,v 1.4 2012/12/06 04:17:50 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.8-r2.ebuild,v 1.5 2012/12/12 09:45:08 flameeyes Exp $
EAPI=4
@@ -21,6 +21,9 @@ KEYWORDS="amd64 ~arm ~mips ~ppc x86"
IUSE="asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd doc apache"
REQUIRED_USE="cgi? ( !minimal ) apache? ( cgi )"
+# Missing deps, now stabled, ignore tests for now, not a regression.
+RESTRICT=test
+
# Upstream's listing of required modules is NOT correct!
# Some of the postgres plugins use DBD::Pg, while others call psql directly.
# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
diff --git a/net-analyzer/munin/munin-2.0.5-r1.ebuild b/net-analyzer/munin/munin-2.0.9.ebuild
similarity index 56%
rename from net-analyzer/munin/munin-2.0.5-r1.ebuild
rename to net-analyzer/munin/munin-2.0.9.ebuild
index 611554e7239c..823c9ee1205c 100644
--- a/net-analyzer/munin/munin-2.0.5-r1.ebuild
+++ b/net-analyzer/munin/munin-2.0.9.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.5-r1.ebuild,v 1.5 2012/10/02 21:04:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.9.ebuild,v 1.1 2012/12/12 09:45:08 flameeyes Exp $
-EAPI=4
+EAPI=5
-PATCHSET=2
+PATCHSET=1
inherit eutils user java-pkg-opt-2
@@ -17,16 +17,17 @@ SRC_URI="mirror://sourceforge/munin/${MY_P}.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc x86"
-IUSE="asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http"
-REQUIRED_USE="cgi? ( !minimal )"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="asterisk irc java memcached minimal mysql postgres ssl test cgi ipv6 syslog ipmi http dhcpd doc apache"
+REQUIRED_USE="cgi? ( !minimal ) apache? ( cgi )"
# Upstream's listing of required modules is NOT correct!
# Some of the postgres plugins use DBD::Pg, while others call psql directly.
# Some of the mysql plugins use DBD::mysql, while others call mysqladmin directly.
# We replace the original ipmi plugins with the freeipmi_ plugin which at least works.
-DEPEND_COM="dev-lang/perl
+DEPEND_COM="dev-lang/perl[berkdb]
sys-process/procps
+ doc? ( dev-python/sphinx )
asterisk? ( dev-perl/Net-Telnet )
irc? ( dev-perl/Net-IRC )
mysql? ( virtual/mysql
@@ -36,12 +37,14 @@ DEPEND_COM="dev-lang/perl
postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base )
memcached? ( dev-perl/Cache-Memcached )
cgi? ( dev-perl/FCGI )
+ apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] )
syslog? ( virtual/perl-Sys-Syslog )
- ipmi? (
- >=sys-libs/freeipmi-1.1.6-r1
- virtual/awk
- )
http? ( dev-perl/libwww-perl )
+ dhcpd? (
+ >=net-misc/dhcp-3[server]
+ dev-perl/Net-IP
+ dev-perl/HTTP-Date
+ )
dev-perl/DBI
dev-perl/DateManip
dev-perl/File-Copy-Recursive
@@ -61,6 +64,7 @@ DEPEND_COM="dev-lang/perl
dev-perl/IO-Socket-INET6
dev-perl/URI
>=net-analyzer/rrdtool-1.3[perl]
+ virtual/ssh
)"
# Keep this seperate, as previous versions have had other deps here
@@ -68,14 +72,18 @@ DEPEND="${DEPEND_COM}
virtual/perl-Module-Build
java? ( >=virtual/jdk-1.5 )
test? (
+ dev-perl/Test-Deep
dev-perl/Test-LongString
dev-perl/Test-Differences
dev-perl/Test-MockModule
+ dev-perl/Test-MockObject
dev-perl/File-Slurp
dev-perl/IO-stringy
dev-perl/IO-Socket-INET6
)"
RDEPEND="${DEPEND_COM}
+ virtual/awk
+ ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 )
java? (
>=virtual/jre-1.5
|| ( net-analyzer/netcat6 net-analyzer/netcat )
@@ -90,6 +98,8 @@ S="${WORKDIR}/${MY_P}"
pkg_setup() {
enewgroup munin
enewuser munin 177 -1 /var/lib/munin munin
+ enewuser munin-async -1 /bin/sh /var/spool/munin-async
+ esethome munin-async /var/spool/munin-async
java-pkg-opt-2_pkg_setup
}
@@ -100,9 +110,11 @@ src_prepare() {
}
src_configure() {
- local cgidir='$(DESTDIR)/var/www/localhost/cgi-bin'
+ local cgidir='$(DESTDIR)/usr/libexec/munin/cgi'
use cgi || cgidir="${T}/useless/cgi-bin"
+ local cgiuser=$(usex apache apache munin)
+
cat - >> "${S}"/Makefile.config <> "${T}"/munin.env < "${D}"/etc/logrotate.d/munin
dosym ipmi_ /usr/libexec/munin/plugins/ipmi_sensor_
@@ -169,6 +209,18 @@ src_install() {
"${D}"/etc/munin/munin-node.conf || die
fi
+ # Use a simpler pid file to avoid trouble with /run in tmpfs. The
+ # munin-node service is ran as user root, and only later drops
+ # privileges.
+ sed -i -e 's:/var/run/munin/munin-node.pid:/var/run/munin-node.pid:' \
+ "${D}"/etc/munin/munin-node.conf || die
+
+ keepdir /var/spool/munin-async/.ssh
+ touch "${D}"/var/spool/munin-async/.ssh/authorized_keys
+ fowners munin-async:munin /var/spool/munin-async{,/.ssh/{,authorized_keys}}
+ fperms 0750 /var/spool/munin-async{,/.ssh}
+ fperms 0600 /var/spool/munin-async/.ssh/authorized_keys
+
if use minimal; then
# This requires the presence of munin-update, which is part of
# the non-minimal install...
@@ -182,10 +234,31 @@ src_install() {
if use cgi; then
sed -i -e '/#graph_strategy cgi/s:^#::' "${D}"/etc/munin/munin.conf || die
+
+ keepdir /var/cache/munin-cgi
+ touch "${D}"/var/log/munin/munin-cgi-{graph,html}.log
+ fowners $(usex apache apache munin) \
+ /var/cache/munin-cgi \
+ /var/log/munin/munin-cgi-{graph,html}.log
+
+ if use apache; then
+ insinto /etc/apache2/vhosts.d
+ newins "${FILESDIR}"/munin.apache.include munin.include
+ newins "${FILESDIR}"/munin.apache.include-2.4 munin-2.4.include
+ fi
else
sed -i -e '/#graph_strategy cgi/s:#graph_strategy cgi:graph_strategy cron:' "${D}"/etc/munin/munin.conf || die
fi
+ keepdir /var/lib/munin/.ssh
+ cat - >> "${D}"/var/lib/munin/.ssh/config <> "${D}"/usr/share/${PN}/crontab <=app-crypt/gpgme-1.0.0 )
- >=net-libs/loudmouth-1.4.3
- otr? ( >=net-libs/libotr-3.1.0 )
- spell? ( app-text/aspell )
- >=dev-libs/glib-2.0.0
- sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- use crypt && append-flags -D_FILE_OFFSET_BITS=64 # bug #277888
- append-flags -fno-strict-aliasing
-}
-
-src_configure() {
- econf \
- --enable-modules \
- $(use_enable crypt gpgme) \
- $(use_enable otr) \
- $(use_enable spell aspell) \
- || die "econf failed"
-}
-
-src_compile() {
- emake || die "emake failed"
-}
-
-src_install() {
- make install DESTDIR="${D}" || die "make install failed"
- # clean unneeded language documentation
- for i in ${LANGS}; do
- ! use linguas_${i} && rm -rf "${D}"/usr/share/${PN}/help/${i}
- done
-
- dodoc AUTHORS ChangeLog NEWS README TODO mcabberrc.example
- dodoc doc/README_PGP.txt
-
- # contrib themes
- insinto /usr/share/${PN}/themes
- doins "${S}"/contrib/themes/*
-
- # contrib generic scripts
- exeinto /usr/share/${PN}/scripts
- doexe "${S}"/contrib/*.{pl,py}
-
- # contrib event scripts
- exeinto /usr/share/${PN}/scripts/events
- doexe "${S}"/contrib/events/*
-}
-
-pkg_postinst() {
- elog
- elog "MCabber requires you to create a subdirectory .mcabber in your home"
- elog "directory and to place a configuration file there."
- elog "An example mcabberrc was installed as part of the documentation."
- elog "To create a new mcabberrc based on the example mcabberrc, execute the"
- elog "following commands:"
- elog
- elog " mkdir -p ~/.mcabber"
- elog " bzcat ${ROOT}usr/share/doc/${PF}/mcabberrc.example.bz2 >~/.mcabber/mcabberrc"
- elog
- elog "Then edit ~/.mcabber/mcabberrc with your favorite editor."
- elog
- elog "See the CONFIGURATION FILE and FILES sections of the mcabber"
- elog "manual page (section 1) for more information."
- elog
- elog "From version 0.9.0 on, MCabber supports PGP encryption of messages."
- elog "See README_PGP.txt for details."
- elog
- elog "Check out ${ROOT}usr/share/${PN} for contributed themes and event scripts."
- elog
-}
diff --git a/net-im/mcabber/mcabber-0.10.1.ebuild b/net-im/mcabber/mcabber-0.10.2.ebuild
similarity index 73%
rename from net-im/mcabber/mcabber-0.10.1.ebuild
rename to net-im/mcabber/mcabber-0.10.2.ebuild
index 6451fa26acdd..8fd78553cb1a 100644
--- a/net-im/mcabber/mcabber-0.10.1.ebuild
+++ b/net-im/mcabber/mcabber-0.10.2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/mcabber-0.10.1.ebuild,v 1.2 2012/05/04 06:22:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/mcabber-0.10.2.ebuild,v 1.1 2012/12/12 15:38:24 wschlich Exp $
-EAPI=3
+EAPI=4
-inherit flag-o-matic
+inherit flag-o-matic autotools
DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
HOMEPAGE="http://mcabber.com/"
@@ -12,7 +12,7 @@ SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="aspell crypt idn modules otr spell ssl vim-syntax"
@@ -36,14 +36,15 @@ DEPEND="${RDEPEND}
pkg_setup() {
if use aspell && use spell; then
- ewarn "NOTE: You have both flags 'aspell' and 'spell' enabled, enchant will be preferred."
+ ewarn "NOTE: You have both USE flags 'aspell' and 'spell' enabled, enchant (USE flag 'spell') will be preferred."
fi
}
-src_configure() {
- # bug #277888
- use crypt && append-flags -D_FILE_OFFSET_BITS=64
+src_prepare() {
+ eautoreconf
+}
+src_configure() {
econf \
$(use_enable crypt gpgme) \
$(use_enable otr) \
@@ -54,11 +55,11 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
+ emake DESTDIR="${D}" install
# clean unneeded language documentation
for i in ${LANGS}; do
- ! use linguas_${i} && rm -rf "${D}"/usr/share/${PN}/help/${i}
+ ! use linguas_${i} && rm -rf "${ED}"/usr/share/${PN}/help/${i}
done
dodoc AUTHORS ChangeLog NEWS README TODO mcabberrc.example
@@ -66,24 +67,24 @@ src_install() {
# contrib themes
insinto /usr/share/${PN}/themes
- doins "${S}"/contrib/themes/* || die
+ doins "${S}"/contrib/themes/*
# contrib generic scripts
exeinto /usr/share/${PN}/scripts
- doexe "${S}"/contrib/*.{pl,py} || die
+ doexe "${S}"/contrib/*.{pl,py}
# contrib event scripts
exeinto /usr/share/${PN}/scripts/events
- doexe "${S}"/contrib/events/* || die
+ doexe "${S}"/contrib/events/*
if use vim-syntax; then
cd contrib/vim/
insinto /usr/share/vim/vimfiles/syntax
- doins mcabber_log-syntax.vim || die
+ doins mcabber_log-syntax.vim
insinto /usr/share/vim/vimfiles/ftdetect
- doins mcabber_log-ftdetect.vim || die
+ doins mcabber_log-ftdetect.vim
fi
}
@@ -96,7 +97,7 @@ pkg_postinst() {
elog "following commands:"
elog
elog " mkdir -p ~/.mcabber"
- elog " bzcat ${ROOT}usr/share/doc/${PF}/mcabberrc.example.bz2 >~/.mcabber/mcabberrc"
+ elog " bzcat ${EROOT}usr/share/doc/${PF}/mcabberrc.example.bz2 >~/.mcabber/mcabberrc"
elog
elog "Then edit ~/.mcabber/mcabberrc with your favorite editor."
elog
@@ -106,6 +107,6 @@ pkg_postinst() {
elog "From version 0.9.0 on, MCabber supports PGP encryption of messages."
elog "See README_PGP.txt for details."
echo
- einfo "Check out ${ROOT}usr/share/${PN} for contributed themes and event scripts."
+ einfo "Check out ${EROOT}usr/share/${PN} for contributed themes and event scripts."
echo
}
diff --git a/net-im/mcabber/mcabber-0.9.10.ebuild b/net-im/mcabber/mcabber-0.9.10.ebuild
deleted file mode 100644
index a60054ca5982..000000000000
--- a/net-im/mcabber/mcabber-0.9.10.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/mcabber/mcabber-0.9.10.ebuild,v 1.2 2012/05/04 06:22:11 jdhore Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="A small Jabber console client with various features, like MUC, SSL, PGP"
-HOMEPAGE="http://mcabber.com/"
-SRC_URI="http://mcabber.com/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="crypt otr spell ssl"
-
-LANGS="de en fr nl pl uk ru"
-# localized help versions are installed only, when LINGUAS var is set
-for i in ${LANGS}; do
- IUSE="${IUSE} linguas_${i}"
-done;
-
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.7-r1 )
- crypt? ( >=app-crypt/gpgme-1.0.0 )
- otr? ( >=net-libs/libotr-3.1.0 )
- spell? ( app-text/aspell )
- >=dev-libs/glib-2.0.0
- sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_compile() {
- use crypt && append-flags -D_FILE_OFFSET_BITS=64 # bug #277888
- econf \
- $(use_enable crypt gpgme) \
- $(use_enable otr) \
- $(use_enable spell aspell) \
- $(use_with ssl) \
- || die "econf failed"
-
- emake || die "emake failed"
-}
-
-src_install() {
- make install DESTDIR="${D}" || die "make install failed"
- # clean unneeded language documentation
- for i in ${LANGS}; do
- ! use linguas_${i} && rm -rf "${D}"/usr/share/${PN}/help/${i}
- done
-
- dodoc AUTHORS ChangeLog NEWS README TODO mcabberrc.example
- dodoc doc/README_PGP.txt
-
- # contrib themes
- insinto /usr/share/${PN}/themes
- doins "${S}"/contrib/themes/*
-
- # contrib generic scripts
- exeinto /usr/share/${PN}/scripts
- doexe "${S}"/contrib/*.{pl,py,rb}
-
- # contrib event scripts
- exeinto /usr/share/${PN}/scripts/events
- doexe "${S}"/contrib/events/*
-}
-
-pkg_postinst() {
- elog
- elog "MCabber requires you to create a subdirectory .mcabber in your home"
- elog "directory and to place a configuration file there."
- elog "An example mcabberrc was installed as part of the documentation."
- elog "To create a new mcabberrc based on the example mcabberrc, execute the"
- elog "following commands:"
- elog
- elog " mkdir -p ~/.mcabber"
- elog " bzcat ${ROOT}usr/share/doc/${PF}/mcabberrc.example.bz2 >~/.mcabber/mcabberrc"
- elog
- elog "Then edit ~/.mcabber/mcabberrc with your favorite editor."
- elog
- elog "As of MCabber version 0.8.2, there is also a wizard script"
- elog "with which you can create all necessary configuration options."
- elog "To use it, simply execute the following command (please note that you need"
- elog "to have dev-lang/ruby installed for it to work!):"
- elog
- elog " ${ROOT}usr/share/${PN}/scripts/mcwizz.rb"
- elog
- elog
- elog "See the CONFIGURATION FILE and FILES sections of the mcabber"
- elog "manual page (section 1) for more information."
- elog
- elog "From version 0.9.0 on, MCabber supports PGP encryption of messages."
- elog "See README_PGP.txt for details."
- elog
- elog "Check out ${ROOT}usr/share/${PN} for contributed themes and event scripts."
- elog
-}
diff --git a/net-libs/serf/serf-1.1.1.ebuild b/net-libs/serf/serf-1.1.1.ebuild
index bdbede8de076..c3d665d5a43b 100644
--- a/net-libs/serf/serf-1.1.1.ebuild
+++ b/net-libs/serf/serf-1.1.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/net-libs/serf/serf-1.1.1.ebuild,v 1.4 2012/12/11 23:13:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/serf/serf-1.1.1.ebuild,v 1.6 2012/12/12 15:50:57 blueness Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="http://serf.googlecode.com/files/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x64-macos"
IUSE="static-libs"
DEPEND="dev-libs/apr:1
diff --git a/net-misc/jwhois/jwhois-4.0-r1.ebuild b/net-misc/jwhois/jwhois-4.0-r1.ebuild
index 527bfe584ca5..909ac40e3e49 100644
--- a/net-misc/jwhois/jwhois-4.0-r1.ebuild
+++ b/net-misc/jwhois/jwhois-4.0-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/net-misc/jwhois/jwhois-4.0-r1.ebuild,v 1.8 2012/12/09 18:24:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/jwhois/jwhois-4.0-r1.ebuild,v 1.9 2012/12/12 15:06:56 jmorgan Exp $
EAPI="4"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86"
IUSE="idn nls"
RDEPEND="idn? ( net-dns/libidn )"
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index a98da4195dc0..f6b20f9d631d 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -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/profiles/arch/powerpc/package.use.mask,v 1.146 2012/12/08 17:52:54 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/powerpc/package.use.mask,v 1.147 2012/12/12 16:27:10 ago Exp $
# Anthony G. Basile (15 Nove 2012)
# Mask telepathy, no stable net-libs/telepathy-qt, bug #441456
@@ -34,10 +34,6 @@ net-misc/tor tor-hardening
# Only work on amd64/x86
net-libs/cyassl aes-ni cyassl-hardening
-# Ben de Groot (12 Jul 2012)
-# Requires media-libs/chromaprint which is unkeyworded
-media-sound/picard acoustid
-
# Johannes Huber (9 Jul 2012)
# x11-libs/qt-openvg not keyworded correctly.
# ppc/ppc64 team please validate.
diff --git a/profiles/license_groups b/profiles/license_groups
index ee55b312740b..6a40ae167bfa 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -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/profiles/license_groups,v 1.147 2012/12/10 23:56:22 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/license_groups,v 1.148 2012/12/12 08:14:41 ulm Exp $
# Please report bugs or other requests at bugs.gentoo.org and assign to
# licenses@gentoo.org
@@ -25,7 +25,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artistic Artist
# Licenses in this list should NOT appear directly or indirectly in @FSF-APPROVED or @OSI-APPROVED
# TODO: maybe add a category for BSD-alike MISC-FREE licenses for easy seperation?
# BSD-4 alikes: dom4j FastCGI icu jaxen JDOM saxpath
-MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL imagemagick Info-ZIP ipadic JasPer2.0 jaxen JDOM JNIC JOVE libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb OpenSoftware otter perforce PHP-2.02 Princeton pysqlite rc RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH
+MISC-FREE Allegro ANTLR as-is bea.ri.jsr173 BEER-WARE BSD-1 BZIP2 CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB cryptopp czyborra docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI FLEX FLTK freemarker FVWM gnuplot gsm HTML-Tidy htmlc iASL IBPP-1.1 icu IDPL imagemagick Info-ZIP ipadic JasPer2.0 jaxen JDOM JNIC JOVE libpng libtiff LLGPL-2.1 LPPL-1.3 LPPL-1.3b lsof matplotlib md2k7-asyouwish mplus-fonts NCSA-HDF noweb OpenSoftware otter perforce PHP-2.02 Princeton psutils pysqlite rc RSA saxpath Scintilla Sendmail skype-4.0.0.7-third-party_attributions.txt SMAIL SNIA SSLeay Subversion SVFL tcltk tcp_wrappers_license TeX TeX-other-free UbuntuFontLicense-1.0 vlgothic w3m wxWinLL-3 Xdebug xtrs YaTeX zpaq ZSH
# The following are NOT valid in @MISC-FREE:
# arj - usage restrictions
# freedist - Doesn't grant the right to do modifications.
diff --git a/profiles/package.mask b/profiles/package.mask
index 89caaf5a58db..97c8d98cc814 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14291 2012/12/12 04:36:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14292 2012/12/12 15:55:35 jer Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -840,7 +840,7 @@ sys-apps/systemd-sysv-utils
# Opera Next and Opera snapshots are unsupported and eternally unstable.
#
www-client/opera-next
->=www-client/opera-12.12
+=www-client/opera-12.12*
# Hanno Boeck (15 Dec 2011)
# Breaks pam_mount, which is its only user in the tree.
diff --git a/sci-biology/primer3/Manifest b/sci-biology/primer3/Manifest
index f315b9a7e4d6..a1330cbd25f2 100644
--- a/sci-biology/primer3/Manifest
+++ b/sci-biology/primer3/Manifest
@@ -1,4 +1,4 @@
-DIST primer3-1.1.4.tar.gz 974628 SHA256 1cb045791afd3c4033956a65687ca0c1b1a6607ac84705bf4ed7d7151691980b
DIST primer3-2.2.3.tar.gz 2284282 SHA256 2e68d638119bfcac12571da351cf261e28a3dd4b32c89074ce17065931a98774
DIST primer3-2.3.0.tar.gz 2596929 SHA256 6b6721f8ae3b45dc8ac81d6a230012f79d56f840274e88dc5001ec718625e834 SHA512 56c67e19749d55e10bf2eb5728de0a8d72d4b016b477928e737b3485e583e3060faca2a13f0ad46f75e60d591e72dd0970dfef9acd65151463270a731a4e53f8 WHIRLPOOL b455046c268cba17b7d79730d39e350a6e85ce0caa649e2d585cac3905c9d47480cf3d9c6158bc7556c2a8cad2feaed767d03f6b099baa07f7069c105c06546f
DIST primer3-2.3.1.tar.gz 2539917 SHA256 34a27e5c442e41fca1202be4fbe90f97c791fa93e2235e28b625574ccf90c137 SHA512 ff035fc1bc96ff4ce1fa29d867f01fc2df62e3bcff23de62c753cef3a92a7209ef8fda27dc19cdf0173aa98c5b2fa36ad0b58cca9a7d225be26f3ebc970b08f8 WHIRLPOOL c2801ea96733729121a70ef77a710d1e0668ecdc5243ef70b4073930b421b708bf771805eec8d26d39af12f1d5b57dbbaf0384d565e887d26b916149dd5e23d2
+DIST primer3-2.3.4.tar.gz 2525173 SHA256 0f03dab554acb4073c1f59df280df7151cb96925c5218d56cdae6b051feb3d38 SHA512 ebf5cbfb3d0cafcb57131b377f57ca7972e61bbfdadf94511d60247c8011adcb1f3f88ffe1a41eb59e24ff1a5c00c9f088a57e1a9d1fc69b923e4cd157663d79 WHIRLPOOL 2a1f22f6d79e84c8920509e000f4653bd5a4b8e4fb6056811d95071fa6a86a347581b4868d5ed515343911c3a328b4ab425503253bfd717816962b6374d13a4c
diff --git a/sci-biology/primer3/files/primer3-2.3.4-buildsystem.patch b/sci-biology/primer3/files/primer3-2.3.4-buildsystem.patch
new file mode 100644
index 000000000000..51ab913b48cf
--- /dev/null
+++ b/sci-biology/primer3/files/primer3-2.3.4-buildsystem.patch
@@ -0,0 +1,139 @@
+ src/Makefile | 59 ++++++++++++++++++++++++++++++-----------------------------
+ 1 file changed, 30 insertions(+), 29 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 607ab45..b23ec23 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -52,15 +52,16 @@ TESTOPTS=
+ WINMAKE=mingw32-make
+
+ LDLIBS = -lm
+-AR = ar
+-CC = gcc
+-CPP = g++
+-O_OPTS = -O2
+-CC_OPTS = -g -Wall -D__USE_FIXED_PROTOTYPES__
+-P_DEFINES =
++AR ?= ar
++CC ?= gcc
++CXX ?= g++
++O_OPTS ?=
++CC_OPTS ?= -Wall -D__USE_FIXED_PROTOTYPES__
++P_DEFINES ?=
+
+-CFLAGS = $(CC_OPTS) $(O_OPTS)
+-LDFLAGS = -g
++CFLAGS += $(CC_OPTS) $(O_OPTS)
++CXXFLAGS += $(CC_OPTS) $(O_OPTS)
++LDFLAGS +=
+ # Note, for profiling, use
+ # make O_OPTS='-pg -O0' LDFLAGS='-g -pg'
+
+@@ -127,85 +128,85 @@ $(LIBOLIGOTM): oligotm.o
+ $(RANLIB) $@
+
+ $(LIBOLIGOTM_LIB): oligotm.o
+- $(CC) -shared -W1,-soname,liboligotm.so.1 -o $(LIBOLIGOTM_DYN) oligotm.o
++ $(CC) $(LDFLAGS) -shared -W1,-soname,liboligotm.so.1 -o $(LIBOLIGOTM_DYN) oligotm.o
+
+ $(LIBDPAL): dpal_primer.o
+ $(AR) rv $@ dpal_primer.o
+ $(RANLIB) $@
+
+ $(LIBDPAL_DYN): dpal_primer.o
+- $(CC) -shared -W1,-soname,libdpal.so.1 -o $(LIBDPAL_DYN_LIB) dpal_primer.o
++ $(CC) $(LDFLAGS) -shared -W1,-soname,libdpal.so.1 -o $(LIBDPAL_DYN_LIB) dpal_primer.o
+
+ $(LIBTHAL): thal_primer.o
+ $(AR) rv $@ thal_primer.o
+ $(RANLIB) $@
+
+ $(LIBTHAL_DYN): thal_primer.o
+- $(CC) -shared -W1,-soname,libthal.so.1 -o $(LIBTHAL_DYN_LIB) thal_primer.o
++ $(CC) $(LDFLAGS) -shared -W1,-soname,libthal.so.1 -o $(LIBTHAL_DYN_LIB) thal_primer.o
+
+ $(LIBPRIMER3): libprimer3.o p3_seq_lib.o
+ $(AR) rv $@ libprimer3.o p3_seq_lib.o
+ $(RANLIB) $@
+
+ $(LIBPRIMER3_DYN): libprimer3.o p3_seq_lib.o
+- $(CC) -shared -W1,-soname,liprimer3.so.1 -o $(LIBPRIMER3_DYN) libprimer3.o p3_seq_lib.o
++ $(CC) $(LDFLAGS) -shared -W1,-soname,liprimer3.so.1 -o $(LIBPRIMER3_DYN) libprimer3.o p3_seq_lib.o
+
+ $(PRIMER_EXE): $(PRIMER_OBJECTS)
+- $(CPP) $(LDFLAGS) -o $@ $(PRIMER_OBJECTS) $(LIBOPTS) $(LDLIBS)
++ $(CXX) $(LDFLAGS) -o $@ $(PRIMER_OBJECTS) $(LIBOPTS) $(LDLIBS)
+
+ libprimer3.o: libprimer3.c libprimer3.h p3_seq_lib.h dpal.h thal.h oligotm.h
+- $(CPP) -c $(CFLAGS) -Wno-deprecated $(P_DEFINES) -o $@ libprimer3.c
++ $(CXX) -c $(CXXFLAGS) -Wno-deprecated $(P_DEFINES) -o $@ libprimer3.c
+
+ $(NTDPAL_EXE): ntdpal_main.o dpal.o
+- $(CPP) $(LDFLAGS) -o $@ ntdpal_main.o dpal.o
++ $(CXX) $(LDFLAGS) -o $@ ntdpal_main.o dpal.o
+
+ $(NTTHAL_EXE): thal_main.o thal.o
+- $(CPP) $(LDFLAGS) -o $@ thal_main.o thal.o $(LDLIBS)
++ $(CXX) $(LDFLAGS) -o $@ thal_main.o thal.o $(LDLIBS)
+
+ $(OLIGOTM_EXE): oligotm_main.c oligotm.h $(LIBOLIGOTM)
+- $(CPP) $(CFLAGS) -o $@ oligotm_main.c $(LIBOLIGOTM) $(LIBOPTS) $(LDLIBS)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ oligotm_main.c $(LIBOLIGOTM) $(LIBOPTS) $(LDLIBS)
+
+ $(LONG_SEQ_EXE): long_seq_tm_test_main.c oligotm.o
+- $(CPP) $(CFLAGS) -o $@ long_seq_tm_test_main.c oligotm.o $(LIBOPTS) $(LDLIBS)
++ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ long_seq_tm_test_main.c oligotm.o $(LIBOPTS) $(LDLIBS)
+
+ read_boulder.o: read_boulder.c read_boulder.h libprimer3.h dpal.h thal.h p3_seq_lib.h
+- $(CPP) -c $(CFLAGS) $(P_DEFINES) -o $@ read_boulder.c
++ $(CXX) -c $(CXXFLAGS) $(P_DEFINES) -o $@ read_boulder.c
+
+ print_boulder.o: print_boulder.c print_boulder.h libprimer3.h p3_seq_lib.h
+- $(CPP) -c $(CFLAGS) $(P_DEFINES) -o $@ print_boulder.c
++ $(CXX) -c $(CXXFLAGS) $(P_DEFINES) -o $@ print_boulder.c
+
+ dpal.o: dpal.c dpal.h
+- $(CPP) -c $(CFLAGS) -o $@ dpal.c
++ $(CXX) -c $(CXXFLAGS) -o $@ dpal.c
+
+ # We use '-ffloat-store' on windows to prevent undesirable
+ # precision which may lead to differences in floating point results.
+ thal.o: thal.c thal.h
+- $(CPP) -c $(CFLAGS) -ffloat-store -o $@ thal.c
++ $(CXX) -c $(CXXFLAGS) -ffloat-store -o $@ thal.c
+
+ p3_seq_lib.o: p3_seq_lib.c p3_seq_lib.h libprimer3.h
+- $(CPP) -c $(CFLAGS) -o $@ p3_seq_lib.c
++ $(CXX) -c $(CXXFLAGS) -o $@ p3_seq_lib.c
+
+ dpal_primer.o: dpal.c dpal.h
+- $(CPP) -c $(CFLAGS) $(P_DEFINES) -o $@ dpal.c
++ $(CXX) -c $(CXXFLAGS) $(P_DEFINES) -o $@ dpal.c
+
+ thal_primer.o: thal.c thal.h
+- $(CPP) -c $(CFLAGS) -ffloat-store $(P_DEFINES) -o $@ thal.c
++ $(CXX) -c $(CXXFLAGS) -ffloat-store $(P_DEFINES) -o $@ thal.c
+
+ format_output.o: format_output.c format_output.h libprimer3.h dpal.h thal.h p3_seq_lib.h
+- $(CPP) -c $(CFLAGS) $(P_DEFINES) -o $@ format_output.c
++ $(CXX) -c $(CXXFLAGS) $(P_DEFINES) -o $@ format_output.c
+
+ ntdpal_main.o: ntdpal_main.c dpal.h
+- $(CPP) -c $(CC_OPTS) -o $@ ntdpal_main.c
++ $(CXX) -c $(CXXFLAGS) -o $@ ntdpal_main.c
+
+ thal_main.o: thal_main.c thal.h
+- $(CPP) -c $(CFLAGS) -o $@ thal_main.c
++ $(CXX) -c $(CXXFLAGS) -o $@ thal_main.c
+ # We use CC_OPTS above rather than CFLAGS because
+ # gcc 2.7.2 crashes while compiling ntdpal_main.c with -O2
+
+ oligotm.o: oligotm.c oligotm.h
+
+ primer3_boulder_main.o: primer3_boulder_main.c libprimer3.h dpal.h thal.h oligotm.h format_output.h print_boulder.h read_boulder.h
+- $(CPP) -c $(CFLAGS) $(P_DEFINES) primer3_boulder_main.c
++ $(CXX) -c $(CXXFLAGS) $(P_DEFINES) primer3_boulder_main.c
+
+ primer_test: test
+
diff --git a/sci-biology/primer3/metadata.xml b/sci-biology/primer3/metadata.xml
index ab4edb62b7b6..a72b3a5d05f6 100644
--- a/sci-biology/primer3/metadata.xml
+++ b/sci-biology/primer3/metadata.xml
@@ -1,8 +1,8 @@
- sci-biology
-
+ sci-biology
+
Primer3 picks primers for PCR reactions, considering: oligonucleotide
melting temperature, size, GC content, and primer-dimer possibilities;
PCR product size; positional constraints within the source sequence;
diff --git a/sci-biology/primer3/primer3-1.1.4-r2.ebuild b/sci-biology/primer3/primer3-1.1.4-r2.ebuild
deleted file mode 100644
index 0076c5ed19fb..000000000000
--- a/sci-biology/primer3/primer3-1.1.4-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-1.1.4-r2.ebuild,v 1.2 2011/11/23 08:10:50 jlec Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Primer Design for PCR reactions"
-HOMEPAGE="http://primer3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="whitehead"
-IUSE=""
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-
-DEPEND="dev-lang/perl"
-RDEPEND=""
-
-S=${WORKDIR}/src
-
-src_prepare() {
-
- [[ ${CHOST} == *-darwin* ]] && \
- sed -e "s:LIBOPTS ='-static':LIBOPTS =:" -i Makefile
- epatch "${FILESDIR}"/${P}-ldflags.patch
-}
-
-src_compile() {
- emake -e CC="$(tc-getCC)" || die
-}
-
-src_test () {
- emake primer_test || die
-}
-
-src_install () {
- dobin long_seq_tm_test ntdpal oligotm primer3_core || die
- dodoc ../{how-to-cite.txt,README.txt,example} || die
-}
diff --git a/sci-biology/primer3/primer3-2.3.1.ebuild b/sci-biology/primer3/primer3-2.3.1.ebuild
index c42182fb1bbe..590d4105ac07 100644
--- a/sci-biology/primer3/primer3-2.3.1.ebuild
+++ b/sci-biology/primer3/primer3-2.3.1.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/sci-biology/primer3/primer3-2.3.1.ebuild,v 1.1 2012/07/19 12:21:52 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-2.3.1.ebuild,v 1.2 2012/12/12 13:10:00 jlec Exp $
EAPI=4
-inherit toolchain-funcs
+inherit eutils toolchain-funcs
DESCRIPTION="Primer Design for PCR reactions"
HOMEPAGE="http://primer3.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2"
@@ -19,15 +19,13 @@ DEPEND="dev-lang/perl"
RDEPEND=""
src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.3.4-buildsystem.patch
+
if [[ ${CHOST} == *-darwin* ]]; then
sed -e "s:LIBOPTS ='-static':LIBOPTS =:" -i Makefile || die
fi
- perl -i -ne 's/\$\(CPP\)/'$(tc-getCXX)'/; print unless /^(CC|CPP|CFLAGS|LDFLAGS)\s*=/' src/Makefile || die
- sed \
- -e '/oligotm/s:-o $@:$(LDFLAGS) -o $@:g' \
- -e '/long_seq_tm_test/s:-o $@:$(LDFLAGS) -o $@:g' \
- -e 's:CFLAGS:CXXFLAGS:g' \
- -i src/Makefile || die
+
+ tc-export CC CXX AR RANLIB
}
src_compile() {
@@ -35,7 +33,8 @@ src_compile() {
}
src_test () {
- emake -C test
+ emake -C test | tee "${T}"/test.log
+ grep -q "\[FAILED\]" && die "test failed. See "${T}"/test.log"
}
src_install () {
diff --git a/sci-biology/primer3/primer3-2.3.4.ebuild b/sci-biology/primer3/primer3-2.3.4.ebuild
new file mode 100644
index 000000000000..628c567c378d
--- /dev/null
+++ b/sci-biology/primer3/primer3-2.3.4.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/primer3/primer3-2.3.4.ebuild,v 1.2 2012/12/12 13:10:00 jlec Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Primer Design for PCR reactions"
+HOMEPAGE="http://primer3.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+
+DEPEND="dev-lang/perl"
+RDEPEND=""
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-buildsystem.patch
+
+ if [[ ${CHOST} == *-darwin* ]]; then
+ sed -e "s:LIBOPTS ='-static':LIBOPTS =:" -i Makefile || die
+ fi
+
+ tc-export CC CXX AR RANLIB
+}
+
+src_compile() {
+ emake -C src
+}
+
+src_test () {
+ emake -C test | tee "${T}"/test.log
+ grep -q "\[FAILED\]" && die "test failed. See "${T}"/test.log"
+}
+
+src_install () {
+ dobin src/{long_seq_tm_test,ntdpal,oligotm,primer3_core}
+ dodoc src/release_notes.txt example
+ insinto /opt/primer3_config
+ doins -r src/primer3_config/* primer3*settings.txt
+ dohtml primer3_manual.htm
+}
diff --git a/sci-libs/clapack/clapack-3.2.1-r7.ebuild b/sci-libs/clapack/clapack-3.2.1-r7.ebuild
new file mode 100644
index 000000000000..0e161d744f52
--- /dev/null
+++ b/sci-libs/clapack/clapack-3.2.1-r7.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/clapack/clapack-3.2.1-r7.ebuild,v 1.1 2012/12/12 16:26:56 jlec Exp $
+
+EAPI=4
+
+inherit flag-o-matic base cmake-utils
+
+DESCRIPTION="f2c'ed version of LAPACK"
+HOMEPAGE="http://www.netlib.org/clapack/"
+SRC_URI="http://www.netlib.org/${PN}/${P}-CMAKE.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND=">=dev-libs/libf2c-20090407-r1
+ virtual/blas"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P}-CMAKE
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix_include_file.patch"
+ "${FILESDIR}/${P}-noblasf2c.patch"
+ "${FILESDIR}/${P}-hang.patch"
+ "${FILESDIR}/${P}-findblas-r7.patch"
+)
+
+src_configure() {
+ filter-flags -ftree-vectorize
+ # causes an internal compiler error with gcc-4.6.2
+
+ local mycmakeargs=( $(cmake-utils_use_enable test TESTS) )
+ cmake-utils_src_configure
+}
diff --git a/sci-libs/clapack/files/clapack-3.2.1-findblas-r7.patch b/sci-libs/clapack/files/clapack-3.2.1-findblas-r7.patch
new file mode 100644
index 000000000000..c82cd50a2c5b
--- /dev/null
+++ b/sci-libs/clapack/files/clapack-3.2.1-findblas-r7.patch
@@ -0,0 +1,84 @@
+ CMakeLists.txt | 29 +++++++++++++++++++++++++++--
+ SRC/CMakeLists.txt | 7 ++++++-
+ TESTING/CMakeLists.txt | 5 +++++
+ 3 files changed, 38 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 37fb433..fe29d4c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,7 +28,33 @@ set(CPACK_PACKAGE_VERSION_MAJOR 3)
+ set(CPACK_PACKAGE_VERSION_MINOR 2)
+ set(CPACK_PACKAGE_VERSION_PATCH 1)
+
+-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
++if(BLAS_LIBRARIES)
++ include(CheckFortranFunctionExists)
++ set(CMAKE_REQUIRED_LIBRARIES ${BLAS_LIBRARIES})
++ CHECK_FORTRAN_FUNCTION_EXISTS("dgemm" BLAS_FOUND)
++ unset( CMAKE_REQUIRED_LIBRARIES )
++ if(BLAS_FOUND)
++ message(STATUS "--> BLAS supplied by user is WORKING, will use ${BLAS_LIBRARIES}.")
++ else(BLAS_FOUND)
++ message(ERROR "--> BLAS supplied by user is not WORKING, CANNOT USE ${BLAS_LIBRARIES}.")
++ message(ERROR "--> Will use REFERENCE BLAS (by default)")
++ message(ERROR "--> Or Correct your BLAS_LIBRARIES entry ")
++ message(ERROR "--> Or Consider checking USE_OPTIMIZED_BLAS")
++ endif(BLAS_FOUND)
++else(BLAS_LIBRARIES)
++ # User did not provide a BLAS Library
++ find_package(PkgConfig)
++ pkg_check_modules(BLAS blas)
++endif (BLAS_LIBRARIES)
++
++if(NOT BLAS_FOUND)
++ message(FATAL_ERROR "--> BLAS libraries needed but not found.")
++endif(NOT BLAS_FOUND)
++
++if(BLAS_LIBRARY_DIRS)
++# SET_TARGET_PROPERTIES(clapack PROPERTIES LINK_FLAGS ${LINK_FLAGS} -L"${BLAS_LIBRARY_DIRS}")
++ SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L\"${BLAS_LIBRARY_DIRS}\"")
++endif()
+
+ add_subdirectory(SRC)
+
+@@ -44,4 +70,3 @@ configure_file(${CLAPACK_SOURCE_DIR}/clapack-config-version.cmake.in
+ ${CLAPACK_BINARY_DIR}/clapack-config-version.cmake @ONLY)
+ configure_file(${CLAPACK_SOURCE_DIR}/clapack-config.cmake.in
+ ${CLAPACK_BINARY_DIR}/clapack-config.cmake @ONLY)
+-
+diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt
+index 7b75ee9..39380ed 100644
+--- a/SRC/CMakeLists.txt
++++ b/SRC/CMakeLists.txt
+@@ -376,8 +376,13 @@ if(BUILD_COMPLEX16)
+ set(ALLOBJ ${ZLASRC} ${ALLAUX} ${DZLAUX})
+ endif()
+
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
++
+ add_library(clapack SHARED ${ALLOBJ} ${ALLXOBJ})
+-target_link_libraries(clapack blas f2c m)
++target_link_libraries(clapack ${BLAS_LIBRARIES} f2c m)
++if(BLAS_LIBRARY_DIRS)
++ SET_TARGET_PROPERTIES(clapack PROPERTIES LINK_FLAGS ${LINK_FLAGS} -L"${BLAS_LIBRARY_DIRS}")
++endif()
+ set_target_properties(clapack PROPERTIES SOVERSION "${CLAPACK_VERSION}")
+
+ install(
+diff --git a/TESTING/CMakeLists.txt b/TESTING/CMakeLists.txt
+index d59359d..174672e 100644
+--- a/TESTING/CMakeLists.txt
++++ b/TESTING/CMakeLists.txt
+@@ -4,6 +4,11 @@ if(MSVC_VERSION)
+ string(REGEX REPLACE "(.*)/STACK:(.*) (.*)" "\\1/STACK:900000000000000000 \\3"
+ CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
+ endif()
++if(BLAS_LIBRARY_DIRS)
++# SET_TARGET_PROPERTIES(clapack PROPERTIES LINK_FLAGS ${LINK_FLAGS} -L"${BLAS_LIBRARY_DIRS}")
++ SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -L\"${BLAS_LIBRARY_DIRS}\"")
++endif()
++
+ add_subdirectory(MATGEN)
+ add_subdirectory(LIN)
+ add_subdirectory(EIG)
diff --git a/sci-libs/clapack/metadata.xml b/sci-libs/clapack/metadata.xml
index 054845427e54..fe3f51cd1a6d 100644
--- a/sci-libs/clapack/metadata.xml
+++ b/sci-libs/clapack/metadata.xml
@@ -1,7 +1,8 @@
+
-sci
-
+ sci
+
LAPACK is a comprehensive library that does linear algebra
operations including matrix inversions, least squared solutions to
linear sets of equations, eigenvector analysis, singular value
diff --git a/sci-mathematics/twelf/twelf-1.7.1.ebuild b/sci-mathematics/twelf/twelf-1.7.1.ebuild
index 368adb6d32ab..317eab7b26e4 100644
--- a/sci-mathematics/twelf/twelf-1.7.1.ebuild
+++ b/sci-mathematics/twelf/twelf-1.7.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/sci-mathematics/twelf/twelf-1.7.1.ebuild,v 1.1 2012/12/09 23:02:17 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/twelf/twelf-1.7.1.ebuild,v 1.2 2012/12/12 13:12:19 gienah Exp $
EAPI="5"
@@ -13,7 +13,7 @@ DESCRIPTION="Twelf is an implementation of the logical framework LF."
HOMEPAGE="http://twelf.org/"
SRC_URI="http://twelf.plparty.org/releases/${MY_P}.tar.gz"
-SLOT="0"
+SLOT="0/${PV}"
KEYWORDS="~amd64 ~x86"
LICENSE="BSD-2"
IUSE="doc emacs examples"
@@ -27,8 +27,7 @@ RDEPEND="dev-lang/mlton
emacs? (
virtual/emacs
)"
-DEPEND="${RDEPEND}
- dev-util/omake"
+DEPEND="${RDEPEND}"
S=${WORKDIR}/${PN}
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 3e9551747723..4c2bf884cab7 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1 +1,2 @@
DIST bleachbit-0.9.3.tar.bz2 321528 SHA256 76bb62166d05ebf209dff4811342ba5a7acafc534597709152b314aa06936c47 SHA512 28416038d51d4314e83c45ed993629833f4df27c3ebdf5d0265d3c23c7918cb277014541a0b68779e01c62de98b68a3e56caf44b1333b37063204e9a3c07d763 WHIRLPOOL 6e19594d3e0791c880d6033119403f804fe1aced8713ec05aa7f3a331cff65d6ddb292be524acae8bdbeb1bf8aed3366864ec35cdce8811c44e74d5766d00594
+DIST bleachbit-0.9.4.tar.bz2 327553 SHA256 3d0bf0553ffeaa6115b19b750ace863061114826bb087bdc7fa541b81a84aadf SHA512 c7ef782fd03e35a36fbec49af49bea30e3bb1a13c8201497945863ea9c40102d7278eedf8af745b7d4b65fa2f9de251ab650681528ebecc5f8faebc2d7d68c07 WHIRLPOOL 727de75c4589d53554c3f685fbfbd3561298d88acceec27e0ea1ac64aa749b63758316504632ff5ff3565eda36f6c8bad007916c37e9710776c087b2d7a2c3d1
diff --git a/sys-apps/bleachbit/bleachbit-0.9.4.ebuild b/sys-apps/bleachbit/bleachbit-0.9.4.ebuild
new file mode 100644
index 000000000000..b2ed2fc898ad
--- /dev/null
+++ b/sys-apps/bleachbit/bleachbit-0.9.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/bleachbit/bleachbit-0.9.4.ebuild,v 1.1 2012/12/12 10:41:43 kensington Exp $
+
+EAPI=5
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit distutils eutils
+
+DESCRIPTION="Clean junk to free disk space and to maintain privacy"
+HOMEPAGE="http://bleachbit.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-python/pygtk-2"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )"
+
+DOCS=( README )
+
+src_prepare() {
+ addpredict /root/.gnome2 #401981
+
+ python_convert_shebangs 2 ${PN}.py
+
+ # warning: key "Encoding" in group "Desktop Entry" is deprecated
+ sed -i -e '/Encoding/d' ${PN}.desktop || die
+
+ distutils_src_prepare
+}
+
+src_compile() {
+ distutils_src_compile
+ use nls && emake -C po
+}
+
+src_install() {
+ distutils_src_install
+ use nls && emake -C po DESTDIR="${D}" install
+
+ # http://bugs.gentoo.org/388999
+ insinto /usr/share/${PN}/cleaners
+ doins cleaners/*.xml
+
+ newbin ${PN}.py ${PN}
+
+ doicon ${PN}.png
+ domenu ${PN}.desktop
+}
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index b32d052118f9..879e221d63dc 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-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/sys-fs/eudev/eudev-9999.ebuild,v 1.4 2012/12/11 19:14:13 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.5 2012/12/12 14:06:33 axs Exp $
EAPI=4
@@ -50,13 +50,14 @@ fi
RDEPEND="${COMMON_DEPEND}
hwdb? ( sys-apps/hwids )
openrc? ( >=sys-fs/udev-init-scripts-18 )
+ !sys-fs/udev
!sys-apps/coldplug
!sys-apps/systemd
!=virtual/udev-80"
+PDEPEND=">=virtual/udev-180"
udev_check_KV()
{
diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest
index 044808751652..a15a4ed6f048 100644
--- a/sys-fs/exfat-utils/Manifest
+++ b/sys-fs/exfat-utils/Manifest
@@ -1,2 +1 @@
-DIST exfat-utils-0.9.7.tar.gz 49955 SHA256 4bf3dc727540736b404c266ed0b91f7f0fe45df97fd2e581c58cb8abfc46c18a SHA512 960098e1f825f09349b99601fc5f6a07dbdc37d2b53a8d5db3637bcca4a4d41e3399fd9fd08a03f12f146ab290a3b94d7541ea7f5041d315b5638faa2dacb19e WHIRLPOOL 22ce7965dfc5f35627eacb71fe8b0c901cc33a91625940584ae64422d5c9c5db63946117ef0cb3b0606afe029f6f1392e40020e3acdad33d53ec02b580d2cfe3
DIST exfat-utils-0.9.8.tar.gz 51557 SHA256 97d8c77e048d0fdc2e5425ff22a139306ce3f1575b58e56c26bb968930a423bb SHA512 bff817b3b886d0ea03439c55d6497336e880b4eb5298e06c7fe8c60216dc491d27df9258865232a71d1a59fe1b3cffb38191caea5aaa4ad8965e3526126a2a38 WHIRLPOOL 4fb52ee2aefcb59692dbc66530cae6d813b1497a9e5900c2c074452cc759770fd60b3bf3fb41cf146dc98ece1f065e5cf50443017739823761cdd30a2c2d6c9b
diff --git a/sys-fs/exfat-utils/exfat-utils-0.9.7.ebuild b/sys-fs/exfat-utils/exfat-utils-0.9.7.ebuild
deleted file mode 100644
index 781f10ca6fc5..000000000000
--- a/sys-fs/exfat-utils/exfat-utils-0.9.7.ebuild
+++ /dev/null
@@ -1,29 +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/exfat-utils/exfat-utils-0.9.7.ebuild,v 1.1 2012/03/17 15:19:30 ssuominen Exp $
-
-EAPI=4
-inherit scons-utils toolchain-funcs
-
-DESCRIPTION="exFAT filesystem utilities"
-HOMEPAGE="http://code.google.com/p/exfat/"
-SRC_URI="http://exfat.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_compile() {
- tc-export CC
- escons CCFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
- dosbin dump/dumpexfat label/exfatlabel mkfs/mkexfatfs fsck/exfatfsck
- dosym mkexfatfs /usr/sbin/mkfs.exfat
- dosym exfatfsck /usr/sbin/fsck.exfat
-
- doman */*.8
- dodoc ChangeLog
-}
diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest
index 955f1e13fcbe..391350766c6f 100644
--- a/sys-fs/fuse-exfat/Manifest
+++ b/sys-fs/fuse-exfat/Manifest
@@ -1,2 +1 @@
-DIST fuse-exfat-0.9.7.tar.gz 37871 SHA256 7db7035fe25cb46aa4ac553705726b3c0ef1546e60080a59792de9e5b7f5b919 SHA512 19a21d74bfd73647a751bcece6ca8bc1c12dd5f0bf019a7f92b64d67a9b3fa89597effbf15b19059b6e77d61288dc0c6db63500f9f8b9ed6eabd9e59a8501999 WHIRLPOOL 0c0bea8b0647fcd78218fd980a6f17adf61fd6a838a6244216820d129519ec042bdc313642149496c6c476adb557fc92ea6ea3d167956b0b35019a3de8f02310
DIST fuse-exfat-0.9.8.tar.gz 38286 SHA256 ecae22203461e508d53389617c17d22f68c1b565c700d7663ce67bc4a710e903 SHA512 70b74b896131d41bf7693c7495a99cf943dbaccb61499beb38a474ff09f06213b3ca2ae32907c94795e6f05c3c681ec5db10414283603f666145787e030b1694 WHIRLPOOL 3d45f70833326baa12e245d3304084c239a5feead52a6956b2634c8f1508ceed9a606962e0602b01870fb2106a0544ee0c59803ac2d64018270009fcdc56e4fd
diff --git a/sys-fs/fuse-exfat/fuse-exfat-0.9.7.ebuild b/sys-fs/fuse-exfat/fuse-exfat-0.9.7.ebuild
deleted file mode 100644
index 440c68f977b8..000000000000
--- a/sys-fs/fuse-exfat/fuse-exfat-0.9.7.ebuild
+++ /dev/null
@@ -1,31 +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/fuse-exfat/fuse-exfat-0.9.7.ebuild,v 1.1 2012/03/17 15:12:58 ssuominen Exp $
-
-EAPI=4
-inherit scons-utils toolchain-funcs
-
-DESCRIPTION="exFAT filesystem FUSE module"
-HOMEPAGE="http://code.google.com/p/exfat/"
-SRC_URI="http://exfat.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-fs/fuse"
-DEPEND="${RDEPEND}"
-
-src_compile() {
- tc-export CC
- escons CCFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
- dosbin fuse/mount.exfat-fuse
- dosym mount.exfat-fuse /usr/sbin/mount.exfat
-
- doman */*.8
- dodoc ChangeLog
-}
diff --git a/sys-fs/fuse-exfat/fuse-exfat-0.9.8.ebuild b/sys-fs/fuse-exfat/fuse-exfat-0.9.8.ebuild
deleted file mode 100644
index 2c255c732c0d..000000000000
--- a/sys-fs/fuse-exfat/fuse-exfat-0.9.8.ebuild
+++ /dev/null
@@ -1,31 +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/fuse-exfat/fuse-exfat-0.9.8.ebuild,v 1.1 2012/08/27 07:04:42 ssuominen Exp $
-
-EAPI=4
-inherit scons-utils toolchain-funcs
-
-DESCRIPTION="exFAT filesystem FUSE module"
-HOMEPAGE="http://code.google.com/p/exfat/"
-SRC_URI="http://exfat.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="sys-fs/fuse"
-DEPEND="${RDEPEND}"
-
-src_compile() {
- tc-export CC
- escons CCFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
- dobin fuse/mount.exfat-fuse
- dosym mount.exfat-fuse /usr/bin/mount.exfat
-
- doman */*.8
- dodoc ChangeLog
-}
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 69fb6f37e80d..8f20bb72dcc6 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -1,5 +1,3 @@
-DIST ldb-1.1.10.tar.gz 1106879 SHA256 191f015bf8e0947d9e9c7b49261a5b5cbf31fa968c0e59deb2d225087545d1c1 SHA512 33193e530329b65cc27b1d3538d5f6b0a331802fea22010307ff97c086971fc7acc0d23f82cff69ca28736f2749bfb2dfe2b6fc99d59865a9cd5b7812aa691e8 WHIRLPOOL 6a4f04e45308fb2330f42f9ac9a31842d38c85ed5acc01c67f99dc26439dfeed488836011812dc606778a13d2e410cf4cef50b36ac02f54b457a9d9bc24ebb03
DIST ldb-1.1.12.tar.gz 1110134 SHA256 b6444a1bfc9b8c8f43df171b12b5a581c44a64b4d92062d4959fed17e4cf1b4c SHA512 e00af0367b99b8829bbca636859beee75c1c0828fc15f760a2b2fed6e4fadd850b55bfa6a57e4c6cc3a698fec70f1446635b152ed3a0559ef4483907e5a2102c WHIRLPOOL ebf339d27b0a14b56dcb9e4fe85af9e034f0670567b982edb9927fa808e8eac51c672083d76e747d58d29067b441d158e78d1cb2ee343589aba44bf9aa11689b
DIST ldb-1.1.13.tar.gz 1111232 SHA256 eff69e01ae9a42bbbd5a0d6f355abea8b577342c99a538ca93d5bc100e297beb SHA512 3476b7450953c374f83c19b1931edc489a70a6f39650264e40158ae96b3d07efd0b182406013ce54411f28f72f100579656f2961238507976f462ad8c7bff435 WHIRLPOOL 8b3d15ae3cfbb742e7ae94b407276fbe6664ee0c02cfea254c41ea3b1d4e3b80a11da4fe581098e8a13e476bcf97928d36e1fb066781e3fb149de26447a4bd83
-DIST ldb-1.1.4.tar.gz 1433689 SHA256 6eb3b7f11ff8d1a4f6c229a4fe5f5b9f615a1ee744e83622594907d0193c4970 SHA512 09a277eb59705028cded149d9e87ae7428ef9ee39b999402ef1792fb1f43a94c0943c8627ad304a43fe7e940b21fcea09370691157d38fe7a186281636071c92 WHIRLPOOL 764e43f8c8916d5938104bf8658ac842bac6c6a9e45394ca4bf049ea6ee479308263bd023cfdf77444b19d090bf49e67e7d073118e7aca168406c5ae828b83b4
-DIST ldb-1.1.9.tar.gz 1106876 SHA256 364db7ec20214a04fee989521c4ee7dd8f9842c7e486a876f9fba84de5532b33 SHA512 7bc9b416fba2ab3b4c98f6272dfa8a626aab75024b256b20e138dbd9a15a72e7341ca941abc00dda2a599d5afb220e99f7559e55314c0ae5fb869e7829a1ebe2 WHIRLPOOL 2682b08cc1a5b901e3464affc458d8dd53bd51cb81a8b54fcb54f6ffc6120f5d54afa5fc6289419fbc6da50a7cc494f0cf040e14acca63bccf28738936f397f3
+DIST ldb-1.1.14.tar.gz 1123647 SHA256 d0c83ecb7619dea65373af8fc5e89720e3aa1c48ff10f12cc132d335c5ee1e32 SHA512 77b68edabf5c2959625d66007ccfaeff975fec69374a6ede6890a9208855f7ad316be7302076b26cd4eacf1eb2dd150c48fa91a4a3f9adf813f9d0daa680a433 WHIRLPOOL 5f623503b174248af1f9b9d40a98fbd68b0b2aa2053ff01766f31fcb360c0922b8392d99b5ec4f8b6e4a0d97dc17c3b363f2f83065ec365fc27653c36a047f5d
diff --git a/sys-libs/ldb/ldb-1.1.10.ebuild b/sys-libs/ldb/ldb-1.1.14.ebuild
similarity index 88%
rename from sys-libs/ldb/ldb-1.1.10.ebuild
rename to sys-libs/ldb/ldb-1.1.14.ebuild
index 8abc3d8f9cb2..685cfc8346db 100644
--- a/sys-libs/ldb/ldb-1.1.10.ebuild
+++ b/sys-libs/ldb/ldb-1.1.14.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-libs/ldb/ldb-1.1.10.ebuild,v 1.6 2012/10/02 14:58:14 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.14.ebuild,v 1.1 2012/12/12 07:14:08 polynomial-c Exp $
EAPI="4"
PYTHON_DEPEND="2"
@@ -13,12 +13,12 @@ SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="doc"
RDEPEND="dev-libs/popt
>=sys-libs/talloc-2.0.7[python]
- >=sys-libs/tevent-0.9.16
+ >=sys-libs/tevent-0.9.17
>=sys-libs/tdb-1.2.10[python]
net-nds/openldap
!!=sys-libs/talloc-2.0.7[python]
- ~sys-libs/tevent-0.9.14
- ~sys-libs/tdb-1.2.9[python]
- net-nds/openldap
- !!=net-fs/samba-4.0.0[ldb]
- "
-
-DEPEND="dev-libs/libxslt
- doc? ( app-doc/doxygen )
- virtual/pkgconfig
- ${RDEPEND}"
-
-WAF_BINARY="${S}/buildtools/bin/waf-svn"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
- python_need_rebuild
-}
-
-src_configure() {
- waf-utils_src_configure --disable-rpath \
- --disable-rpath-install --bundled-libraries=NONE \
- --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/ldb/modules \
- --builtin-libraries=NONE
-}
-
-src_compile(){
- waf-utils_src_compile
- use doc && doxygen Doxyfile
-}
-
-src_test() {
- WAF_MAKE=1 \
- PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${S}"/bin/shared/private/ \
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${S}"/bin/shared/private/:"${S}"/bin/shared waf test || die
-}
-
-src_install() {
- waf-utils_src_install
- rm "${D}/$(python_get_sitedir)/"_tevent.so
-
- if use doc; then
- dohtml -r apidocs/html/*
- doman apidocs/man/man3/*.3
- fi
-}
-
-pkg_postinst() {
- python_need_rebuild
- if has_version sys-auth/sssd; then
- ewarn "You have sssd installed. It is known to break after ldb upgrades,"
- ewarn "so please try to rebuild it before reporting bugs."
- ewarn "See http://bugs.gentoo.org/404281"
- fi
-}
diff --git a/sys-libs/ldb/ldb-1.1.9.ebuild b/sys-libs/ldb/ldb-1.1.9.ebuild
deleted file mode 100644
index 897d0408d4f1..000000000000
--- a/sys-libs/ldb/ldb-1.1.9.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ldb/ldb-1.1.9.ebuild,v 1.1 2012/08/06 16:00:16 maksbotan Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-
-inherit python waf-utils multilib
-
-DESCRIPTION="An LDAP-like embedded database"
-HOMEPAGE="http://ldb.samba.org"
-SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="dev-libs/popt
- >=sys-libs/talloc-2.0.7[python]
- >=sys-libs/tevent-0.9.16
- >=sys-libs/tdb-1.2.10[python]
- net-nds/openldap
- !!=net-fs/samba-4.0.0[ldb]
- "
-
-DEPEND="dev-libs/libxslt
- doc? ( app-doc/doxygen )
- virtual/pkgconfig
- ${RDEPEND}"
-
-WAF_BINARY="${S}/buildtools/bin/waf"
-
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
- python_need_rebuild
-}
-
-src_configure() {
- waf-utils_src_configure --disable-rpath \
- --disable-rpath-install --bundled-libraries=NONE \
- --with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/ldb/modules \
- --builtin-libraries=NONE
-}
-
-src_compile(){
- waf-utils_src_compile
- use doc && doxygen Doxyfile
-}
-
-src_test() {
- WAF_MAKE=1 \
- PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${S}"/bin/shared/private/ \
- LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${S}"/bin/shared/private/:"${S}"/bin/shared waf test || die
-}
-
-src_install() {
- waf-utils_src_install
-# rm "${D}/$(python_get_sitedir)/"_tevent.so
-
- if use doc; then
- dohtml -r apidocs/html/*
- doman apidocs/man/man3/*.3
- fi
-}
-
-pkg_postinst() {
- python_need_rebuild
- if has_version sys-auth/sssd; then
- ewarn "You have sssd installed. It is known to break after ldb upgrades,"
- ewarn "so please try to rebuild it before reporting bugs."
- ewarn "See http://bugs.gentoo.org/404281"
- fi
-}
diff --git a/virtual/udev/udev-0.ebuild b/virtual/udev/udev-0.ebuild
index d321e8a538cb..b75591b1bc4f 100644
--- a/virtual/udev/udev-0.ebuild
+++ b/virtual/udev/udev-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/virtual/udev/udev-0.ebuild,v 1.5 2012/12/10 05:58:26 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/udev/udev-0.ebuild,v 1.6 2012/12/12 15:32:42 axs Exp $
EAPI=2
@@ -11,11 +11,10 @@ SRC_URI=""
LICENSE=""
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="acl gudev hwdb keymap selinux static-libs"
+IUSE="gudev hwdb keymap selinux static-libs"
DEPEND=""
-RDEPEND="acl? ( || ( =sys-fs/udev-196-r1[acl?,gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?]
+RDEPEND="|| ( >=sys-fs/udev-196-r1[gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?]
>=sys-fs/eudev-1_beta1[gudev?,hwdb?,introspection?,keymap?,selinux?,static-libs?] )"
diff --git a/www-client/chromium/chromium-23.0.1271.97.ebuild b/www-client/chromium/chromium-23.0.1271.97.ebuild
index bc54afb6994f..a631adbb5642 100644
--- a/www-client/chromium/chromium-23.0.1271.97.ebuild
+++ b/www-client/chromium/chromium-23.0.1271.97.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/www-client/chromium/chromium-23.0.1271.97.ebuild,v 1.1 2012/12/12 05:01:53 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-23.0.1271.97.ebuild,v 1.3 2012/12/12 10:47:48 ago Exp $
EAPI="4"
PYTHON_DEPEND="2:2.6"
@@ -18,7 +18,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio selinux tcmalloc"
RDEPEND="app-arch/bzip2
diff --git a/www-client/opera-next/Manifest b/www-client/opera-next/Manifest
index 02355c8a3e2b..2f3dd315e434 100644
--- a/www-client/opera-next/Manifest
+++ b/www-client/opera-next/Manifest
@@ -7,3 +7,6 @@ DIST opera-next-12.12-1662.x86_64.linux.tar.xz 13634232 SHA256 b02a52143f64191a8
DIST opera-next-12.12-1680.i386.freebsd.tar.xz 13518380 SHA256 b1b0137b41ce172c1cd250de66928c06d7177fe5a72840e4dfae25467a24c857 SHA512 3d42a5f600e074b13abb593f8c2f08f4ee738132abb6c5da3a49c67364665cc3e9a14412240525a8b7ce4d7906e5c572bfdda4f64cae9425e29d6291e2d4f3f4 WHIRLPOOL 8d55c9df04c03f623f6c9f257f30ccc76b0e4bc9bd7ea380eeef4387832f7ea20fa9b497736cb75b17473bd7b27bcccfa728f1ae854e85e24211e43c8145ab88
DIST opera-next-12.12-1680.i386.linux.tar.xz 13515808 SHA256 e280a45ace3768669fbcfdb2f9edebe432566c0d450a5f6395f45c260beb120f SHA512 3c7e7e80d66d4d53ac5a0b2046ab71960af16fdd764f296a4cdcace9a2a476dd90624145e1bee8c1cf04f06506a1cf825fd686e79beeafb2d9e0b252899e04b1 WHIRLPOOL b6dad02b8bf006c0b26d42d498616a2fabaa87aae41a2fae513f77a8fc0c26a878c463ab66e16ac8ecfe71a6c02c880a749a89f647b52023e1b505882ae802ad
DIST opera-next-12.12-1680.x86_64.linux.tar.xz 13637788 SHA256 11065db0976a5b9a4bf13aa705a849687ee0f988f1e00e42aa42f87149839af8 SHA512 05f51d14135699229bd3915409a3352d5c1f364f2b5cfa17fedb3b19e2dde3d2e79979b161ca5f821d0e903e1f69bd730fd93f6b1eec8e00e57b1ab5ce016295 WHIRLPOOL ab9d62195c2cb798fe035d29ddf0fe5aaacf6f841afab921bb2dea5c5bbf3d99701063fa2d61fe7debdf3debd155d26a0cc5ffc4e152c1154f61ee7843643a72
+DIST opera-next-12.12-1693.i386.freebsd.tar.xz 13512152 SHA256 b6b8e6f4b782c82e3a8863a7d51858d9be7324d1606b31995a01c520d511efe0 SHA512 688f6d1258eb9f15ca0acb9d4a93319ccd635cc5e45e02b883ab1390ed925d4abe82cbebb0be2bd914ebf7a86c80ddcb0a726916c242f319a6898a59af7ec647 WHIRLPOOL ced50e37af1ca4eba2ce415e3af5d4bf6f4d59c3459ed9363d066a93188801cf543754b1b172a32a71fc722d209e6ff4381f0df20dec08a161c3067cf1e6dc86
+DIST opera-next-12.12-1693.i386.linux.tar.xz 13518836 SHA256 5e5f62e12a44284abd38693492d894f74a05980055af240d84117f613623364d SHA512 496a1946d3c6c5733f3acab1f09c9feaa8eda7a827ccdeba9de2623dc8ba0aa3736126e469100ab90bcc7c1456f90044ca16f251b7f13f72690f19c301112aee WHIRLPOOL 890f3c574183326572caccdb5e7bfe44aef17c949e750419bd49b453f8abbe11614efa777cfb4b38865c24a76bc8560afca658210a6550ffffd164036d270fda
+DIST opera-next-12.12-1693.x86_64.linux.tar.xz 13641216 SHA256 4dac23177189cf2d9b2c10d74204f954a748ad40c49a18b3779a02d9afcb1c32 SHA512 a53f04614fd3cbc3e355b684f4fcdc958744a4dd0cb1fb6e7c75fb4543ebdabcd53deb6b1338767ba8fb7dd3970ab42efc85ccebdb9be52db08ce3e589c272bc WHIRLPOOL 3c41d73a102dfd6e13e101eada964fc5118f0aa88280779bef37b678f6cfda30a49e0b68f34a9bbe78f0d6493244647ca6fba6c99e7264bb2fd266bf5f481321
diff --git a/www-client/opera-next/opera-next-12.12_pre1693.ebuild b/www-client/opera-next/opera-next-12.12_pre1693.ebuild
new file mode 100644
index 000000000000..70d6dcfcefa5
--- /dev/null
+++ b/www-client/opera-next/opera-next-12.12_pre1693.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/opera-next/opera-next-12.12_pre1693.ebuild,v 1.1 2012/12/12 15:05:19 jer Exp $
+
+EAPI=4
+inherit eutils fdo-mime gnome2-utils multilib pax-utils versionator
+
+DESCRIPTION="A fast and secure web browser and Internet suite"
+HOMEPAGE="http://www.opera.com/"
+
+SLOT="0"
+LICENSE="OPERA-12 LGPL-2 LGPL-3"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="elibc_FreeBSD gtk kde +gstreamer multilib"
+
+O_V="$(get_version_component_range 1-2)" # Version, i.e. 11.00
+O_B="$(get_version_component_range 3)" # Build number, i.e. 1156
+
+# == Variables that often change ==
+# All other variables should be accounted for by _pre/_p
+
+O_K="143" # The key to the snapshot URL
+
+O_LINGUAS="
+ af ar az be bg bn cs da de el en-GB es-ES es-LA et fa fi fr fr-CA fy gd he
+ hi hr hu id it ja ka kk ko lt lv me mk ms nb nl nn pa pl pt pt-BR ro ru sk
+ sr sv sw ta te th tl tr uk ur uz vi zh-CN zh-TW zu
+" # Supported linguas
+
+# == End of variables that often change ==
+
+if [[ "pre${O_B/pre/}" = "${O_B}" ]]; then # snapshot: _pre
+ O_D="${O_K}_${O_V}-${O_B/pre}" # directory string
+ O_P="${PN}-${O_V}-${O_B/pre}" # package string
+ O_U="http://snapshot.opera.com/unix/" # base URI
+
+ SRC_URI="
+ amd64? ( ${O_U}${O_D}/${O_P}.x86_64.linux.tar.xz )
+ x86? ( ${O_U}${O_D}/${O_P}.i386.linux.tar.xz )
+ x86-fbsd? ( ${O_U}${O_D}/${O_P}.i386.freebsd.tar.xz )
+ "
+else # release: _p
+ O_D="${O_V/./}" # directory string
+ O_P="${PN}-${O_V}-${O_B/p}" # package string
+ O_U="mirror://opera/" # base URI
+
+ SRC_URI="
+ amd64? ( ${O_U}linux/${O_D}/${O_P}.x86_64.linux.tar.xz )
+ x86? ( ${O_U}linux/${O_D}/${O_P}.i386.linux.tar.xz )
+ x86-fbsd? ( ${O_U}unix/${O_D}/${O_P}.i386.freebsd.tar.xz )
+ "
+fi
+
+for O_LINGUA in ${O_LINGUAS}; do
+ IUSE+=" linguas_${O_LINGUA/-/_}"
+done
+
+DEPEND="
+ >=sys-apps/sed-4
+ app-arch/xz-utils
+"
+GTKRDEPEND="
+ dev-libs/atk
+ dev-libs/glib:2
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf
+ gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+ x11-libs/pango
+ x11-libs/pixman
+"
+KDERDEPEND="
+ kde-base/kdelibs
+ x11-libs/qt-core:4
+ x11-libs/qt-gui:4
+"
+GSTRDEPEND="
+ dev-libs/glib:2
+ dev-libs/libxml2
+ media-libs/gst-plugins-base:0.10
+ media-libs/gstreamer:0.10
+ media-plugins/gst-plugins-meta:0.10
+"
+RDEPEND="
+ media-libs/fontconfig
+ media-libs/freetype
+ sys-apps/util-linux
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXrender
+ x11-libs/libXt
+ gtk? ( ${GTKRDEPEND} )
+ kde? ( ${KDERDEPEND} )
+ gstreamer? ( ${GSTRDEPEND} )
+"
+src_unpack() {
+ unpack ${A}
+ mv -v ${PN}* "${S}" || die
+}
+
+src_prepare() {
+ export OPREFIX="/usr/$(get_libdir)"
+ export QA_PREBUILT="${OPREFIX}/${PN}/.*"
+ export QA_PRESTRIPPED="${OPREFIX}/${PN}/.*"
+
+ local LNGDIR="share/${PN}/locale"
+
+ # Count linguas
+ count() { echo ${#}; }
+ local lingua_count=$(count ${O_LINGUAS} en)
+ local locale_count=$(count ${LNGDIR}/*)
+ [[ ${lingua_count} = ${locale_count} ]] \
+ || die "Number of LINGUAS does not match number of locales"
+ unset count
+
+ # Remove unwanted linguas
+ for LINGUA in ${O_LINGUAS}; do
+ if ! use linguas_${LINGUA/-/_}; then
+ LINGUA=$(find "${LNGDIR}" -maxdepth 1 -type d -iname ${LINGUA/_/-})
+ rm -r "${LINGUA}" || die "The list of linguas needs to be fixed"
+ fi
+ done
+
+ # Remove doc directory but keep the LICENSE under another name (bug #315473)
+ mv share/doc/${PN}/LICENSE share/${PN}/defaults/license.txt
+ rm -rf share/doc
+ for locale in share/${PN}/locale/*; do
+ rm -f "${locale}/license.txt"
+ ln -sn /usr/share/${PN}/defaults/license.txt "${locale}/license.txt" \
+ || die
+ done
+
+ # Remove package directory
+ rm -rf share/${PN}/package
+
+ # Optional libraries
+ if ! use gtk; then
+ rm lib/${PN}/liboperagtk2.so || die
+ rm lib/${PN}/liboperagtk3.so || die
+ fi
+ if ! use kde; then
+ rm lib/${PN}/liboperakde4.so || die
+ fi
+ if ! use gstreamer; then
+ rm -r lib/${PN}/gstreamer || die
+ fi
+ if use amd64 && ! use multilib; then
+ rm lib/${PN}/pluginwrapper/operapluginwrapper-ia32-linux || die
+ fi
+
+ # Unzip the man pages before sedding
+ gunzip share/man/man1/* || die
+
+ local OPERA_SUFFIX= OPERA__SUFFIX= OPERAU_SUFFIX=
+ if [[ ${PN} = opera-next ]]; then
+ OPERA_SUFFIX="-next"
+ OPERA__SUFFIX=" Next"
+ OPERA_USUFFIX="-NEXT"
+ fi
+
+ # Replace PREFIX, SUFFIX and PN in various files
+ sed -i \
+ -e "s:@@{PREFIX}:/usr:g" \
+ -e "s:@@{SUFFIX}:${OPERA_SUFFIX}:g" \
+ -e "s:@@{_SUFFIX}:${OPERA__SUFFIX}:g" \
+ -e "s:@@{USUFFIX}:${OPERA_USUFFIX}:g" \
+ share/man/man1/* \
+ share/mime/packages/* \
+ share/applications/${PN}-*.desktop \
+ || die
+
+ # Create /usr/bin/opera wrapper
+ echo '#!/bin/sh' > ${PN}
+ echo 'export OPERA_DIR="/usr/share/'"${PN}"'"' >> ${PN}
+ echo 'export OPERA_PERSONALDIR=${OPERA_PERSONALDIR:-"${HOME}/.'${PN}'"}' \
+ >> ${PN}
+ echo 'exec '"${OPREFIX}/${PN}/${PN}"' "$@"' >> ${PN}
+
+ # Change libz.so.3 to libz.so.1 for gentoo/freebsd
+ if use elibc_FreeBSD; then
+ scanelf -qR -N libz.so.3 -F "#N" lib/${PN}/ | \
+ while read i; do
+ if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]];
+ then
+ export SANITY_CHECK_LIBZ_FAILED=1
+ break
+ fi
+ sed -i \
+ "$i" \
+ -e 's/libz\.so\.3/libz.so.1/g'
+ done
+ [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die
+ fi
+}
+
+src_install() {
+ # We install into usr instead of opt as Opera does not support the latter
+ dodir /usr
+ mv lib/ "${D}/${OPREFIX}" || die
+ mv share/ "${D}/usr/" || die
+
+ # Install startup scripts
+ dobin ${PN}
+
+ # Stop revdep-rebuild from checking opera binaries
+ dodir /etc/revdep-rebuild
+ echo "SEARCH_DIRS_MASK=\"${OPREFIX}/${PN}\"" \
+ > "${D}"/etc/revdep-rebuild/90${PN}
+
+ # Set PaX markings for hardened/PaX (bug #344267)
+ pax-mark m $( list-paxables $( find "${D}"/${OPREFIX}/${PN}/ ) )
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ if use elibc_FreeBSD; then
+ elog
+ elog "To improve shared memory usage please set:"
+ elog "$ sysctl kern.ipc.shm_allow_removed=1"
+ fi
+
+ # Update desktop file database and gtk icon cache (bug #334993)
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ # Update desktop file database and gtk icon cache (bug #334993)
+ gnome2_icon_cache_update
+ fdo-mime_desktop_database_update
+}
diff --git a/www-plugins/adobe-flash/Manifest b/www-plugins/adobe-flash/Manifest
index c40717c6eef3..63f88a916a0f 100644
--- a/www-plugins/adobe-flash/Manifest
+++ b/www-plugins/adobe-flash/Manifest
@@ -1,3 +1,5 @@
-DIST adobe-flash-10.3.183.43.i386.tar.gz 5460239 SHA256 b6d01187b6e3090cf2e88820c2ca220ebf8ce14e9febed2259d3ac9a963178cf SHA512 7bc243da636226c8773703a6fe994105bc5072ee2f832feda4285c9b22c2c0a5684f7eb26b22e855f5be6112d11b9cd876cce13186c526b1cd66b9cade4485d4 WHIRLPOOL 8e49d1f9619ba3fcf68c097ccb8e8ec7308b6bea14efa164cb90e17ca7621d9bf87b2d12351dbed343861ae2bbbf825edc28cf2d0100cb6d60b530655849b0f9
+DIST adobe-flash-10.3.183.48.i386.tar.gz 5461025 SHA256 c030cb7e6c364acfc12246e20f68fd4c5616dcaf5e2ca34f9ba76bd1ab890b57 SHA512 da0f9e27c6a30ddcd9b178f798ca6f5813ec13a87b78b243d90ea9485aa27227b9d6e85d233e111569d1f76d9ca459c290e4a17c63c1fc2169c809cc8bb9f09e WHIRLPOOL 33c8daf75f640dee3cab27a47de469ff371489c4e81df2fed0aeb9594867dbda9b2e10a71f4bcb742c1d00b875a40949cfe3a1ab16f7a28aba5d01d9413a0afa
DIST adobe-flash-11.2.202.251.i386.tar.gz 6917347 SHA256 a3362986fe9cba5628c1b1684707de79f63947623b631c2a42eeea15b420f05a SHA512 3f714b397537401ba92d10a76f7185b02896c3d3064653c6aaaf095450c738139280f412dea07650cb219001d443ea102cf3785d11256812f6cb2174ec23ff7a WHIRLPOOL 7b44e7ec191eae349603c9af703b448a4e122aec8e162d3219ec72b1e60143aeca69e5eb23b8e5d4194e64eb389f76ad3814bc140d67f1fd189b8720af2fd6cd
DIST adobe-flash-11.2.202.251.x86_64.tar.gz 7228964 SHA256 e267678d480e1f934da738f0e14512bf3adb96425b925c690e62d3882ebe7c5a SHA512 458df3c314bec1dc7cb2af111a7e409b05cbccedb8f98cd8178993f77e55403c54cfc240458cc8916cc34a96c4c782c2a62d8898fc1723ce8475eb71b142f10b WHIRLPOOL 65e081cb8fc03e674646f657ae3b793ee91ca4bfd6a8733abd10509c827615c7635573aa93b47955794c55b202e00ea0c156fe5fbf4552a53a7e0193a1e24bfe
+DIST adobe-flash-11.2.202.258.i386.tar.gz 6917577 SHA256 6c9a0414b1d7be2b8675267e3b699747a75fa85a663a6ecdaeb72cedf4a6b3cc SHA512 cd8317bdd61333026af1d352285cc1597c2af9e86b1c8b3d575094debe08c24a313ac7dbadc52b81bdc4b5971db742cd4c97bd1032cbbc97ba1b7b00aec75135 WHIRLPOOL 5945d625ea95694ee690bf144c3f8fdef4f20605c935e6883bb222e77cdc9c0bf4e55dcf138128bb59de31eb8ff747360fda16cc373d19c1d5618f91d3e2d4f2
+DIST adobe-flash-11.2.202.258.x86_64.tar.gz 7228746 SHA256 142253638f6c8b021f3c5d811c43881d1f5af104bb563c10fff4b4d856f02dbd SHA512 6462f8bfda34f6bc5890b6f2c445eb7af7d7ad394375de64b99636f710bfc497f3bf0e6869ad053c12ff2584e21e4fb05ebd3aa108407d8ab7231c1bf76b5745 WHIRLPOOL 0040497b46fe94a05819693e837fb71e754798765166208c0af73a4cec991613e8bc1efe702b611ededde1e43a4bb0979b6b133a4bb5c0f2d14f14500808f54e
diff --git a/www-plugins/adobe-flash/adobe-flash-10.3.183.43.ebuild b/www-plugins/adobe-flash/adobe-flash-10.3.183.48.ebuild
similarity index 98%
rename from www-plugins/adobe-flash/adobe-flash-10.3.183.43.ebuild
rename to www-plugins/adobe-flash/adobe-flash-10.3.183.48.ebuild
index 61ed49dff269..89e1b8d10c75 100644
--- a/www-plugins/adobe-flash/adobe-flash-10.3.183.43.ebuild
+++ b/www-plugins/adobe-flash/adobe-flash-10.3.183.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/www-plugins/adobe-flash/adobe-flash-10.3.183.43.ebuild,v 1.1 2012/11/06 21:38:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-10.3.183.48.ebuild,v 1.1 2012/12/12 15:45:22 jer Exp $
EAPI=4
inherit nsplugins multilib toolchain-funcs versionator
diff --git a/www-plugins/adobe-flash/adobe-flash-11.2.202.258.ebuild b/www-plugins/adobe-flash/adobe-flash-11.2.202.258.ebuild
new file mode 100644
index 000000000000..0f2abdb0f424
--- /dev/null
+++ b/www-plugins/adobe-flash/adobe-flash-11.2.202.258.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/adobe-flash/adobe-flash-11.2.202.258.ebuild,v 1.2 2012/12/12 16:02:31 pinkbyte Exp $
+
+EAPI=4
+inherit nsplugins multilib toolchain-funcs versionator
+
+AF_URI="http://fpdownload.macromedia.com/get/flashplayer/pdc"
+MY_32B_URI="${AF_URI}/${PV}/install_flash_player_$(get_major_version)_linux.i386.tar.gz -> ${P}.i386.tar.gz"
+MY_64B_URI="${AF_URI}/${PV}/install_flash_player_$(get_major_version)_linux.x86_64.tar.gz -> ${P}.x86_64.tar.gz"
+
+DESCRIPTION="Adobe Flash Player"
+SRC_URI="x86? ( ${MY_32B_URI} )
+amd64? (
+ multilib? (
+ 32bit? ( ${MY_32B_URI} )
+ 64bit? ( ${MY_64B_URI} )
+ )
+ !multilib? ( ${MY_64B_URI} )
+)"
+HOMEPAGE="http://www.adobe.com/products/flashplayer.html"
+IUSE="multilib -32bit +64bit vdpau kde +sse2check"
+SLOT="0"
+
+KEYWORDS="-* amd64 ~x86"
+LICENSE="AdobeFlash-10.3"
+RESTRICT="strip mirror"
+
+S="${WORKDIR}"
+
+NATIVE_DEPS="x11-libs/gtk+:2
+ media-libs/fontconfig
+ dev-libs/nss
+ net-misc/curl
+ vdpau? ( x11-libs/libvdpau )
+ kde? ( kde-base/kcmshell )
+ >=sys-libs/glibc-2.4"
+
+EMUL_DEPS="vdpau? ( >=app-emulation/emul-linux-x86-xlibs-20110129 )
+ >=app-emulation/emul-linux-x86-gtklibs-20100409-r1
+ app-emulation/emul-linux-x86-soundlibs"
+
+DEPEND="amd64? ( multilib? ( !64bit? ( www-plugins/nspluginwrapper ) ) )"
+RDEPEND="x86? ( $NATIVE_DEPS )
+ amd64? (
+ multilib? (
+ 64bit? ( $NATIVE_DEPS )
+ 32bit? ( $EMUL_DEPS )
+ )
+ !multilib? ( $NATIVE_DEPS )
+ )
+ || ( media-fonts/liberation-fonts media-fonts/corefonts )
+ ${DEPEND}"
+
+# Where should this all go? (Bug #328639)
+INSTALL_BASE="opt/Adobe/flash-player"
+
+# Ignore QA warnings in these closed-source binaries, since we can't fix them:
+QA_PREBUILT="opt/*"
+
+any_cpu_missing_flag() {
+ local value=$1
+ grep '^flags' /proc/cpuinfo | grep -qv "$value"
+}
+
+pkg_pretend() {
+ if any_cpu_missing_flag 'sse2'; then
+ eerror "This version of adobe-flash requires a CPU that supports the"
+ eerror "SSE2 instruction set, and at least one of your CPUs does not"
+ eerror "support this feature."
+ eerror ""
+ if use sse2check; then
+ eerror "You should mask this version and use adobe-flash-10.3.* instead."
+ eerror "To do so, add the following line to your package.mask file:"
+ eerror " =${CATEGORY}/${P}"
+ eerror ""
+ eerror "Or if you are trying to build a binary package for another host"
+ eerror "that does support SSE2 instructions, you may override this"
+ eerror "check by setting USE=\"-sse2check\""
+ eerror ""
+ die "${P} requires CPU with SSE2"
+ else
+ eerror "Continuing anyway due to USE=\"-sse2check\", but be aware that flash"
+ eerror "will not function unless all of the CPUs on the system where it"
+ eerror "is installed support the SSE2 instruction set."
+ fi
+ fi
+}
+
+pkg_setup() {
+ if use x86; then
+ export native_install=1
+ elif use amd64; then
+ # amd64 users may unselect the native 64bit binary, if they choose
+ # TODO: In future revisions, remove this ability now that 64-bit
+ # binaries are officially released and working.
+ if ! use multilib || use 64bit; then
+ export native_install=1
+ else
+ unset native_install
+ fi
+
+ if use multilib && use 32bit; then
+ export amd64_32bit=1
+ else
+ unset amd64_32bit
+ fi
+
+ if use multilib && ! use 32bit && ! use 64bit; then
+ eerror "You must select at least one architecture USE flag (32bit or 64bit)"
+ die "No library version selected [-32bit -64bit]"
+ fi
+
+ unset need_lahf_wrapper
+ if [[ $native_install ]]; then
+ # 64bit flash requires the 'lahf' instruction (bug #268336)
+ if any_cpu_missing_flag 'lahf_lm'; then
+ export need_lahf_wrapper=1
+ fi
+ fi
+ fi
+}
+
+src_unpack() {
+ if [[ $amd64_32bit ]]; then
+ # Since the 32-bit and 64-bit packages collide, put the 32-bit one
+ # elsewhere:
+ local my_32b_src=${MY_32B_URI##*>}
+ local my_64b_src=${MY_64B_URI##*>}
+ if [[ $native_install ]]; then
+ unpack $my_64b_src
+ fi
+ mkdir 32bit
+ pushd 32bit >/dev/null
+ unpack $my_32b_src
+ popd >/dev/null
+ else
+ default_src_unpack
+ fi
+}
+
+src_compile() {
+ if [[ $need_lahf_wrapper ]]; then
+ # This experimental wrapper, from Maks Verver via bug #268336 should
+ # emulate the missing lahf instruction affected platforms.
+ $(tc-getCC) -fPIC -shared -nostdlib -lc -oflashplugin-lahf-fix.so \
+ "${FILESDIR}/flashplugin-lahf-fix.c" \
+ || die "Compile of flashplugin-lahf-fix.so failed"
+ fi
+}
+
+src_install() {
+ if [[ $native_install ]]; then
+ if use x86; then
+ local PKGLIB=lib
+ else
+ local PKGLIB=lib64
+ fi
+ local BASE=${INSTALL_BASE}
+
+ # The plugin itself
+ exeinto /${BASE}/flash-plugin
+ doexe libflashplayer.so
+ inst_plugin /${BASE}/flash-plugin/libflashplayer.so
+
+ # The optional KDE4 KCM plugin
+ if use kde; then
+ exeinto /${BASE}/kde4
+ doexe usr/${PKGLIB}/kde4/kcm_adobe_flash_player.so
+ dosym /${BASE}/kde4/kcm_adobe_flash_player.so \
+ /usr/$(get_libdir)/kde4/kcm_adobe_flash_player.so
+ insinto /usr/share/kde4/services
+ doins usr/share/kde4/services/kcm_adobe_flash_player.desktop
+ else
+ # No KDE applet, so allow the GTK utility to show up in KDE:
+ sed -i usr/share/applications/flash-player-properties.desktop \
+ -e "/^NotShowIn=KDE;/d" || die "sed of .desktop file failed"
+ fi
+
+ # The userland 'flash-player-properties' standalone app:
+ exeinto /${BASE}/bin
+ doexe usr/bin/flash-player-properties
+ dosym /${BASE}/bin/flash-player-properties \
+ usr/bin/flash-player-properties
+
+ # Icon and .desktop for 'flash-player-properties'
+ for icon in $(find usr/share/icons/ -name '*.png'); do
+ insinto /$(dirname $icon)
+ doins $icon
+ done
+ dosym ../icons/hicolor/48x48/apps/flash-player-properties.png \
+ usr/share/pixmaps/flash-player-properties.png
+ insinto usr/share/applications
+ sed -i usr/share/applications/flash-player-properties.desktop \
+ -e "s:^Exec=:Exec=/${BASE}/bin/:" || die "sed of .desktop file failed"
+ doins usr/share/applications/flash-player-properties.desktop
+ fi
+
+ if [[ $need_lahf_wrapper ]]; then
+ # This experimental wrapper, from Maks Verver via bug #268336 should
+ # emulate the missing lahf instruction affected platforms.
+ exeinto /${INSTALL_BASE}
+ doexe flashplugin-lahf-fix.so
+ inst_plugin /${INSTALL_BASE}/flashplugin-lahf-fix.so
+ fi
+
+ if [[ $amd64_32bit ]]; then
+ # Only install the plugin, nothing else for 32-bit.
+ local oldabi="${ABI}"
+ ABI="x86"
+
+ # 32b plugin
+ pushd "${S}/32bit"
+ exeinto /${INSTALL_BASE}32
+ doexe libflashplayer.so
+ inst_plugin /${INSTALL_BASE}32/libflashplayer.so
+ popd
+
+ ABI="${oldabi}"
+ fi
+
+ # The magic config file!
+ insinto "/etc/adobe"
+ doins "${FILESDIR}/mms.cfg"
+}
+
+pkg_postinst() {
+ if use amd64; then
+ if [[ $need_lahf_wrapper ]]; then
+ ewarn "Your processor does not support the 'lahf' instruction which is used"
+ ewarn "by Adobe's 64-bit flash binary. We have installed a wrapper which"
+ ewarn "should allow this plugin to run. If you encounter problems, please"
+ ewarn "adjust your USE flags to install only the 32-bit version and reinstall:"
+ ewarn " ${CATEGORY}/$PN[+32bit -64bit]"
+ elog
+ fi
+ if has_version 'www-plugins/nspluginwrapper'; then
+ if [[ $native_install ]]; then
+ # TODO: Perhaps parse the output of 'nspluginwrapper -l'
+ # However, the 64b flash plugin makes
+ # 'nspluginwrapper -l' segfault.
+ local FLASH_WRAPPER="${ROOT}/usr/lib64/nsbrowser/plugins/npwrapper.libflashplayer.so"
+ if [[ -f ${FLASH_WRAPPER} ]]; then
+ einfo "Removing duplicate 32-bit plugin wrapper: Native 64-bit plugin installed"
+ nspluginwrapper -r "${FLASH_WRAPPER}"
+ fi
+ else
+ einfo "nspluginwrapper detected: Installing plugin wrapper"
+ local oldabi="${ABI}"
+ ABI="x86"
+ local FLASH_SOURCE="${ROOT}/${INSTALL_BASE}32/libflashplayer.so"
+ nspluginwrapper -i "${FLASH_SOURCE}"
+ ABI="${oldabi}"
+ fi
+ elif [[ ! $native_install ]]; then
+ elog "To use the 32-bit flash player in a native 64-bit browser,"
+ elog "you must install www-plugins/nspluginwrapper"
+ fi
+ fi
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index a3cb5bb1e32b..92685c7ec300 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,3 +1,4 @@
DIST apache-tomcat-6.0.36-src.tar.gz 3411736 SHA256 8da5b897ff28f688a5c7fe5abaa95e0ae0de9562283cec3c2643faaa13a6932c SHA512 6646c54c6e2ce440b07401b0560617204cf6e8d65885120165cb38a9cabe8f3dc61d07330e5b03be1ad480bb131f2d63aef86e367d180df96e053200587384b3 WHIRLPOOL 5e168a6cd3389cb98d0a01a2bd23f4fb49eaa82af134175c21eca3975c1ca1a6003db023d8bc069f95d4ba43dd053e28e03ff626a5b09da74dc2ba365b8c9821
DIST apache-tomcat-7.0.32-src.tar.gz 4236930 SHA256 ab4a752a9f833340dc3ceea85edff84a4b0cd697cf6fb2a5348a14096b348dcb SHA512 ac6141713f05437834617df4113aad629e61d3d28e603f63d8ccd50f9a463c4bc0679cd853dc332660396bc84c9a437ec323767edba20cb4ed0650510d653577 WHIRLPOOL 9182666e580368e54d864271c407a8c2d21e024f156d33f823bbde0b9382a78e89dcecae01d691725c5a09e2a66cff590f8f3e75d427c26caf0526e3b1946ca6
DIST apache-tomcat-7.0.33-src.tar.gz 4240455 SHA256 f665b4b39471b6f7ddd10845058a76308694a8be24b7651971de86a34ca66243 SHA512 c0daaa785ac90c78fa52db576a9cbe67ab51d52fcc2f2155ccab188489e9c81cd9a6dc4302ec0a43b1628fad85245f382dc39adb62e8f8c1a65cde0439e1e62f WHIRLPOOL db7ddd69e8227c37278e5f2f95a365ddf0ad4d7d27dd697352fdc9e6138a9d0b3192ada7ffc5e9079ef6493e1a999c1cc979ba192219878b45003f0042138f3a
+DIST apache-tomcat-7.0.34-src.tar.gz 4245974 SHA256 c05b85928ff870244a061700166ee781e66bad68f4a7867ba22c48beeec19fc0 SHA512 288dfb93e3999b336e06411012d11be94cfc799602bf226f6b61343928bf1b1f746cf92042ac1917be35a059a9bd32e1521b47facd7596b4515387a5d9a9d3c6 WHIRLPOOL 8f9e912179f452478466ed09f63731462eb83e6b3e3f46a5125ac6336b24579d297e65b00c1fa286d1d2afd446238b052d4935df3a7409ecc7e4c3497e7ed1d3
diff --git a/www-servers/tomcat/files/tomcat-7.0.34-build.xml.patch b/www-servers/tomcat/files/tomcat-7.0.34-build.xml.patch
new file mode 100644
index 000000000000..9b07137451aa
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-7.0.34-build.xml.patch
@@ -0,0 +1,105 @@
+diff --git a/build.xml b/build.xml
+index 3ff8f81..83357a4 100644
+--- a/build.xml
++++ b/build.xml
+@@ -613,7 +614,8 @@
+ filesId="files.annotations-api"
+ manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+
+-
++
++ JSP 2.2 Implementation JAR File
+
+
+-
++ JSP 2.2 EL Implementation JAR File
+
++-->
+
+
+
+
++
+
+
+
+@@ -918,9 +922,11 @@
+
+
+
++
+
+
+
+@@ -1355,7 +1361,8 @@
+
+
++ description="Prepare to build web services extras package"
++ unless="noget">
+
+
+
+@@ -2278,7 +2285,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+
+
+
++ description="Download (and build) components necessary to compile"
++ unless="noget">
+
+
+
+@@ -2335,7 +2343,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+
+
+
++ description="Download additional components for the tests"
++ unless="noget">
+
+
+
+@@ -2346,7 +2355,8 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+
+
+
++ description="Download additional components for a distribution"
++ unless="noget">
+
+
+
diff --git a/www-servers/tomcat/tomcat-7.0.34.ebuild b/www-servers/tomcat/tomcat-7.0.34.ebuild
new file mode 100644
index 000000000000..28d786b548d0
--- /dev/null
+++ b/www-servers/tomcat/tomcat-7.0.34.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.34.ebuild,v 1.1 2012/12/12 11:18:07 fordfrog Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.0/JSP-2.2 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="7"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.2"
+SAPI_SLOT="3.0"
+
+COMMON_DEP="
+ dev-java/eclipse-ecj:${ECJ_SLOT}
+ ~dev-java/tomcat-servlet-api-${PV}
+ extra-webapps? ( dev-java/jakarta-jstl:0 )"
+RDEPEND="${COMMON_DEP}
+ !=virtual/jre-1.6"
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.6
+ >=dev-java/ant-core-1.8.1:0
+ test? (
+ dev-java/ant-junit:0
+ dev-java/junit:4
+ )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ java-pkg-2_pkg_setup
+ enewgroup tomcat 265
+ enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+ find -name '*.jar' -exec rm -v {} + || die
+ epatch "${FILESDIR}/${P}-build.xml.patch"
+
+ # For use of catalina.sh in netbeans
+ sed -i -e "/^# ----- Execute The Requested Command/ a\
+ CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+ bin/catalina.sh || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+src_compile() {
+ EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+ java-pkg-2_src_compile
+}
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ local dest="/usr/share/${PN}-${SLOT}"
+
+ java-pkg_jarinto "${dest}"/bin
+ java-pkg_dojar output/build/bin/*.jar
+ exeinto "${dest}"/bin
+ doexe output/build/bin/*.sh
+
+ java-pkg_jarinto "${dest}"/lib
+ java-pkg_dojar output/build/lib/*.jar
+
+ # so we don't have to call java-config with --with-dependencies, which might
+ # bring in more jars then actually desired.
+ java-pkg_addcp "$(java-pkg_getjars eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})"
+
+ dodoc RELEASE-NOTES RUNNING.txt
+ use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+ use source && java-pkg_dosrc java/*
+
+ ### Webapps ###
+
+ insinto "${dest}"/webapps
+ doins -r output/build/webapps/{host-manager,manager,ROOT}
+ use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+ ### Config ###
+
+ # replace the default pw with a random one, see #92281
+ local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
+ sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+ insinto "${dest}"
+ doins -r output/build/conf
+
+ ### rc ###
+
+ cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager.bash} "${T}" || die
+ eprefixify "${T}"/tomcat{.conf,.init,-instance-manager.bash}
+ sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,.init,-instance-manager.bash} || die
+
+ insinto "${dest}"/gentoo
+ doins "${T}"/tomcat.conf
+ exeinto "${dest}"/gentoo
+ doexe "${T}"/tomcat{.init,-instance-manager.bash}
+}
+
+pkg_postinst() {
+ elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+ elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+ elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+ elog "To manage Tomcat instances, run:"
+ elog " ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+ ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+ ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+# einfo "Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/www-servers/uwsgi/Manifest b/www-servers/uwsgi/Manifest
index 37c83d8a8700..70433fd6a29b 100644
--- a/www-servers/uwsgi/Manifest
+++ b/www-servers/uwsgi/Manifest
@@ -1,6 +1,6 @@
DIST uwsgi-1.0.2.1.tar.gz 465250 SHA256 78280b57a970db7842e4481f8b00f13d011f27b340c869dc1ad28d564d716439 SHA512 de7761b24ae92aea62b4b5d4523d1b812dd5c25c09551baf7007a0e1a97461c62033762cb02e90a9bd85f2aef78477c5151c5a359c8b878150a0c926e3a759ee WHIRLPOOL 47ca0115d55a09b99006fff9c6fb6b5daa71b0b4ea64bbc65390ff64c05f62a661a17b1ec172e05f78f75dd9a36efad3d9dacb57c980639038be6f718480d7b6
DIST uwsgi-1.2.5.tar.gz 515481 SHA256 e208a90f335725589361ac7f7e548ddf7a906dbe6bd50e83b1c5fc9884976ee4 SHA512 85bc94a80c235f2a35f0d8c7118eac8d98ea142f6ad584addbe4ffca011e61e158454202d69b9accda3319e3237d9c38b45c647c248b0ef2f2e75dc76256848a WHIRLPOOL e05edf639b22586be4dc6d7320b4fb75e448cbd57a0fd846ab0e2a1b6d19f400c72c0b40f64753b32cfe8fd35cb008ef38e8dff4423f004c047d5af08e143806
DIST uwsgi-1.2.6.tar.gz 515869 SHA256 49d2fbedbd42b3c95a684f7ddf43302f881297f3614c7edd0af4a4c44e2032a5 SHA512 79297cc3d348e6fbbd1d7da5fb4d03844cc14ce36411ce55d6951e8f0c50614d87c3038de6986589362e9e84543aec9754a871c52002065d5f17a27a7ad32f01 WHIRLPOOL cdd74205572f0fce1390f3335e4f3cd6413d3cd5be9fb91a259a38c7330fe6b53057985e3ed6b8a67f6fba5339609506be4fbf2ae10251518406d6b02c831f09
-DIST uwsgi-1.3.tar.gz 560035 SHA256 506d4e482e3a808ea0f83015ba9bfcebc5428fd4aee48aeb3ff193032f587eb2 SHA512 fdc05f1625ba0586736c74e9147c1396b832fa12a444a3589585aaa946f4f590155658db668ce448db41a95167caaf99993b9390955849f04c30e812cbcb2a53 WHIRLPOOL a36073c705157b7da995e88a42464f32f5c29c691981d5470dc13807ed8be2ff63def1ec1d2b60c2afed00f45c6d93dfd902844e4edaea168fb84e9cfd8893ac
DIST uwsgi-1.4.1.tar.gz 585500 SHA256 a72e3b57e9d46d6b92df9d445aa9bf243a9529f0c3660fecb5fb1d21d2f1791e SHA512 cf9866e1e40c4f69f1a5a5df76e20ae97a379a05cac08ebbbe7ca245228fac1fcb61c0b8b1c426b8b726c6f305bbfc55339b70821dd62120362d01b2b67a8522 WHIRLPOOL 381ff98cf1ef24773b57e489519d2434fda6913da56a9a4e6373a9a084cea2f5065baeecebed38eeb42df4805d646ca915add8a8ac036955372ab540b99ccf56
DIST uwsgi-1.4.2.tar.gz 585946 SHA256 51d23d4e55a9a63b92f006e493151f3443e200ab46e6095ac52510cdcbd8a5e6 SHA512 0daebbdec5540e174c04e4442de73657c98afdcec3a1329c46fd160ebb0336ed085e30418ca55119a60267da64d2bdfae8dbf049c16cdc567c89bd2834c70587 WHIRLPOOL 4edc07eb65c5cfd745a376c1c3bbcb5bb84171a45a3e811eae0c25295c1b9bb38a7e010ad36ef751764c873612f945a649a429c6f815893a695afaf9f1eb9e35
+DIST uwsgi-1.4.3.tar.gz 586760 SHA256 b591b5f8c974d3b508047033dcc2822c84daa5b776c90b14bf5c6dd46c0b5ace SHA512 454494f845e8b2d5f4b9d2e40dcd14291517ee8715fdea8df2992437ad49df926820d0fee2bc5f5cfffe0349e950d9fbe5e0a9a3eed4d28e766039db871a9e96 WHIRLPOOL f22676e29135960ff4d9c00119da5a9181a0adbe751bb4206fa48ebe38b3786649c6ffc9bb5a412a4f7dff39efb1d4cc0310d4a7034f0274c0e35c273f03f09b
diff --git a/www-servers/uwsgi/uwsgi-1.3-r1.ebuild b/www-servers/uwsgi/uwsgi-1.3-r1.ebuild
deleted file mode 100644
index c8a51c6417b5..000000000000
--- a/www-servers/uwsgi/uwsgi-1.3-r1.ebuild
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.3-r1.ebuild,v 1.1 2012/10/29 21:59:47 ultrabug Exp $
-
-EAPI="4"
-PYTHON_DEPEND="python? *"
-PYTHON_MODNAME="uwsgidecorators"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-USE_RUBY="ruby18 ree18 ruby19"
-RUBY_OPTIONAL="yes"
-PHP_EXT_NAME="dummy"
-PHP_EXT_INI="no"
-USE_PHP="php5-3 php5-4" # deps must be registered separately below
-PHP_EXT_OPTIONAL_USE="php"
-
-MY_P="${P/_/-}"
-
-inherit apache-module eutils python multilib pax-utils php-ext-source-r2 ruby-ng
-
-DESCRIPTION="uWSGI server for Python web applications"
-HOMEPAGE="http://projects.unbit.it/uwsgi/"
-SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios pam perl +pcre php +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq"
-REQUIRED_USE="|| ( cgi erlang lua perl php python ruby )"
-
-# util-linux is required for libuuid when requesting zeromq support
-CDEPEND="caps? ( sys-libs/libcap )
- json? ( dev-libs/jansson )
- erlang? ( dev-lang/erlang )
- gevent? ( >=dev-python/gevent-1.0_beta2 )
- graylog2? ( sys-libs/zlib )
- ldap? ( net-nds/openldap )
- lua? ( dev-lang/lua )
- pcre? ( dev-libs/libpcre )
- perl? ( dev-lang/perl )
- php? (
- php_targets_php5-3? ( dev-lang/php:5.3[embed] )
- php_targets_php5-4? ( dev-lang/php:5.4[embed] )
- )
- ruby? ( $(ruby_implementations_depend) )
- sqlite? ( dev-db/sqlite:3 )
- rsyslog? ( app-admin/rsyslog )
- xml? ( dev-libs/libxml2 )
- yaml? ( dev-libs/libyaml )
- zeromq? ( net-libs/zeromq sys-apps/util-linux )"
-DEPEND="${CDEPEND}
- virtual/pkgconfig"
-RDEPEND="${CDEPEND}
- rrdtool? ( net-analyzer/rrdtool )"
-
-S="${WORKDIR}/${MY_P}"
-APXS2_S="${S}/apache2"
-APACHE2_MOD_CONF="42_mod_uwsgi-r1 42_mod_uwsgi"
-
-want_apache2_2
-
-use_true_false() {
- if use $1 ; then
- echo "true"
- else
- echo "false"
- fi
-}
-
-src_unpack() {
- default
-}
-
-pkg_setup() {
- depend.apache_pkg_setup
- python_pkg_setup
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}/1.1.2-threaded-php.patch" \
- "${FILESDIR}/1.2.3-pyerl.patch"
-
- sed -i \
- -e "s|'-O2', ||" \
- -e "s|'-Werror', ||" \
- -e "s|uc.get('plugin_dir')|uc.get('plugin_build_dir')|" \
- uwsgiconfig.py || die "sed failed"
-
- sed -i \
- -e 's|python\([0-9].[0-9]\)-config|python-config-\1|' \
- plugins/python/uwsgiplugin.py || die "sed failed"
-
- sed -i \
- -e "s|/lib|/$(get_libdir)|" \
- plugins/php/uwsgiplugin.py || die "sed failed"
-}
-
-src_configure() {
- local plugins=""
- use carbon && plugins+=", carbon"
- use graylog2 && plugins+=", graylog2"
- use nagios && plugins+=", nagios"
- use pam && plugins+=", pam"
- use rrdtool && plugins+=", rrdtool"
- use rsyslog && plugins+=", rsyslog"
- use syslog && plugins+=", syslog"
-
- cat > "buildconf/gentoo.ini" << EOF
-[uwsgi]
-xml = $(use_true_false xml)
-ini = true
-yaml = $(use_true_false yaml)
-json = $(use_true_false json)
-sqlite3 = $(use_true_false sqlite)
-zeromq = $(use_true_false zeromq)
-snmp = true
-sctp = false
-spooler = true
-embedded = true
-ssl = auto
-udp = true
-multicast = true
-threading = true
-sendfile = true
-minterpreters = true
-async = true
-evdis = false
-ldap = $(use_true_false ldap)
-pcre = $(use_true_false pcre)
-routing = auto
-alarm = auto
-debug = $(use_true_false debug)
-unbit = false
-xml_implementation = libxml2
-yaml_implementation = libyaml
-malloc_implementation = libc
-plugins =
-bin_name = uwsgi
-append_version =
-plugin_dir = /usr/$(get_libdir)/uwsgi
-plugin_build_dir = ${T}/plugins
-embedded_plugins = ping, cache, rpc, corerouter, fastrouter, http, ugreen, signal, logsocket, router_uwsgi, router_redirect, router_basicauth, zergpool, redislog, router_rewrite, router_http, mongodblog ${plugins}
-as_shared_library = false
-
-locking = auto
-event = auto
-timer = auto
-filemonitor = auto
-
-embed_files =
-
-embed_config =
-[python]
-paste = true
-web3 = true
-EOF
- use caps || sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
- use zeromq || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
-}
-
-each_ruby_compile() {
- cd "${WORKDIR}/${MY_P}"
-
- UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/rack gentoo rack_${RUBY##*/} || die "building plugin for ${RUBY} failed"
-
- if [[ "${RUBY}" == *ruby19 ]] ; then
- UWSGICONFIG_RUBYPATH="${RUBY}" python uwsgiconfig.py --plugin plugins/fiber gentoo || die "building fiber plugin for ${RUBY} failed"
- fi
-}
-
-install_python_lib() {
- insinto $(python_get_sitedir)
- doins uwsgidecorators.py
-}
-
-src_compile() {
- python uwsgiconfig.py --build gentoo || die "building uwsgi failed"
-
- mkdir -p "${T}/plugins"
-
- if use erlang ; then
- python uwsgiconfig.py --plugin plugins/erlang gentoo || die "building plugin for erlang failed"
- fi
-
- if use lua ; then
- python uwsgiconfig.py --plugin plugins/lua gentoo || die "building plugin for lua failed"
- fi
-
- if use perl ; then
- python uwsgiconfig.py --plugin plugins/psgi gentoo || die "building plugin for perl failed"
- fi
-
- if use php ; then
- for s in $(php_get_slots); do
- UWSGICONFIG_PHPDIR="/usr/$(get_libdir)/${s}" python uwsgiconfig.py --plugin plugins/php gentoo ${s/.} || die "building plugin for ${s} failed"
- done
- fi
-
- if use python ; then
- for a in ${PYTHON_ABIS} ; do
- python${a} uwsgiconfig.py --plugin plugins/python gentoo python${a/.} || die "building plugin for python-${a} failed"
-
- if use gevent ; then
- python${a} uwsgiconfig.py --plugin plugins/gevent gentoo gevent${a/.} || die "building plugin for gevent-support in python-${a} failed"
- fi
- if use erlang ; then
- python${a} uwsgiconfig.py --plugin plugins/pyerl gentoo pyerl${a/.} || die "building plugin for erlang-support in python failed"
- fi
- done
- fi
-
- if use ruby ; then
- ruby-ng_src_compile
- fi
-
- if use spooler ; then
- python uwsgiconfig.py --plugin plugins/spooler gentoo || die "building plugin for spooler failed"
- fi
-
- if use cgi ; then
- python uwsgiconfig.py --plugin plugins/cgi gentoo || die "building plugin for cgi failed"
- fi
-
- if use apache2 ; then
- for m in proxy_uwsgi Ruwsgi uwsgi ; do
- APXS2_ARGS="-c mod_${m}.c"
- apache-module_src_compile
- done
- fi
-}
-
-src_install() {
- dobin uwsgi
- pax-mark m "${D}"/usr/bin/uwsgi
-
- insinto /usr/$(get_libdir)/uwsgi
- doins "${T}/plugins"/*.so
-
- use cgi && dosym uwsgi /usr/bin/uwsgi_cgi
- use erlang && dosym uwsgi /usr/bin/uwsgi_erlang
- use lua && dosym uwsgi /usr/bin/uwsgi_lua
- use perl && dosym uwsgi /usr/bin/uwsgi_psgi
-
- if use php ; then
- for s in $(php_get_slots); do
- dosym uwsgi /usr/bin/uwsgi_${s/.}
- done
- fi
-
- if use python ; then
- python_execute_function install_python_lib
- for a in ${PYTHON_ABIS} ; do
- dosym uwsgi /usr/bin/uwsgi_python${a/.}
- done
- fi
-
- if use apache2; then
- for m in proxy_uwsgi Ruwsgi uwsgi ; do
- APACHE2_MOD_FILE="${APXS2_S}/.libs/mod_${m}.so"
- apache-module_src_install
- done
- fi
-
- newinitd "${FILESDIR}"/uwsgi.initd-r1 uwsgi
- newconfd "${FILESDIR}"/uwsgi.confd-r1 uwsgi
- keepdir /etc/"${PN}".d
- use spooler && keepdir /var/spool/"${PN}"
-}
-
-pkg_postinst() {
- if use apache2 ; then
- elog "Three Apache modules have been installed: mod_proxy_uwsgi, mod_uwsgi and mod_Ruwsgi."
- elog "You can enable them with -D PROXY_UWSGI, -DUWSGI or -DRUWSGI in /etc/conf.d/apache2."
- elog "mod_uwsgi and mod_Ruwsgi have the same configuration interface and define the same symbols."
- elog "Therefore you can enable only one of them at a time."
- elog "mod_uwsgi is commercially supported by Unbit and stable but a bit hacky."
- elog "mod_Ruwsgi is newer and more Apache-API friendly but not commercially supported."
- elog "mod_proxy_uwsgi is the newest and not considered ready for production yet."
- fi
-
- elog "Append the following options to the uwsgi call to load the respective language plugin:"
- use cgi && elog " '--plugins cgi' for cgi"
- use erlang && elog " '--plugins erlang' for erlang"
- use lua && elog " '--plugins lua' for lua"
- use perl && elog " '--plugins psgi' for perl"
-
- if use php ; then
- for s in $(php_get_slots); do
- elog " '--plugins ${s/.}' for ${s}"
- done
- fi
-
- if use python ; then
- for a in ${PYTHON_ABIS} ; do
- elog " '--plugins python${a/.}' for python-${a}"
- use gevent && elog " '--plugins python${a/.},gevent${a/.}' for gevent support in python-${a}"
- use erlang && elog " '--plugins python${a/.},erlang,pyerl${a/.}' for erlang support in python-${a}"
- done
- fi
-
- if use ruby ; then
- for ruby in $USE_RUBY; do
- use ruby_targets_${ruby} && elog " '--plugins rack_${ruby/.}' for ${ruby}"
- if [[ "${ruby}" == *ruby19 ]] ; then
- elog " '--plugins fibre' for ruby-1.9 fibres"
- fi
- done
- fi
-}
diff --git a/www-servers/uwsgi/uwsgi-1.4.1-r1.ebuild b/www-servers/uwsgi/uwsgi-1.4.3.ebuild
similarity index 92%
rename from www-servers/uwsgi/uwsgi-1.4.1-r1.ebuild
rename to www-servers/uwsgi/uwsgi-1.4.3.ebuild
index 0f1a99ad205b..032914eccabc 100644
--- a/www-servers/uwsgi/uwsgi-1.4.1-r1.ebuild
+++ b/www-servers/uwsgi/uwsgi-1.4.3.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/www-servers/uwsgi/uwsgi-1.4.1-r1.ebuild,v 1.1 2012/11/21 10:27:20 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/uwsgi/uwsgi-1.4.3.ebuild,v 1.1 2012/12/12 09:48:32 ultrabug Exp $
-EAPI="4"
+EAPI="5"
PYTHON_DEPEND="python? *"
PYTHON_MODNAME="uwsgidecorators"
SUPPORT_PYTHON_ABIS="1"
@@ -16,7 +16,7 @@ PHP_EXT_OPTIONAL_USE="php"
MY_P="${P/_/-}"
-inherit apache-module eutils python multilib pax-utils php-ext-source-r2 ruby-ng
+inherit apache-module eutils python multilib pax-utils php-ext-source-r2 ruby-ng versionator
DESCRIPTION="uWSGI server for Python web applications"
HOMEPAGE="http://projects.unbit.it/uwsgi/"
@@ -25,7 +25,7 @@ SRC_URI="http://projects.unbit.it/downloads/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios pam perl +pcre php +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq"
+IUSE="apache2 +caps +carbon cgi debug erlang gevent graylog2 json ldap lua +nagios pam perl +pcre php probepg +python rrdtool rsyslog ruby spooler sqlite syslog +xml yaml zeromq"
REQUIRED_USE="|| ( cgi erlang lua perl php python ruby )"
# util-linux is required for libuuid when requesting zeromq support
@@ -42,6 +42,7 @@ CDEPEND="caps? ( sys-libs/libcap )
php_targets_php5-3? ( dev-lang/php:5.3[embed] )
php_targets_php5-4? ( dev-lang/php:5.4[embed] )
)
+ probepg? ( dev-db/postgresql-base:= )
ruby? ( $(ruby_implementations_depend) )
sqlite? ( dev-db/sqlite:3 )
rsyslog? ( app-admin/rsyslog )
@@ -161,6 +162,14 @@ web3 = true
EOF
use caps || sed -i -e 's|sys/capability.h|DISABLED|' uwsgiconfig.py || die "sed failed"
use zeromq || sed -i -e 's|uuid/uuid.h|DISABLED|' uwsgiconfig.py || die "sed failed"
+
+ if use probepg ; then
+ PGPV="$(best_version dev-db/postgresql-base)"
+ PGSLOT="$(get_version_component_range 1-2 ${PGPV##dev-db/postgresql-base-})"
+ sed -i \
+ -e "s|pg_config|pg_config${PGSLOT/.}|" \
+ plugins/probepg/uwsgiplugin.py || die "sed failed"
+ fi
}
each_ruby_compile() {
@@ -228,6 +237,10 @@ src_compile() {
python uwsgiconfig.py --plugin plugins/cgi gentoo || die "building plugin for cgi failed"
fi
+ if use probepg ; then
+ python uwsgiconfig.py --plugin plugins/probepg gentoo || die "building plugin for postgresql probe failed"
+ fi
+
if use apache2 ; then
for m in proxy_uwsgi Ruwsgi uwsgi ; do
APXS2_ARGS="-c mod_${m}.c"
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index a2c6e02e494d..1f43e8ad4467 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -1,2 +1,3 @@
DIST i3-4.2.tar.bz2 758109 SHA256 e02c832820e8922a44e744e555294f8580c2f8e218c5c1029e52f1bde048732b SHA512 21ef5c6b9e3249195c983ad14ab545c18622b17926e96f14850792d688598683b80a22d7e5b770126e34b265699de5e87a88d1f9b26ab2bd7762bad46d5447f2 WHIRLPOOL 0b7d9e4301d035d2406351b87e8eecc1e2b1df14b45b46bea5086ea260b31c0fa85f3e47e20e55797dc6ce70aa0232e4d17e2d1da4d7fe3dc842eea186f6cde5
DIST i3-4.3.tar.bz2 852253 SHA256 895bf586092535efb2bc723ba599c71a027768115e56052f111fc8bb148db925 SHA512 e9efa5b938ccb34e6841503012114f4eb9cfd7e80c7faf9ba626af0ff8e9ea7639d7806a3d1c1620613fc195529bdeaf05cb48e8f2ea4284876599a9ce5662c5 WHIRLPOOL 60b5c4e068b3af8116525a52ef01ab638345c14e01ad0e8b5f5a9bcba60b81e8b243985978ad368862ca0b60cd10b46abdaa11875675fb2232367bf4e841c144
+DIST i3-4.4.tar.bz2 884182 SHA256 99875749eab6d6f5a3058f3325532cd223a9fa22771a54c2fd06c0ded97f481b SHA512 33b31d2409db3decb72a54f2d98ed3ae6fb8cdbaa838fb5e042698e901664dfb2e316237e9875eb60dff324aea44e196191e4608aa217736d933e543f991c84f WHIRLPOOL 89afd3eb6e6934de5d07192541cd5e26d2a6402bf903d63f349b45e8f109ad916244289178b2a70e152bb20ad4199c8e74ff9d8f70e9965bee66803ac559d50a
diff --git a/x11-wm/i3/i3-4.4.ebuild b/x11-wm/i3/i3-4.4.ebuild
new file mode 100644
index 000000000000..cdf1cfa4a0f5
--- /dev/null
+++ b/x11-wm/i3/i3-4.4.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/i3/i3-4.4.ebuild,v 1.1 2012/12/12 07:00:23 xarthisius Exp $
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="An improved dynamic tiling window manager"
+HOMEPAGE="http://i3wm.org/"
+SRC_URI="http://i3wm.org/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+pango"
+
+CDEPEND="dev-libs/libev
+ dev-libs/libpcre
+ dev-libs/yajl
+ x11-libs/libxcb
+ x11-libs/libXcursor
+ x11-libs/libX11
+ x11-libs/startup-notification
+ x11-libs/xcb-util
+ pango? (
+ >=x11-libs/pango-1.30.0[X]
+ >=x11-libs/cairo-1.12.2[X,xcb]
+ )"
+DEPEND="${CDEPEND}
+ virtual/pkgconfig
+ sys-devel/flex
+ sys-devel/bison"
+#docs? ( perl-core/Pod-Simple
+# app-text/xmlto
+# app-text/asciidoc
+#)
+RDEPEND="${CDEPEND}
+ x11-apps/xmessage"
+
+DOCS=( RELEASE-NOTES-${PV} )
+
+src_prepare() {
+ if ! use pango; then
+ sed -i common.mk -e '/PANGO/d' || die
+ fi
+
+ cat <<- EOF > "${T}"/i3wm
+ #!/bin/sh
+ exec /usr/bin/i3
+ EOF
+}
+
+src_compile() {
+ emake V=1 CC="$(tc-getCC)"
+}
+
+src_install() {
+ default
+ dohtml -r docs/*
+ doman man/*.1
+ exeinto /etc/X11/Sessions
+ doexe "${T}"/i3wm
+}
+
+pkg_postinst() {
+ einfo "There are several packages that you may find useful with ${PN} and"
+ einfo "their usage is suggested by the upstream maintainers, namely:"
+ einfo " x11-misc/dmenu"
+ einfo " x11-misc/i3status"
+ einfo " x11-misc/i3lock"
+ einfo "Please refer to their description for additional info."
+}