diff --git a/app-admin/analog/analog-6.0-r4.ebuild b/app-admin/analog/analog-6.0-r4.ebuild
index b23ce0ef7d57..75567e07d727 100644
--- a/app-admin/analog/analog-6.0-r4.ebuild
+++ b/app-admin/analog/analog-6.0-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0-r4.ebuild,v 1.9 2011/07/15 15:25:21 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/analog/analog-6.0-r4.ebuild,v 1.10 2012/03/04 10:27:52 pacho Exp $
EAPI=4
@@ -24,6 +24,8 @@ src_prepare() {
cd src/
epatch "${FILESDIR}/${PN}-5.1-gentoo.diff"
epatch "${FILESDIR}/${P}-bzip2.patch"
+ epatch "${FILESDIR}/${P}-undefined-macro.patch"
+
sed -i Makefile \
-e 's| -o | $(LDFLAGS)&|g' \
|| die "sed Makefile"
@@ -33,11 +35,11 @@ src_compile() {
tc-export CC
# emake in main dir just executes "cd src && make",
# i.e. MAKEOPTS are ignored
- emake -C src || die "make failed"
+ emake -C src
}
src_install() {
- dobin analog || die "dobin failed"
+ dobin analog
newman analog.man analog.1
dodoc README.txt Licence.txt analog.cfg
diff --git a/app-admin/analog/files/analog-6.0-undefined-macro.patch b/app-admin/analog/files/analog-6.0-undefined-macro.patch
new file mode 100644
index 000000000000..5a98541c465c
--- /dev/null
+++ b/app-admin/analog/files/analog-6.0-undefined-macro.patch
@@ -0,0 +1,38 @@
+--- a/src/unzip/ioapi.h 2004-12-19 14:51:32.000000000 +0100
++++ b/src/unzip/ioapi.h 2012-01-11 18:07:59.570768250 +0100
+@@ -35,6 +35,16 @@
+ extern "C" {
+ #endif
+
++/* Work-around for NetBSD. Its zconf.h doesn't define OF(x) */
++#ifndef OF
++#ifdef __STDC__
++#define OF(x) x
++#else
++#define OF(x) ()
++#endif
++#endif
++
++
+ typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
+ typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+ typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+--- a/src/unzip/unzip.h 2004-12-19 14:51:32.000000000 +0100
++++ b/src/unzip/unzip.h 2012-01-11 18:00:25.988120225 +0100
+@@ -47,6 +47,15 @@
+ extern "C" {
+ #endif
+
++/* Work-around for NetBSD. Its zconf.h doesn't define OF(x) */
++#ifndef OF
++#ifdef __STDC__
++#define OF(x) x
++#else
++#define OF(x) ()
++#endif
++#endif
++
+ #ifndef _ZLIB_H
+ #include "../zlib/zlib.h"
+ #endif
+
diff --git a/app-admin/puppet/puppet-2.7.11.ebuild b/app-admin/puppet/puppet-2.7.11.ebuild
index 744d9cc75d8f..83e9500c71a2 100644
--- a/app-admin/puppet/puppet-2.7.11.ebuild
+++ b/app-admin/puppet/puppet-2.7.11.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-admin/puppet/puppet-2.7.11.ebuild,v 1.5 2012/03/03 12:54:24 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.11.ebuild,v 1.6 2012/03/03 20:26:00 armin76 Exp $
EAPI="4"
# ruby19: dev-ruby/ruby-ldap has no ruby19
@@ -18,7 +18,7 @@ HOMEPAGE="http://puppetlabs.com/"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
-KEYWORDS="amd64 hppa ppc ~sparc x86"
+KEYWORDS="amd64 hppa ppc sparc x86"
ruby_add_rdepend "
>=dev-ruby/facter-1.5.6
diff --git a/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch b/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch
new file mode 100644
index 000000000000..20051f51594d
--- /dev/null
+++ b/app-admin/python-updater/files/python-updater-0.10-only-alias-sed-if-exists.patch
@@ -0,0 +1,23 @@
+Only alias sed to /usr/lib/portage/bin/ebuild-helpers/sed if the
+latter exists (which should be the case on prefix portages, but not on
+normal ones). Fixes fallout from bug #370935 on non-prefix portages.
+
+--- python-updater
++++ python-updater
+@@ -488,8 +488,15 @@
+ shift
+ done
+
++# On a prefix portage we need to use sed from ebuild-helpers/ instead
++# of $PATH. On non-prefix portages ebuild-helpers/sed does not exist.
++# Prepending ebuild-helpers/ to $PATH uses too many tools from there.
++# So alias sed to ebuild-helpers/sed if it exists:
+ if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]]; then
+- alias sed="$(/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed"
++ sed="$(/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/sed"
++ if [[ -x "${sed}" ]]; then
++ alias sed="${sed}"
++ fi
+ fi
+
+ if has_version "=dev-lang/python-2*"; then
diff --git a/app-admin/python-updater/python-updater-0.10-r2.ebuild b/app-admin/python-updater/python-updater-0.10-r2.ebuild
new file mode 100644
index 000000000000..399327d91b4a
--- /dev/null
+++ b/app-admin/python-updater/python-updater-0.10-r2.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/app-admin/python-updater/python-updater-0.10-r2.ebuild,v 1.1 2012/03/03 18:05:31 marienz Exp $
+
+inherit eutils
+
+if [[ "${PV}" == "9999" ]]; then
+ inherit subversion
+fi
+
+DESCRIPTION="Script used to reinstall Python packages after changing of active Python versions"
+HOMEPAGE="http://www.gentoo.org/proj/en/Python/"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+ ESVN_REPO_URI="https://gentoo-progress.googlecode.com/svn/projects/python-updater/trunk"
+else
+ SRC_URI="http://people.apache.org/~Arfrever/gentoo/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="$([[ "${PV}" == "9999" ]] && echo "sys-apps/help2man")"
+RDEPEND="dev-lang/python
+ || ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-expand-aliases.patch
+ epatch "${FILESDIR}"/${P}-only-alias-sed-if-exists.patch
+}
+
+src_compile() {
+ if [[ "${PV}" == "9999" ]]; then
+ emake ${PN}.1 || die "Generation of man page failed"
+ fi
+}
+
+src_install() {
+ dosbin ${PN} || die "dosbin failed"
+ doman ${PN}.1 || die "doman failed"
+ dodoc AUTHORS || die "dodoc failed"
+}
diff --git a/app-admin/tenshi/files/tenshi-openrc-init-r1.patch b/app-admin/tenshi/files/tenshi-openrc-init-r1.patch
new file mode 100644
index 000000000000..be300d25f7ea
--- /dev/null
+++ b/app-admin/tenshi/files/tenshi-openrc-init-r1.patch
@@ -0,0 +1,11 @@
+--- a/tenshi.gentoo-init
++++ b/tenshi.gentoo-init
+@@ -1,6 +1,7 @@
+ #!/sbin/runscript
+
+-opts="depend start stop reload flush checkconfig"
++extra_commands="checkconfig"
++extra_started_commands="reload flush"
+
+ depend() {
+ need clock hostname logger
diff --git a/app-admin/tenshi/tenshi-0.12.ebuild b/app-admin/tenshi/tenshi-0.12.ebuild
index 32c01fcad621..7d062e736c67 100644
--- a/app-admin/tenshi/tenshi-0.12.ebuild
+++ b/app-admin/tenshi/tenshi-0.12.ebuild
@@ -1,9 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.12.ebuild,v 1.3 2012/02/05 13:45:57 ranger Exp $
-
-EAPI="3"
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tenshi/tenshi-0.12.ebuild,v 1.4 2012/03/04 10:33:08 pacho Exp $
+EAPI=4
inherit eutils
DESCRIPTION="Log parsing and notification program"
@@ -26,8 +25,8 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-create-mandir.patch"
- # Fix for bug #218042
- epatch "${FILESDIR}/${PN}-openrc-init.patch"
+ epatch "${FILESDIR}/${PN}-openrc-init.patch" #218042
+ epatch "${FILESDIR}/${PN}-openrc-init-r1.patch" #398987
# Fix for bug #241254
sed -i 's:^docdir =.*:docdir = /usr/share/doc/${PF}:' \
@@ -35,7 +34,7 @@ src_prepare() {
}
src_install() {
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" install
fowners tenshi:root /etc/tenshi/tenshi.conf
dodir /var/lib/tenshi
fowners tenshi:root /var/lib/tenshi
diff --git a/app-backup/duplicity/duplicity-0.6.17.ebuild b/app-backup/duplicity/duplicity-0.6.17.ebuild
index cfa4e0281c75..1c87fd7fd0e9 100644
--- a/app-backup/duplicity/duplicity-0.6.17.ebuild
+++ b/app-backup/duplicity/duplicity-0.6.17.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.17.ebuild,v 1.4 2012/02/01 22:29:17 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.17.ebuild,v 1.5 2012/03/04 10:51:16 jlec Exp $
EAPI="4"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit distutils
diff --git a/app-backup/duplicity/duplicity-0.6.18.ebuild b/app-backup/duplicity/duplicity-0.6.18.ebuild
index 41ca665c1d3e..ef5679a21dda 100644
--- a/app-backup/duplicity/duplicity-0.6.18.ebuild
+++ b/app-backup/duplicity/duplicity-0.6.18.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.18.ebuild,v 1.1 2012/03/01 22:57:04 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/duplicity/duplicity-0.6.18.ebuild,v 1.2 2012/03/04 10:51:17 jlec Exp $
EAPI="4"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit distutils
diff --git a/app-editors/ted/files/ted-2.21-make.patch b/app-editors/ted/files/ted-2.21-make.patch
new file mode 100644
index 000000000000..2916c9505556
--- /dev/null
+++ b/app-editors/ted/files/ted-2.21-make.patch
@@ -0,0 +1,12 @@
+diff -ur Ted-2.21.orig//Makefile Ted-2.21/Makefile
+--- Ted-2.21.orig//Makefile 2009-10-16 23:20:58.000000000 +0800
++++ Ted-2.21/Makefile 2011-10-04 00:22:30.615975269 +0800
+@@ -198,7 +198,7 @@
+ : To install Ted, you can now run 'make install' AS ROOT
+
+ package.shared: tedPackage/makefile compile.shared
+- cd tedPackage && make package.shared
++ cd tedPackage && $(MAKE) package.shared
+ :
+ : Dynamically linked package ready.
+ : To install Ted, you can now run 'make install' AS ROOT
diff --git a/app-editors/ted/ted-2.21.ebuild b/app-editors/ted/ted-2.21.ebuild
index 6ffdc44f9623..e53626bbb1ef 100644
--- a/app-editors/ted/ted-2.21.ebuild
+++ b/app-editors/ted/ted-2.21.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.21.ebuild,v 1.9 2011/10/23 16:07:42 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/ted/ted-2.21.ebuild,v 1.10 2012/03/03 19:18:38 pacho Exp $
EAPI=4
inherit eutils toolchain-funcs
@@ -26,6 +26,7 @@ S=${WORKDIR}/Ted-${PV}
src_prepare() {
epatch "${FILESDIR}"/${P}-libpng15.patch
+ epatch "${FILESDIR}"/${P}-make.patch
sed -i -e 's|/Ted/|/share/Ted/|' \
"${S}"/appFrame/appFrameConfig.h.in \
@@ -54,4 +55,5 @@ src_install() {
dodir /usr/share
mv "${ED}"usr/Ted "${ED}"usr/share/Ted
+ dosym /usr/share/Ted/rtf2pdf.sh /usr/bin/rtf2pdf.sh
}
diff --git a/app-emulation/qemu-user/qemu-user-1.0.ebuild b/app-emulation/qemu-user/qemu-user-1.0.ebuild
index 9d3a219064a1..f8f2f87f86a4 100644
--- a/app-emulation/qemu-user/qemu-user-1.0.ebuild
+++ b/app-emulation/qemu-user/qemu-user-1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-1.0.ebuild,v 1.1 2012/02/28 13:55:53 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-user/qemu-user-1.0.ebuild,v 1.2 2012/03/04 05:02:22 mr_bones_ Exp $
EAPI=4
@@ -27,7 +27,6 @@ for target in ${IUSE_USER_TARGETS}; do
IUSE="${IUSE} +qemu_user_targets_${target}"
done
-
DEPEND="app-text/texi2html
dev-util/pkgconfig
sys-libs/zlib[static-libs]
diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
index cbcf8239c8b0..09e521e11feb 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -1,2 +1 @@
-DIST vlock-2.2.2.tar.gz 54732 RMD160 503bb2736dca073e83b216606e2d73ad7dc50fe5 SHA1 646513181d0028d345f6c0bc53a09e0000ac2afe SHA256 ea875250cad150872583b6ed2436470bc5e9c3a580d85554e31a2d5ae1d92fad
DIST vlock-2.2.3.tar.gz 54860 RMD160 36f03d28477dc6e7c7d9ba7f0ee7685edf38f49b SHA1 c2ad6bd34463aefec0d9cb7551c072e1e72ed497 SHA256 85aa5aed1ae49351378a0bd527a013078f0f969372a63164b1944174ae1a5e39
diff --git a/app-misc/vlock/vlock-2.2.2-r2.ebuild b/app-misc/vlock/vlock-2.2.2-r2.ebuild
deleted file mode 100644
index 0ab88d62f438..000000000000
--- a/app-misc/vlock/vlock-2.2.2-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/vlock/vlock-2.2.2-r2.ebuild,v 1.10 2011/01/05 16:54:09 jlec Exp $
-
-inherit eutils pam toolchain-funcs multilib
-
-DESCRIPTION="A console screen locker"
-HOMEPAGE="http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html"
-SRC_URI="http://cthulhu.c3d2.de/~toidinamai/vlock/archive/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="pam test"
-
-RDEPEND="pam? ( sys-libs/pam )"
-DEPEND="${RDEPEND}
- test? ( dev-util/cunit )"
-
-pkg_setup() {
- enewgroup vlock
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch \
- "${FILESDIR}/${P}-asneeded.patch" \
- "${FILESDIR}/${P}-test_process.patch"
-}
-
-src_compile() {
- if use pam; then
- myconf="--enable-pam"
- else
- myconf="--enable-shadow"
- fi
- # this package has handmade configure system which fails with econf...
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --libdir=/usr/$(get_libdir) \
- ${myconf} \
- CC="$(tc-getCC)" \
- LD="$(tc-getLD)" \
- CFLAGS="${CFLAGS} -pedantic -std=gnu99" \
- LDFLAGS="${LDFLAGS}" || die "configure failed"
- emake || die "emake failed"
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- use pam && pamd_mimic_system vlock auth
- dodoc ChangeLog PLUGINS README README.X11 SECURITY STYLE TODO || die
-}
diff --git a/app-office/libreoffice/libreoffice-3.5.0.3.ebuild b/app-office/libreoffice/libreoffice-3.5.0.3.ebuild
index d5d69dd69339..0dacd36de0f5 100644
--- a/app-office/libreoffice/libreoffice-3.5.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.0.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-office/libreoffice/libreoffice-3.5.0.3.ebuild,v 1.9 2012/02/29 15:21:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.0.3.ebuild,v 1.10 2012/03/04 05:02:57 mr_bones_ Exp $
EAPI=4
@@ -495,7 +495,7 @@ pkg_postinst() {
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- if ! use cups ; then
+ if ! use cups ; then
ewarn 'You will need net-print/cups to be able to print with libreoffice.'
fi
}
diff --git a/app-portage/autounmask/Manifest b/app-portage/autounmask/Manifest
deleted file mode 100644
index c1fa8db0885d..000000000000
--- a/app-portage/autounmask/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST autounmask-0.27.tar.gz 4062 RMD160 910ab0a692ad88d192050c7445ee8446135ab8c8 SHA1 a144b759a3015a7e19134c2e23dce91f8d9cf4e7 SHA256 44cac25ac4546099901e58289eb73e2a9990c1f454a8dec14c972c2df13bb277
diff --git a/app-portage/autounmask/autounmask-0.27.ebuild b/app-portage/autounmask/autounmask-0.27.ebuild
deleted file mode 100644
index f8ba31807639..000000000000
--- a/app-portage/autounmask/autounmask-0.27.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/autounmask/autounmask-0.27.ebuild,v 1.10 2011/01/18 22:21:45 xarthisius Exp $
-
-DESCRIPTION="autounmask - Unmasking packages the easy way"
-HOMEPAGE="http://download.mpsna.de/opensource/autounmask/"
-SRC_URI="http://download.mpsna.de/opensource/autounmask/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="dev-lang/perl
- >=dev-perl/PortageXS-0.02.09
- virtual/perl-Term-ANSIColor
- dev-perl/Shell-EnvImporter"
-RDEPEND="${DEPEND}
- sys-apps/portage"
-
-src_install() {
- dobin autounmask || die
- dodoc Changelog
-}
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 0cc3b59c189e..465f4bdb3670 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,3 +1,3 @@
DIST eix-0.23.10.tar.xz 438336 RMD160 a12710983fd33e04350fe519b99c9b62fe647e15 SHA1 d96c06bfe1f6a9a796813841fb7b30876a069d92 SHA256 6525b65de08dc3c5946f008b57c8027e5725d2bbc0bf5b980afda65ea207b356
DIST eix-0.23.3.tar.xz 443364 RMD160 ad7b6842ceeaa4d93bdf7fa6fcdc85f773b54970 SHA1 55d9a6ef2ebf07ba4293b9b2b78443658c47b12f SHA256 c9525a4f8605250469600667e364e2d9325d7964b3476653bb8908f28cccb828
-DIST eix-0.23.9.tar.xz 437468 RMD160 ed6e7009368e3149f6769ffe6638f9d8a6de9986 SHA1 a078726469837d681c8f9ce3e421336a082d1b1c SHA256 194bcaf7315a96b21990d2b51f13651e11c20a7e9814134bcfa31a88a7f087f5
+DIST eix-0.24.0.tar.xz 430532 RMD160 293918654907c068dd50d69c02c6efa0a10a3bea SHA1 f7ed5e7a51435d13d180311145fa865091f7844b SHA256 13526c5ce547cf3df1de40df632dacf2c60b84f3e69735ba76ae489fe9b1a24a
diff --git a/app-portage/eix/eix-0.23.9.ebuild b/app-portage/eix/eix-0.24.0.ebuild
similarity index 93%
rename from app-portage/eix/eix-0.23.9.ebuild
rename to app-portage/eix/eix-0.24.0.ebuild
index a34e60ceaffb..7035d8ae5796 100644
--- a/app-portage/eix/eix-0.23.9.ebuild
+++ b/app-portage/eix/eix-0.24.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-portage/eix/eix-0.23.9.ebuild,v 1.1 2012/01/28 16:23:04 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/eix/eix-0.24.0.ebuild,v 1.1 2012/03/04 04:40:33 darkside Exp $
EAPI=4
diff --git a/app-portage/etc-proposals/metadata.xml b/app-portage/etc-proposals/metadata.xml
index 411d6550e013..39d9baaf7e8d 100644
--- a/app-portage/etc-proposals/metadata.xml
+++ b/app-portage/etc-proposals/metadata.xml
@@ -1,7 +1,9 @@
-
- maintainer-needed@gentoo.org
-
+ tools-portage
+
+ dolsen@gentoo.org
+ Brian Dolbec
+
diff --git a/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch b/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch
new file mode 100644
index 000000000000..aa011a174b17
--- /dev/null
+++ b/app-portage/porthole/files/porthole-0.6.1-missing-attribute.patch
@@ -0,0 +1,14 @@
+diff -uNr porthole/db/user_configs.py.old porthole/db/user_configs.py
+
+--- porthole/db/user_configs.py.old 2010-11-27 13:34:35.000000000 +0600
++++ porthole/db/user_configs.py 2010-11-27 13:31:24.000000000 +0600
+@@ -364,7 +364,7 @@
+ debug.dprint("USER_CONFIGS: set_user_config(): add: " +
+ "%s,\n remove: %s " %(str(add),str(remove)))
+ set_config.set_user_config(filename=file, name=name, ebuild=ebuild,
+- comment=comment, username=privileges.USER,
++ comment=comment, username=privileges.user,
+ add=add, remove=remove)
+ self.set_config_callback()
+ else:
+
\ No newline at end of file
diff --git a/app-portage/porthole/metadata.xml b/app-portage/porthole/metadata.xml
index 25fe3545327f..d340f2fdbace 100644
--- a/app-portage/porthole/metadata.xml
+++ b/app-portage/porthole/metadata.xml
@@ -3,7 +3,7 @@
tools-portage
- brian.dolbec@gmail.com
+ dolsen@gentoo.org
Brian Dolbec
Upstream Maintainer (please CC on bugs)
diff --git a/app-portage/porthole/porthole-0.6.1-r3.ebuild b/app-portage/porthole/porthole-0.6.1-r3.ebuild
new file mode 100644
index 000000000000..06246e8df21a
--- /dev/null
+++ b/app-portage/porthole/porthole-0.6.1-r3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/porthole/porthole-0.6.1-r3.ebuild,v 1.1 2012/03/04 04:12:36 dolsen Exp $
+
+EAPI="2"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+PYTHON_USE_WITH="xml threads"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+
+inherit distutils eutils
+
+DESCRIPTION="A GTK+-based frontend to Portage"
+HOMEPAGE="http://porthole.sourceforge.net"
+SRC_URI="mirror://sourceforge/porthole/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="nls"
+LANGS="de pl ru vi it fr tr"
+for X in $LANGS; do IUSE="${IUSE} linguas_${X}"; done
+
+RDEPEND=">=sys-apps/portage-2.1
+ dev-python/pygtk:2
+ gnome-base/libglade:2.0
+ dev-python/pygtksourceview:2
+ nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+ nls? ( >=sys-devel/gettext-0.14 )"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-masking_status.patch" # bug 307037
+ epatch "${FILESDIR}/${P}-missing_import.patch" # bug 323179
+ epatch "${FILESDIR}/${P}-missing-attribute.patch" #bug 323179
+}
+
+src_compile(){
+ # Compile localizations if necessary
+ if use nls ; then
+ cd scripts
+ ./pocompile.sh -emerge ${LINGUAS} || die "pocompile failed"
+ fi
+}
+
+src_install() {
+ distutils_src_install
+
+ dodoc TODO README NEWS AUTHORS
+
+ keepdir /var/log/porthole
+ fperms g+w /var/log/porthole
+ keepdir /var/db/porthole
+ fperms g+w /var/db/porthole
+
+ # nls
+ if use nls; then
+ # mo directory doesn't exists with nls enabled and unsupported LINGUAS
+ [[ -d porthole/i18n/mo ]] && domo porthole/i18n/mo/*
+ fi
+}
+
+pkg_preinst() {
+ chgrp portage "${D}"/var/log/porthole
+ chgrp portage "${D}"/var/db/porthole
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Porthole has updated the way that the upgrades are sent to emerge."
+ einfo "In this new way the user needs to set any 'Settings' menu emerge options"
+ einfo "Porthole automatically adds '--oneshot' for all upgrades selections"
+ einfo "Other options recommended are '--noreplace' along with '--update'"
+ einfo "They allow for portage to skip any packages that might have already"
+ einfo "been upgraded as a dependency of another previously upgraded package"
+ einfo
+}
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 89546bbd1952..167b82a67412 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,3 +1,2 @@
-DIST dos2unix-5.2.1.tar.gz 52877 RMD160 0bcce6e16dd94fa85a6cbcb44dc72d5c30db062a SHA1 79e1dbb3753e029d2a5b0d65f3f512d09cbc6f79 SHA256 a0f39f8e7a4f45b55b96c70e452d1c4ae5afbd872a867b7c097cf91bc7e82199
DIST dos2unix-5.3.1.tar.gz 54967 RMD160 2d97a1e57adcc6f2a2d237615f5963a4d4725fcf SHA1 df924653efb1f97f90c1017cb99d66b5e07ffc13 SHA256 21322fd3ab3a542c36ea72072251610b3075ca2ebca7d1500f8e4810f9e0982f
DIST dos2unix-5.3.2.tar.gz 56719 RMD160 15440229c1a0cf6ff03bedb2066e0cc48f7f2b28 SHA1 0df5fb5fae7758809105a1e6faf454e58d2af681 SHA256 2473f87b20bc9c6827ce2b3be376586d496c28dce35adb676a2129e82acb1c74
diff --git a/app-text/dos2unix/dos2unix-5.2.1.ebuild b/app-text/dos2unix/dos2unix-5.2.1.ebuild
deleted file mode 100644
index b5123a6ea404..000000000000
--- a/app-text/dos2unix/dos2unix-5.2.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dos2unix/dos2unix-5.2.1.ebuild,v 1.10 2011/05/28 17:58:01 armin76 Exp $
-
-EAPI="3"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
-HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/"
-SRC_URI="
- http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
- mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug nls"
-
-RDEPEND="
- !app-text/hd2u
- !app-text/unix2dos
- virtual/libintl"
-DEPEND="
- ${RDEPEND}
- dev-lang/perl"
-
-src_prepare() {
- sed \
- -e '/^LDFLAGS/s|=|+=|' \
- -e '/^CC/s|=|?=|' \
- -e '/CFLAGS_OS \+=/d' \
- -e '/LDFLAGS_EXTRA \+=/d' \
- -e "/^CFLAGS/s|-O2|${CFLAGS}|" \
- -i "${S}"/Makefile || die
- tc-export CC
- use debug && sed "/DEBUG/s:0:1:g" -i Makefile
-}
-
-lintl() {
- # same logic as from virtual/libintl
- use !elibc_glibc && use !elibc_uclibc && echo "-lintl"
-}
-
-src_compile() {
- emake prefix="${EPREFIX}/usr" \
- $(use nls && echo "LDFLAGS_EXTRA=$(lintl)" || echo "ENABLE_NLS=") \
- || die
-}
-
-src_install() {
- emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
- $(use nls || echo "ENABLE_NLS=") install \
- || die "emake install failed"
-}
diff --git a/dev-games/cegui/cegui-0.7.6-r1.ebuild b/dev-games/cegui/cegui-0.7.6-r1.ebuild
new file mode 100644
index 000000000000..dbfb0f5cd1af
--- /dev/null
+++ b/dev-games/cegui/cegui-0.7.6-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/cegui/cegui-0.7.6-r1.ebuild,v 1.1 2012/03/03 21:25:22 vapier Exp $
+
+EAPI="4"
+
+MY_P=CEGUI-${PV}
+MY_D=CEGUI-DOCS-${PV}
+DESCRIPTION="Crazy Eddie's GUI System"
+HOMEPAGE="http://www.cegui.org.uk/"
+SRC_URI="mirror://sourceforge/crayzedsgui/${MY_P}.tar.gz
+ doc? ( mirror://sourceforge/crayzedsgui/${MY_D}.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 -ppc ~x86"
+IUSE="bidi debug devil doc examples expat gtk irrlicht lua ogre opengl pcre static-libs tinyxml truetype xerces-c xml zip"
+REQUIRED_USE="|| ( expat tinyxml xerces-c xml )" # bug 362223
+
+RDEPEND="bidi? ( dev-libs/fribidi )
+ devil? ( media-libs/devil )
+ expat? ( dev-libs/expat )
+ truetype? ( media-libs/freetype:2 )
+ irrlicht? ( dev-games/irrlicht )
+ lua? (
+ dev-lang/lua
+ dev-lua/toluapp
+ )
+ ogre? ( >=dev-games/ogre-1.7 )
+ opengl? (
+ virtual/opengl
+ virtual/glu
+ media-libs/freeglut
+ media-libs/glew
+ )
+ pcre? ( dev-libs/libpcre )
+ tinyxml? ( dev-libs/tinyxml )
+ xerces-c? ( dev-libs/xerces-c )
+ xml? ( dev-libs/libxml2 )
+ zip? ( sys-libs/zlib[minizip] )"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # use minizip from zlib rather than local code
+ if use zip ; then
+ sed -i \
+ -e '/CEGUI_BUILD_MINIZIP_RESOURCE_PROVIDER_TRUE/{
+ s:minizip/ioapi.cpp minizip/unzip.cpp::;
+ s:libCEGUIBase@cegui_bsfx@_la-ioapi.lo::;
+ s:libCEGUIBase@cegui_bsfx@_la-unzip.lo::
+ }' \
+ -e '/^ZLIB_LIBS/s:=.*:= -lminizip:' \
+ cegui/src/Makefile.in || die
+ fi
+ rm -rf cegui/src/minizip
+
+ if use examples ; then
+ cp -r Samples Samples.clean
+ rm -f $(find Samples.clean -name 'Makefile*')
+ fi
+}
+
+src_configure() {
+ econf \
+ $(use_enable bidi bidirectional-text) \
+ $(use_enable debug) \
+ $(use_enable devil) \
+ $(use_enable examples samples) \
+ $(use_enable expat) \
+ $(use_enable truetype freetype) \
+ $(use_enable irrlicht irrlicht-renderer) \
+ $(use_enable lua lua-module) \
+ $(use_enable lua toluacegui) \
+ --enable-external-toluapp \
+ $(use_enable ogre ogre-renderer) \
+ $(use_enable opengl opengl-renderer) \
+ --enable-external-glew \
+ $(use_enable pcre) \
+ $(use_enable tinyxml) \
+ --enable-external-tinyxml \
+ $(use_enable xerces-c) \
+ $(use_enable xml libxml) \
+ $(use_enable zip minizip-resource-provider) \
+ --enable-null-renderer \
+ --enable-stb \
+ --enable-tga \
+ --disable-corona \
+ --disable-dependency-tracking \
+ --disable-freeimage \
+ --disable-rapidxml \
+ --disable-samples \
+ --disable-silly \
+ $(use_with gtk gtk2) \
+ $(use_enable static-libs static) \
+ --enable-shared
+}
+
+src_install() {
+ default
+
+ # remove .la files
+ use static-libs || rm -f "${D}"/usr/*/*.la
+
+ if use doc ; then
+ emake html || die
+ dohtml -r doc/doxygen/html/* || die
+ fi
+ if use examples ; then
+ insinto /usr/share/doc/${PF}/Samples
+ doins -r Samples.clean/* || die
+ fi
+}
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index 5ec9eec1d826..be02db15cee3 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1 +1,2 @@
DIST ogre-v1-6-5.tar.bz2 41785065 RMD160 4d40f9c2b36ec7d587a47114c7951f43f4a5bdbe SHA1 7068578be47f9207882b01790213f7ae8ad6304c SHA256 7fc0e948679c1c1f10751756d267a41d0e3395a6520a23f7853a0ae39a1281f5
+DIST ogre_src_v1-7-4.tar.bz2 67391570 RMD160 4259b45dc4b3c4f930053e0de5e4366eaf113840 SHA1 e989b96eacc2c66f8cf8a19dae6cfd962a165207 SHA256 afa475803d9e6980ddf3641dceaa53fcfbd348506ed67893c306766c166a4882
diff --git a/dev-games/ogre/files/ogre-1.7.4-gcc46.patch b/dev-games/ogre/files/ogre-1.7.4-gcc46.patch
new file mode 100644
index 000000000000..7fe766a0b994
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.7.4-gcc46.patch
@@ -0,0 +1,10 @@
+--- a/OgreMain/include/OgreOptimisedUtil.h
++++ b/OgreMain/include/OgreOptimisedUtil.h
+@@ -29,6 +29,7 @@ Torus Knot Software Ltd.
+ #ifndef __OptimisedUtil_H__
+ #define __OptimisedUtil_H__
+
++#include
+ #include "OgrePrerequisites.h"
+ #include "OgreEdgeListBuilder.h"
+
diff --git a/dev-games/ogre/files/ogre-1.7.4-threading.patch b/dev-games/ogre/files/ogre-1.7.4-threading.patch
new file mode 100644
index 000000000000..13cf5634e53d
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.7.4-threading.patch
@@ -0,0 +1,77 @@
+http://www.ogre3d.org/mantis/view.php?id=425
+
+--- ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreAtomicWrappers.h
+@@ -31,6 +31,7 @@
+ #include
+ #include "OgrePrerequisites.h"
+ #include "OgreException.h"
++#include "Threading/OgreThreadHeaders.h"
+
+ namespace Ogre {
+
+--- ogre_src_v1-7-4/OgreMain/include/OgreCommon.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreCommon.h
+@@ -42,6 +42,8 @@
+ # pragma GCC visibility pop
+ #endif
+
++#include "Threading/OgreThreadHeaders.h"
++
+ namespace Ogre {
+ /** \addtogroup Core
+ * @{
+--- ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreConvexBody.h
+@@ -31,6 +31,7 @@
+
+ #include "OgrePrerequisites.h"
+ #include "OgrePolygon.h"
++#include "Threading/OgreThreadHeaders.h"
+
+
+ namespace Ogre
+@@ -58,9 +59,7 @@
+
+ // Static 'free list' of polygons to save reallocation, shared between all bodies
+ static PolygonList msFreePolygons;
+-#if OGRE_THREAD_SUPPORT
+ OGRE_STATIC_MUTEX(msFreePolygonsMutex)
+-#endif
+
+ public:
+ ConvexBody();
+--- ogre_src_v1-7-4/OgreMain/include/OgreLog.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreLog.h
+@@ -32,6 +32,8 @@
+ #include "OgrePrerequisites.h"
+ #include "OgreString.h"
+
++#include "Threading/OgreThreadHeaders.h"
++
+ namespace Ogre {
+
+ /** \addtogroup Core
+--- ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h
++++ ogre_src_v1-7-4/OgreMain/include/OgreSharedPtr.h
+@@ -30,6 +30,8 @@
+
+ #include "OgrePrerequisites.h"
+
++#include "Threading/OgreThreadHeaders.h"
++
+ namespace Ogre {
+ /** \addtogroup Core
+ * @{
+--- ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp
++++ ogre_src_v1-7-4/OgreMain/src/OgreConvexBody.cpp
+@@ -44,9 +44,7 @@
+ // Statics
+ //-----------------------------------------------------------------------
+ ConvexBody::PolygonList ConvexBody::msFreePolygons;
+-#if OGRE_THREAD_SUPPORT
+ OGRE_STATIC_MUTEX_INSTANCE(ConvexBody::msFreePolygonsMutex)
+-#endif
+ //-----------------------------------------------------------------------
+ void ConvexBody::_initialisePool()
+ {
diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 4cc80de17f6d..7596d2bb0dcd 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -74,9 +74,16 @@ Exporters
* Maya (meshes)
diff --git a/dev-games/ogre/ogre-1.7.4.ebuild b/dev-games/ogre/ogre-1.7.4.ebuild
new file mode 100644
index 000000000000..07eccdd245c8
--- /dev/null
+++ b/dev-games/ogre/ogre-1.7.4.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.7.4.ebuild,v 1.1 2012/03/03 21:00:39 vapier Exp $
+
+EAPI="4"
+
+inherit eutils cmake-utils
+
+MY_PV=${PV//./-}
+DESCRIPTION="Object-oriented Graphics Rendering Engine"
+HOMEPAGE="http://www.ogre3d.org/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_src_v${MY_PV}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost cg doc double-precision examples +freeimage ois +opengl poco profile tbb test threads tools +zip"
+REQUIRED_USE="threads? ( || ( boost poco tbb ) )"
+RESTRICT="test" #139905
+
+RDEPEND="media-libs/freetype:2
+ virtual/opengl
+ virtual/glu
+ x11-libs/libX11
+ x11-libs/libXaw
+ x11-libs/libXrandr
+ x11-libs/libXt
+ boost? ( dev-libs/boost )
+ cg? ( media-gfx/nvidia-cg-toolkit )
+ freeimage? ( media-libs/freeimage )
+ ois? ( dev-games/ois )
+ threads? (
+ poco? ( dev-libs/poco )
+ tbb? ( dev-cpp/tbb )
+ )
+ zip? ( sys-libs/zlib dev-libs/zziplib )"
+DEPEND="${RDEPEND}
+ x11-proto/xf86vidmodeproto
+ dev-util/pkgconfig
+ doc? ( app-doc/doxygen )
+ test? ( dev-util/cppunit )"
+
+S=${WORKDIR}/${PN}_src_v${MY_PV}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc46.patch
+ epatch "${FILESDIR}"/${P}-threading.patch
+ sed -i \
+ -e "s:share/OGRE/docs:share/doc/${PF}:" \
+ Docs/CMakeLists.txt || die
+ # Stupid build system hardcodes release names
+ sed -i \
+ -e '/CONFIGURATIONS/s:CONFIGURATIONS.*::' \
+ CMake/Utils/OgreConfigTargets.cmake || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DOGRE_FULL_RPATH=NO
+ $(cmake-utils_use boost OGRE_USE_BOOST)
+ $(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG)
+ $(cmake-utils_use doc OGRE_INSTALL_DOCS)
+ $(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE)
+ $(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
+ $(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
+ $(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL)
+ $(cmake-utils_use profile OGRE_PROFILING)
+ $(cmake-utils_use test OGRE_BUILD_TESTS)
+ $(cmake-utils_use threads OGRE_CONFIG_THREADS)
+ $(cmake-utils_use tools OGRE_BUILD_TOOLS)
+ $(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)
+ )
+
+ if use threads ; then
+ local f
+ for f in poco tbb boost ; do
+ use ${f} || continue
+ mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} )
+ break
+ done
+ fi
+
+ cmake-utils_src_configure
+}
diff --git a/dev-haskell/ansi-wl-pprint/Manifest b/dev-haskell/ansi-wl-pprint/Manifest
index 28d59182f869..a506bce5567d 100644
--- a/dev-haskell/ansi-wl-pprint/Manifest
+++ b/dev-haskell/ansi-wl-pprint/Manifest
@@ -1,2 +1,3 @@
DIST ansi-wl-pprint-0.5.1.tar.gz 13492 RMD160 5870dc568cc9f3bf76143826f2319fef442d6f8f SHA1 d32355485c7125cae8a685ab080252c4cfe52af6 SHA256 aa5e0ba85c46f2f71970645066a8efeeea2c663f222185968fda8e09383ef7e0
DIST ansi-wl-pprint-0.6.3.tar.gz 13693 RMD160 5b34df1a8647a18359508fec7e6ed8236967c993 SHA1 4d5e4dda010622764eba75bd43131424c84728a0 SHA256 745245f9db01ad9a3c421ecd5fab26fa84153ce7bdeba6a7f65283468375f3b2
+DIST ansi-wl-pprint-0.6.4.tar.gz 13702 RMD160 1b50cf6d0f8d5be683449d7ca6fb0ed2a049d54b SHA1 2ed68b56785e54d17dc40b4d84dff1f1e385dc2d SHA256 608ea9c866198c7214b0493e74a4cae227e72da426d0c254c226cec2eafc307f
diff --git a/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.4.ebuild b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.4.ebuild
new file mode 100644
index 000000000000..12a8f526cb6f
--- /dev/null
+++ b/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/ansi-wl-pprint/ansi-wl-pprint-0.6.4.ebuild,v 1.1 2012/03/04 02:05:58 gienah Exp $
+
+# ebuild generated by hackport 0.2.14
+
+EAPI="4"
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="The Wadler/Leijen Pretty Printer for colored ANSI terminal output"
+HOMEPAGE="http://github.com/batterseapower/ansi-wl-pprint"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/binary/Manifest b/dev-haskell/binary/Manifest
index 50e5c9235da5..641f2da47138 100644
--- a/dev-haskell/binary/Manifest
+++ b/dev-haskell/binary/Manifest
@@ -1 +1,2 @@
DIST binary-0.5.0.2.tar.gz 41494 RMD160 a4bb4be2071e33a2c43fea4c1fa6f103733c0753 SHA1 bb680c03dbae2765e14d91376440b762bb4b65a4 SHA256 e0c2dede617dc9b1611f62f2801f21d2fd48e044ee6886e77b55df10e0f2130b
+DIST binary-0.5.1.0.tar.gz 20205 RMD160 a871b927c724f3542c11d6bee4228c6922f36b51 SHA1 d88e4d9ea163f25674f6a2a6217d5cb6541cd3fb SHA256 2ad477b47e9158d61517689f5f0c7b0240ff891059418d6758879020800351a3
diff --git a/dev-haskell/binary/binary-0.5.1.0.ebuild b/dev-haskell/binary/binary-0.5.1.0.ebuild
new file mode 100644
index 000000000000..bf2a00326717
--- /dev/null
+++ b/dev-haskell/binary/binary-0.5.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/binary/binary-0.5.1.0.ebuild,v 1.1 2012/03/04 02:19:54 gienah Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PV=$(get_version_component_range '1-3')
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Binary serialisation for Haskell values using lazy ByteStrings"
+HOMEPAGE="http://code.haskell.org/binary/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.2"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1"
diff --git a/dev-haskell/cabal/Manifest b/dev-haskell/cabal/Manifest
index c6760cbf1b80..5c424d22ee0f 100644
--- a/dev-haskell/cabal/Manifest
+++ b/dev-haskell/cabal/Manifest
@@ -1,2 +1,3 @@
DIST Cabal-1.10.2.0.tar.gz 256433 RMD160 1e2ce3e50575c51d859fef68c35fbfe3e642171e SHA1 12d92113ac4d766f428c1f28daf5f817dda42ce0 SHA256 b399dc19e22b43a9d1b97fed8025fbb2e2e533d6c66323b22c886a9065b391c8
+DIST Cabal-1.14.0.tar.gz 276517 RMD160 add8f1fa6a21b2209d1c2ba331b356d1c574770c SHA1 f3e9daaaf3cbe5f91e56937bf6c018218d583758 SHA256 72540a9db8b329121b7815ef207098f4b394f76d11d154d36baf54054327abe4
DIST Cabal-1.8.0.6.tar.gz 227268 RMD160 8e19935f46c0b175e1d90d3d10110fb4036fa669 SHA1 f2c0ce80e08b61165051f9937f2ffcb06c3a620b SHA256 8f34b102990931ed7a0296dc235622000b69e4a8a74810e258e8c00b16da472b
diff --git a/dev-haskell/cabal/cabal-1.14.0.ebuild b/dev-haskell/cabal/cabal-1.14.0.ebuild
new file mode 100644
index 000000000000..6c20de1e67fd
--- /dev/null
+++ b/dev-haskell/cabal/cabal-1.14.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cabal/cabal-1.14.0.ebuild,v 1.1 2012/03/04 02:33:04 gienah Exp $
+
+# ebuild generated by hackport 0.2.12
+
+EAPI="4"
+
+CABAL_FEATURES="bootstrap lib profile"
+inherit haskell-cabal eutils versionator
+
+MY_PN="Cabal"
+MY_PV=$(get_version_component_range '1-3')
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A framework for packaging Haskell software"
+HOMEPAGE="http://www.haskell.org/cabal/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc"
+
+RESTRICT="test" # avoid circular deps
+
+DEPEND=">=dev-lang/ghc-6.10.1"
+RDEPEND="${DEPEND}
+ dev-util/pkgconfig"
+# cabal uses dev-util/pkgconfig using runtime to resolve C dependencies, so
+# repoman's RDEPEND.suspect QA does not apply here
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1"
+
+src_configure() {
+ if ! cabal-is-dummy-lib; then
+ einfo "Bootstrapping Cabal..."
+ $(ghc-getghc) -i -i. -i"${WORKDIR}/${FP_P}" -cpp --make Setup.hs \
+ -o setup || die "compiling Setup.hs failed"
+ cabal-configure
+ fi
+}
+
+src_compile() {
+ if ! cabal-is-dummy-lib; then
+ cabal-build
+ fi
+}
diff --git a/dev-haskell/dataenc/Manifest b/dev-haskell/dataenc/Manifest
index 337f8c492c29..1df4ba8d65bf 100644
--- a/dev-haskell/dataenc/Manifest
+++ b/dev-haskell/dataenc/Manifest
@@ -1,2 +1,3 @@
DIST dataenc-0.13.0.2.tar.gz 12511 RMD160 1ee6f529b3a17e36fdde2a244c5bcd90d31232d6 SHA1 6a737797973441da9150d34ca91707be3c0f4570 SHA256 e3d70a3c3d94490244e05c5b11d8455eb6fdbf4849a119bd52bae644fa2b217a
DIST dataenc-0.14.0.2.tar.gz 12914 RMD160 1d01ffa4dba6f75b0d2c4d4c2e0b70df8d99f697 SHA1 42b6c269cc2de9131d7337ae11d5866dcf140548 SHA256 abf067e438a800931c076cef80dea4f125210e1539f6b5cf1a05b4540411d5ff
+DIST dataenc-0.14.0.3.tar.gz 12911 RMD160 d746dbb1f2cee6fea95bf6c5a5f91273f4fa8fa3 SHA1 5daba3d2e82800d8788e7a5bc0572831b52ad46f SHA256 ed029fb48284ce3f42c6e5a00495e3744537c95fad0af7f71343d5d22f4bd3cc
diff --git a/dev-haskell/dataenc/dataenc-0.14.0.3.ebuild b/dev-haskell/dataenc/dataenc-0.14.0.3.ebuild
new file mode 100644
index 000000000000..2442ef030adb
--- /dev/null
+++ b/dev-haskell/dataenc/dataenc-0.14.0.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/dataenc/dataenc-0.14.0.3.ebuild,v 1.1 2012/03/04 02:45:43 gienah Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="4"
+
+CABAL_FEATURES="bin lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="Data encoding library"
+HOMEPAGE="http://www.haskell.org/haskellwiki/Library/Data_encoding"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/deepseq/Manifest b/dev-haskell/deepseq/Manifest
index 4041d30d92b4..cecce0f96bc0 100644
--- a/dev-haskell/deepseq/Manifest
+++ b/dev-haskell/deepseq/Manifest
@@ -1 +1,2 @@
DIST deepseq-1.1.0.2.tar.gz 3619 RMD160 b4c41a1a7a13aedd2f42ba3499e693aa5315ed39 SHA1 7105596d04d5c730da33280f22379069233585d3 SHA256 6504d3bcd61e89c2ca6b957e45418028fcb8943727339a6468595825184513c7
+DIST deepseq-1.3.0.0.tar.gz 3901 RMD160 178e5cb8e336b16f9e12e55ed0c73e1cd9e2430f SHA1 9bde1b02a354ef8cf3cee87e29919599f59484c1 SHA256 fee10dbfceda33220fb9869652530c32ab2888694ee628cc86d51ea35a0e537c
diff --git a/dev-haskell/deepseq/deepseq-1.3.0.0.ebuild b/dev-haskell/deepseq/deepseq-1.3.0.0.ebuild
new file mode 100644
index 000000000000..beb2a5921795
--- /dev/null
+++ b/dev-haskell/deepseq/deepseq-1.3.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/deepseq-1.3.0.0.ebuild,v 1.1 2012/03/04 03:02:27 gienah Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="4"
+
+CABAL_FEATURES="lib profile haddock hscolour"
+inherit haskell-cabal versionator
+
+MY_P="${P/_pre*/}"
+
+DESCRIPTION="Deep evaluation of data structures"
+HOMEPAGE="http://hackage.haskell.org/package/deepseq"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1"
diff --git a/dev-haskell/extensible-exceptions/Manifest b/dev-haskell/extensible-exceptions/Manifest
new file mode 100644
index 000000000000..b4223f7f7df0
--- /dev/null
+++ b/dev-haskell/extensible-exceptions/Manifest
@@ -0,0 +1 @@
+DIST extensible-exceptions-0.1.1.4.tar.gz 8531 RMD160 2e1311778e7e87b1e5266bbce2dea81eb4620ae7 SHA1 a0c17865e289067fd36016d9ace47cac1eb68bf8 SHA256 6ce5e8801760385a408dab71b53550f87629e661b260bdc2cd41c6a439b6e388
diff --git a/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
new file mode 100644
index 000000000000..4ae398fabfc9
--- /dev/null
+++ b/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/extensible-exceptions/extensible-exceptions-0.1.1.4.ebuild,v 1.1 2012/03/04 03:11:43 gienah Exp $
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal versionator
+
+MY_PV=$(get_version_component_range '1-3')
+MY_P="${PN}-${PV}"
+
+DESCRIPTION="Extensible exceptions"
+HOMEPAGE="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/extensible-exceptions"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.8.1"
+DEPEND=">=dev-haskell/cabal-1.6
+ ${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1"
diff --git a/dev-haskell/extensible-exceptions/metadata.xml b/dev-haskell/extensible-exceptions/metadata.xml
new file mode 100644
index 000000000000..4c98711fae0d
--- /dev/null
+++ b/dev-haskell/extensible-exceptions/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+ haskell
+
+ haskell@gentoo.org
+
+
+ This package provides extensible exceptions for both new and
+ old versions of GHC (i.e., < 6.10).
+
+
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index 568a84345918..2b882878631a 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,4 +1,5 @@
DIST ghc-paths-0.1.0.5.tar.gz 2304 RMD160 098804e5a48ce9381174245601b3896304464219 SHA1 f9a70a8564be268e4aa88436ea18fc84a1ce303a SHA256 ea9e97425894e3dbd7915e00e107e2e7fc07b6e8293fd2dd66a813f0673cba10
+DIST haddock-2.10.0_pre20120202.tar.gz 182196 RMD160 74db4cae1c97cdf9feb19d8b3da72b97a09fb068 SHA1 8cbeb879ed77c57284d6fdac4894dd57c1b2f3df SHA256 d52476789da279388c23589c02c82595a778da82b39a8c1239dab39bab13fafa
DIST haddock-2.4.2.tar.gz 103033 RMD160 18317b3ffd60f2b0925d635ce1ea2ab35825860c SHA1 cd1de409029bcabdf79b05b4c00c7702c836c765 SHA256 dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547
DIST haddock-2.6.1.tar.gz 128158 RMD160 32be5206f0caab3e6aa7582b9ad23a22581082ab SHA1 f088795826a155f0a207219a45ad643dcaeccf65 SHA256 626bfbc51f33ada003fbbfe1b40f3147039369e9898f8e8d2f5c1c863436ea6a
DIST haddock-2.9.2.tar.gz 154040 RMD160 5d7fe09d61bf089794e753969db4a259117df41b SHA1 2a61f178a0ce9e126442821ab95052e748b865b0 SHA256 e8498520a4b8c8a03330141ba4c31d81e90dfd361de3ff7e320cdf71c2dd3ba1
diff --git a/dev-haskell/haddock/haddock-2.10.0_pre20120202.ebuild b/dev-haskell/haddock/haddock-2.10.0_pre20120202.ebuild
new file mode 100644
index 000000000000..2e898f0148b9
--- /dev/null
+++ b/dev-haskell/haddock/haddock-2.10.0_pre20120202.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0_pre20120202.ebuild,v 1.1 2012/03/04 03:24:53 gienah Exp $
+
+# haddock-2.9.4 on hackage does not work with ghc-7.4.1
+# this ebuild uses a tarball of what's distributed with ghc-7.4.1
+
+EAPI="4"
+
+#CABAL_FEATURES="bin lib profile haddock hscolour"
+CABAL_FEATURES="bin lib profile hscolour"
+inherit haskell-cabal pax-utils versionator
+
+MY_PV=$(get_version_component_range '1-3')
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A documentation-generation tool for Haskell libraries"
+HOMEPAGE="http://www.haskell.org/haddock/"
+#SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~gienah/snapshots/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+# ia64 lost as we don't have ghc-7 there yet
+# ppc64 needs to be rekeyworded due to xhtml not being keyworded
+KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="dev-haskell/ghc-paths[profile?]
+ =dev-haskell/xhtml-3000.2*[profile?]
+ >=dev-lang/ghc-7.4"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.10"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+RESTRICT="test" # avoid depends on QC
+
+CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
+
+# haddock is disabled as Cabal seems to be buggy about building docks with itself.
+# however, other packages seem to work
+src_configure() {
+ # create a fake haddock executable. it'll set the right version to cabal
+ # configure, but will eventually get overwritten in src_compile by
+ # the real executable.
+ local exe="${S}/dist/build/haddock/haddock"
+ mkdir -p $(dirname "${exe}")
+ echo -e "#!/bin/sh\necho Haddock version ${PV}" > "${exe}"
+ chmod +x "${exe}"
+
+ haskell-cabal_src_configure --with-haddock="${exe}"
+}
+
+src_compile() {
+ # when building the (recursive..) haddock docs, change the datadir to the
+ # current directory, as we're using haddock inplace even if it's built to be
+ # installed into the system first.
+ haddock_datadir="${S}" haskell-cabal_src_compile
+}
+
+src_install() {
+ cabal_src_install
+ # haddock uses GHC-api to process TH source.
+ # TH requires GHCi which needs mmap('rwx') (bug #299709)
+ pax-mark -m "${D}/usr/bin/${PN}"
+}
diff --git a/dev-haskell/haddock/haddock-2.9.2.ebuild b/dev-haskell/haddock/haddock-2.9.2.ebuild
index 4fe67d4d647f..2beabcb79657 100644
--- a/dev-haskell/haddock/haddock-2.9.2.ebuild
+++ b/dev-haskell/haddock/haddock-2.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.9.2.ebuild,v 1.1 2011/08/03 13:14:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.9.2.ebuild,v 1.2 2012/03/04 03:24:53 gienah Exp $
# ebuild generated by hackport 0.2.9
@@ -29,6 +29,8 @@ RDEPEND="dev-haskell/ghc-paths
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.10"
+CABAL_EXTRA_BUILD_FLAGS="--ghc-options=-rtsopts"
+
# although haddock depends on alex and happy to build from scratch, we don't
# want this ebuild to depend on those packages.
# we use haddock to build the documentation enabled by USE="doc".
diff --git a/dev-haskell/hostname/hostname-1.0.ebuild b/dev-haskell/hostname/hostname-1.0.ebuild
index 6ad09301ec64..42f736bcf000 100644
--- a/dev-haskell/hostname/hostname-1.0.ebuild
+++ b/dev-haskell/hostname/hostname-1.0.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/dev-haskell/hostname/hostname-1.0.ebuild,v 1.1 2012/01/22 13:56:09 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hostname/hostname-1.0.ebuild,v 1.2 2012/03/04 04:28:14 gienah Exp $
# ebuild generated by hackport 0.2.14
-EAPI="3"
+EAPI="4"
CABAL_FEATURES="lib profile haddock hoogle hscolour"
inherit haskell-cabal
@@ -15,7 +15,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-6.8.2"
diff --git a/dev-haskell/hpc/Manifest b/dev-haskell/hpc/Manifest
new file mode 100644
index 000000000000..a5c2bbc738a9
--- /dev/null
+++ b/dev-haskell/hpc/Manifest
@@ -0,0 +1 @@
+DIST hpc-0.5.1.1.tar.gz 6486 RMD160 387d62634237cb9e7ac48407b90d2160ada72924 SHA1 a541096a9c8ac3773b1d8fbc7690cba7d1971ac3 SHA256 5529224e4d33b26319be71bcac5f81da8fa57545109e40e56f437cc923300ca0
diff --git a/dev-haskell/hpc/hpc-0.5.1.1.ebuild b/dev-haskell/hpc/hpc-0.5.1.1.ebuild
new file mode 100644
index 000000000000..7097d080a5b0
--- /dev/null
+++ b/dev-haskell/hpc/hpc-0.5.1.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hpc/hpc-0.5.1.1.ebuild,v 1.1 2012/03/04 03:30:06 gienah Exp $
+
+EAPI="3"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal versionator
+
+MY_PV=$(get_version_component_range '1-3')
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Code Coverage Library for Haskell"
+HOMEPAGE="http://hackage.haskell.org/package/hpc"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+CABAL_CORE_LIB_GHC_PV="7.4.0.20111219 7.4.0.20120126 7.4.1"
diff --git a/dev-haskell/hpc/metadata.xml b/dev-haskell/hpc/metadata.xml
new file mode 100644
index 000000000000..343cf26bc5f9
--- /dev/null
+++ b/dev-haskell/hpc/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+ haskell
+
+ haskell@gentoo.org
+
+
+ Code Coverage Library for Haskell
+
+
diff --git a/dev-haskell/http/Manifest b/dev-haskell/http/Manifest
index ce122d37eaf8..cb4cebca2c1c 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -1,2 +1,3 @@
DIST HTTP-4000.1.1.tar.gz 59459 RMD160 c90418ef556cf833cffcb327df9b57e051ee8b25 SHA1 cdb8ae29b8524a912545059e4ec4a2b25ada88c5 SHA256 c3b7f8815f5528c88a41a4d62c4a0586edde644f83ae514f036a1cb35ce97026
DIST HTTP-4000.1.2.tar.gz 59835 RMD160 b927af921ef198ddb824981b29b4d22b97d49fd4 SHA1 b5ee196ac334c1571980b2eba0b99999f03cc1c4 SHA256 c8725620a1566bcc6ded1304cced716b6d1f6e78da78aa580076671b3bf26ca7
+DIST HTTP-4000.2.2.tar.gz 65275 RMD160 d8983921bb48cb488be63278ce9b99f2a8717329 SHA1 b027a2049a9e18a304ea9e4f6a50f5cc3e7c507e SHA256 709f8d94fbbd538f198e844541dcbb53a3470207bcdeeb62774d17211b4f3963
diff --git a/dev-haskell/http/http-4000.1.2.ebuild b/dev-haskell/http/http-4000.1.2.ebuild
index 68073d6722ff..45458e60dba9 100644
--- a/dev-haskell/http/http-4000.1.2.ebuild
+++ b/dev-haskell/http/http-4000.1.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/http-4000.1.2.ebuild,v 1.1 2011/12/04 17:26:32 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/http/http-4000.1.2.ebuild,v 1.2 2012/03/04 03:37:58 gienah Exp $
# ebuild generated by hackport 0.2.13
-EAPI="3"
+EAPI="4"
CABAL_FEATURES="lib profile haddock hscolour hoogle"
inherit haskell-cabal
@@ -21,11 +21,16 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
IUSE=""
-RDEPEND="dev-haskell/mtl
- dev-haskell/network
- dev-haskell/parsec
+RDEPEND="dev-haskell/mtl[profile?]
+ dev-haskell/network[profile?]
+ dev-haskell/parsec[profile?]
>=dev-lang/ghc-6.8.2"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.2"
S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ sed -e 's@base >= 2 && < 4.5@base >= 2 \&\& < 4.6@' \
+ -i "${S}/${MY_PN}.cabal" || die "Could not loosen dependencies"
+}
diff --git a/dev-haskell/http/http-4000.2.2.ebuild b/dev-haskell/http/http-4000.2.2.ebuild
new file mode 100644
index 000000000000..cf3fd239aa10
--- /dev/null
+++ b/dev-haskell/http/http-4000.2.2.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/dev-haskell/http/http-4000.2.2.ebuild,v 1.1 2012/03/04 03:37:58 gienah Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="4"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit base haskell-cabal
+
+MY_PN="HTTP"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A library for client-side HTTP"
+HOMEPAGE="https://github.com/haskell/HTTP"
+SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="=dev-haskell/mtl-2.0*[profile?]
+ dev-haskell/network[profile?]
+ dev-haskell/parsec[profile?]
+ >=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? ( >=dev-haskell/cabal-1.10
+ dev-haskell/hunit[profile?]
+ dev-haskell/httpd-shed[profile?]
+ =dev-haskell/split-0.1*[profile?]
+ dev-haskell/test-framework[profile?]
+ dev-haskell/test-framework-hunit[profile?]
+ )
+ "
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+ cabal_src_configure $(use test && use_enable test tests) #395351
+}
diff --git a/dev-haskell/httpd-shed/Manifest b/dev-haskell/httpd-shed/Manifest
new file mode 100644
index 000000000000..d51e2eeff8a4
--- /dev/null
+++ b/dev-haskell/httpd-shed/Manifest
@@ -0,0 +1 @@
+DIST httpd-shed-0.4.tar.gz 4065 RMD160 0af892c64fd66e6266ea91da8b46234bb14ac660 SHA1 5c5df7192e1c0f3afd9f196f336a8d934ca87cb5 SHA256 c03f784742bdc3053c7e867e587ee859a9a3adaa082d36bdb2ea69da1b02069f
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4.ebuild
new file mode 100644
index 000000000000..7166e3c6e412
--- /dev/null
+++ b/dev-haskell/httpd-shed/httpd-shed-0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/httpd-shed/httpd-shed-0.4.ebuild,v 1.1 2012/03/04 03:50:41 gienah Exp $
+
+# ebuild generated by hackport 0.2.17.9999
+
+EAPI=4
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A simple web-server with an interact style API"
+HOMEPAGE="http://hackage.haskell.org/package/httpd-shed"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-haskell/network[profile?]
+ >=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/httpd-shed/metadata.xml b/dev-haskell/httpd-shed/metadata.xml
new file mode 100644
index 000000000000..e8a1c1f54718
--- /dev/null
+++ b/dev-haskell/httpd-shed/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+ haskell
+
+ haskell@gentoo.org
+
+
+ This web server promotes a Request to IO Response function
+ into a local web server. The user can decide how to interpret
+ the requests, and the library is intended for implementing Ajax APIs.
+
+
diff --git a/dev-haskell/network/Manifest b/dev-haskell/network/Manifest
index 33131fe32405..002589e79075 100644
--- a/dev-haskell/network/Manifest
+++ b/dev-haskell/network/Manifest
@@ -1,3 +1,4 @@
DIST network-2.2.1.7.tar.gz 112028 RMD160 f58c6aeee437e6e3296babc495892e74a5de0625 SHA1 69f284a1c618504e30d4118b47f51324cc68e575 SHA256 0e65b28a60764245c1ab6661a3566f286feb36e0e6f0296d6cd2b84adcd45d58
+DIST network-2.3.0.11.tar.gz 133563 RMD160 ab08b9ed1777423bffeb72bbaa6541e19f77052b SHA1 dac5db8b40207ce46a0d2e6c9a5ca264a1d01956 SHA256 b3f50ae3f1554c4df5f4e4439a6b5d08fa9464aabfae66ed0da78f0a784615be
DIST network-2.3.0.2.tar.gz 133335 RMD160 c48bbe4338bc3c1588b3ed31e5751db0f723e387 SHA1 f528933004f1f5474413671c8af12e20b1be5f99 SHA256 033cb59ac467af94a028bf4836568d81673ec55905029a598ec7344d23a890e8
DIST network-2.3.0.7.tar.gz 133965 RMD160 57c3c5c070dd697829c98fbfdad04260da602e46 SHA1 6a702b434b062f5a40ca664fbbf8095f6d057790 SHA256 dba7c77ae023032efba8d6139f5c558af07c089f597fc617d81661f5986a9fe6
diff --git a/dev-haskell/network/network-2.3.0.11.ebuild b/dev-haskell/network/network-2.3.0.11.ebuild
new file mode 100644
index 000000000000..cfa6d18c0807
--- /dev/null
+++ b/dev-haskell/network/network-2.3.0.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/network/network-2.3.0.11.ebuild,v 1.1 2012/03/04 03:56:39 gienah Exp $
+
+EAPI="4"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit base haskell-cabal autotools
+
+DESCRIPTION="Low-level networking interface"
+HOMEPAGE="http://github.com/haskell/network"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+
+RDEPEND="dev-haskell/parsec[profile?]
+ >=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? (
+
+
+ haskell
+
+ haskell@gentoo.org
+
+
+ This package provides a random number library.
+
+
diff --git a/dev-haskell/random/random-1.0.1.1.ebuild b/dev-haskell/random/random-1.0.1.1.ebuild
new file mode 100644
index 000000000000..943751ef9bac
--- /dev/null
+++ b/dev-haskell/random/random-1.0.1.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/random/random-1.0.1.1.ebuild,v 1.1 2012/03/04 03:58:25 gienah Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="4"
+
+# PDEPEND of ghc, so restrict depgraph
+CABAL_FEATURES="lib profile nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="random number library"
+HOMEPAGE="http://hackage.haskell.org/package/random"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="dev-haskell/time[profile?]
+ >=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}"
diff --git a/dev-haskell/split/Manifest b/dev-haskell/split/Manifest
new file mode 100644
index 000000000000..585624a9e00f
--- /dev/null
+++ b/dev-haskell/split/Manifest
@@ -0,0 +1 @@
+DIST split-0.1.4.2.tar.gz 12665 RMD160 50735e5f69c3265921a68372b58624a28f85d9cf SHA1 e6466bbe136e92bba9ec104d93e9eea197d5c290 SHA256 893ac1c8a8d8659c12aef7a263dccb28e2e8f7867bad71fd43279348f83e7127
diff --git a/dev-haskell/split/metadata.xml b/dev-haskell/split/metadata.xml
new file mode 100644
index 000000000000..91f37e4a1e8c
--- /dev/null
+++ b/dev-haskell/split/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+ haskell
+
+ haskell@gentoo.org
+
+
+ Combinator library and utility functions for splitting lists.
+
+
diff --git a/dev-haskell/split/split-0.1.4.2.ebuild b/dev-haskell/split/split-0.1.4.2.ebuild
new file mode 100644
index 000000000000..8c7d53b131c6
--- /dev/null
+++ b/dev-haskell/split/split-0.1.4.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/split/split-0.1.4.2.ebuild,v 1.1 2012/03/04 04:02:08 gienah Exp $
+
+# ebuild generated by hackport 0.2.17.9999
+
+EAPI=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Combinator library for splitting lists."
+HOMEPAGE="http://code.haskell.org/~byorgey/code/split"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND=">=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/test-framework-hunit/Manifest b/dev-haskell/test-framework-hunit/Manifest
index 3419a7d82eea..bdc17d329e03 100644
--- a/dev-haskell/test-framework-hunit/Manifest
+++ b/dev-haskell/test-framework-hunit/Manifest
@@ -1,2 +1,3 @@
DIST test-framework-hunit-0.2.4.tar.gz 2630 RMD160 ca592fb6a51f7987c12048a2b1c4495f9d43d20e SHA1 080fc4dafaacffb3fd62862b379cd4b89110d365 SHA256 6bf43eb9227c96e33cc94c7846dc866ff1f22e33db64a3f28ad291841d2d409e
DIST test-framework-hunit-0.2.6.tar.gz 2639 RMD160 b20595d4cac2a6d8a18bff39ad58652f1cd83f32 SHA1 4020a2229e8df30917a7e4c77e1ee5b70c094e5c SHA256 f910e18e62615f64fac9bf4938a34cc36fad9d86e6ba31edcb79731e0ef46fc7
+DIST test-framework-hunit-0.2.7.tar.gz 2633 RMD160 d05e0e3f92df8da9b6394bc32866588c220588e0 SHA1 8d63d5d674f4faf3d4ce98236c7da026a6ca32f5 SHA256 cc8d21df58cdd85bb4ae5871e1a28c6a9e1c0fe618f3c899fdefd95d2211e4b0
diff --git a/dev-haskell/test-framework-hunit/test-framework-hunit-0.2.7.ebuild b/dev-haskell/test-framework-hunit/test-framework-hunit-0.2.7.ebuild
new file mode 100644
index 000000000000..b8ce2d5014c7
--- /dev/null
+++ b/dev-haskell/test-framework-hunit/test-framework-hunit-0.2.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework-hunit/test-framework-hunit-0.2.7.ebuild,v 1.1 2012/03/04 04:39:13 gienah Exp $
+
+EAPI="4"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="HUnit support for the test-framework package."
+HOMEPAGE="http://batterseapower.github.com/test-framework/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+HASKELLDEPS=">=dev-haskell/hunit-1.2[profile?]
+ >=dev-haskell/test-framework-0.2.0[profile?]"
+RDEPEND=">=dev-lang/ghc-6.10
+ ${HASKELLDEPS}"
+DEPEND=">=dev-haskell/cabal-1.2.3
+ ${RDEPEND}"
diff --git a/dev-haskell/test-framework-quickcheck2/Manifest b/dev-haskell/test-framework-quickcheck2/Manifest
index 8b2c1dc4eceb..31a56475e187 100644
--- a/dev-haskell/test-framework-quickcheck2/Manifest
+++ b/dev-haskell/test-framework-quickcheck2/Manifest
@@ -1,2 +1,3 @@
DIST test-framework-quickcheck2-0.2.10.tar.gz 4798 RMD160 1d5c48f3e0050687255295f6b438ba83fc173ab1 SHA1 8f76648417ebc842db36a1f56a7743daa6d9ff0e SHA256 839b6cab143ce8969550791e6288df378b18d38a49d707756f5eb6484e3d8389
+DIST test-framework-quickcheck2-0.2.12.tar.gz 5324 RMD160 e53c9c92d01b63aefbe1caa95d06586ef0f4bdd0 SHA1 411386a2633ff731374b1624a698d621ef1a77c1 SHA256 3e227f3c44c4f44c4d4f5adaa2cbde90a4a753f13accde552b5e4e1520151923
DIST test-framework-quickcheck2-0.2.5.tar.gz 4566 RMD160 7fd64f47f71169de939ed19fa50bd7ef06ab2030 SHA1 ebe57ca37e2d5ffe3dece890dd455e2cfd7f549d SHA256 d9262fbf69428638c26b1ecc4ca4a56e9eaa0bf25ad4665156b7bf10e8277d67
diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.2.12-r1.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.2.12-r1.ebuild
new file mode 100644
index 000000000000..d52c8dea7588
--- /dev/null
+++ b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.2.12-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.2.12-r1.ebuild,v 1.1 2012/03/04 04:40:52 gienah Exp $
+
+# ebuild generated by hackport 0.2.14
+
+EAPI="4"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="QuickCheck2 support for the test-framework package."
+HOMEPAGE="http://batterseapower.github.com/test-framework/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="=dev-haskell/quickcheck-2.4*[profile?]
+ =dev-lang/ghc-6.10.4"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.2.3"
+
+src_prepare() {
+ sed -e 's@test-framework >= 0.2.0 && < 0.5.0@test-framework >= 0.2.0 \&\& < 0.6.0@' \
+ -i "${S}/${PN}.cabal" || die "Could not loosen dependencies"
+}
diff --git a/dev-haskell/test-framework/Manifest b/dev-haskell/test-framework/Manifest
index 0802243ed661..82384e9873a6 100644
--- a/dev-haskell/test-framework/Manifest
+++ b/dev-haskell/test-framework/Manifest
@@ -1,2 +1,3 @@
DIST test-framework-0.2.4.tar.gz 15070 RMD160 c2d255ea0ab16929b9a704dc372698b8370b385c SHA1 d82b9be5a2808ed79c0a17d42a9a28e999d15f39 SHA256 73bfc8ac5841b7e650b706dea95d353f4c3b3124e05b085ed20e0880226cb010
DIST test-framework-0.4.2.0.tar.gz 19140 RMD160 b8fb155c0dd87ca4d321863905b9ecbe8d2ece65 SHA1 3a4928f15f325b45f38690a5bd297c770ba39fe5 SHA256 cd4651923fd729aec3228ede9edabad9e1ee2dc75f886980cc52695ea954e428
+DIST test-framework-0.5.tar.gz 19237 RMD160 c2d2405fc10f5a47ed00a5094cea3e18bc961738 SHA1 7e6ade3ec40ca440914aa149079a470f82fae890 SHA256 ff531cd8e00e3a09435a66051e6b45488b544fe4f389e6b388184a0f5b4ff5a7
diff --git a/dev-haskell/test-framework/test-framework-0.4.2.0.ebuild b/dev-haskell/test-framework/test-framework-0.4.2.0.ebuild
index bdb29375c47d..2f2422bd79d9 100644
--- a/dev-haskell/test-framework/test-framework-0.4.2.0.ebuild
+++ b/dev-haskell/test-framework/test-framework-0.4.2.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework/test-framework-0.4.2.0.ebuild,v 1.1 2012/01/22 14:19:16 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework/test-framework-0.4.2.0.ebuild,v 1.2 2012/03/04 04:35:38 gienah Exp $
# ebuild generated by hackport 0.2.14
@@ -15,15 +15,15 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
-RDEPEND=">=dev-haskell/ansi-terminal-0.4.0
- >=dev-haskell/ansi-wl-pprint-0.5.1
- >=dev-haskell/hostname-1.0
- >=dev-haskell/regex-posix-0.72
- >=dev-haskell/time-1.1.2
- >=dev-haskell/xml-1.3.5
+RDEPEND=">=dev-haskell/ansi-terminal-0.4.0[profile?]
+ >=dev-haskell/ansi-wl-pprint-0.5.1[profile?]
+ >=dev-haskell/hostname-1.0[profile?]
+ >=dev-haskell/regex-posix-0.72[profile?]
+ >=dev-haskell/time-1.1.2[profile?]
+ >=dev-haskell/xml-1.3.5[profile?]
>=dev-lang/ghc-6.10.4"
DEPEND="${RDEPEND}
>=dev-haskell/cabal-1.2.3"
diff --git a/dev-haskell/test-framework/test-framework-0.5.ebuild b/dev-haskell/test-framework/test-framework-0.5.ebuild
new file mode 100644
index 000000000000..714edf3547be
--- /dev/null
+++ b/dev-haskell/test-framework/test-framework-0.5.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework/test-framework-0.5.ebuild,v 1.1 2012/03/04 04:35:38 gienah Exp $
+
+# ebuild generated by hackport 0.2.14
+
+EAPI="4"
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Framework for running and organising tests, with HUnit and QuickCheck support"
+HOMEPAGE="http://batterseapower.github.com/test-framework/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/ansi-terminal-0.4.0[profile?]
+ >=dev-haskell/ansi-wl-pprint-0.5.1[profile?]
+ >=dev-haskell/hostname-1.0[profile?]
+ >=dev-haskell/regex-posix-0.72[profile?]
+ >=dev-haskell/time-1.1.2[profile?]
+ >=dev-haskell/xml-1.3.5[profile?]
+ >=dev-lang/ghc-6.10.4"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.2.3"
diff --git a/dev-haskell/time/Manifest b/dev-haskell/time/Manifest
index b51ca07fedea..011ecadae497 100644
--- a/dev-haskell/time/Manifest
+++ b/dev-haskell/time/Manifest
@@ -4,3 +4,4 @@ DIST time-1.1.2.0.tar.gz 51035 RMD160 8931ed32b9c2463e0f92fa3cea08cd3ffac11c7c S
DIST time-1.1.2.4.tar.gz 53062 RMD160 adfbe1644a2f6f67f2715504ddac13fee7299b39 SHA1 f6de0ecfb1182687a8872762cc7ed30b479d2a0d SHA256 11dfcb9b5ca76428a7a31019928c3c1898320f774e5d3df8e4407580d074fad3
DIST time-1.1.4.tar.gz 53779 RMD160 b586092e23d68bc415d55bd76b569f6f51c192fd SHA1 779c6d75bd36f0c00e93f0acc87bf7e44e5bef5f SHA256 5e3fef3dfba8a6f8a05dcfc3974e1595fb86f5c032dc28fbd2ce7951f0ffac1c
DIST time-1.2.0.3.tar.gz 85069 RMD160 7ccd65dcb50d6f0679701644f0c88efcc68e762f SHA1 a932e11ee8757fbd14f3dafcada25097ed6c735f SHA256 acb1e3cf2b98a73632d35b0665808b05df6c03fcefd62796fe291f5b2ef4348e
+DIST time-1.4.tar.gz 87054 RMD160 672cad5a46425576aa7845ac40effa7061264f28 SHA1 33a8c105cddab7868518d8be7b1e3949652521f0 SHA256 ff8eb4ab5b8eb7b1b6c6c7861c32d044fbb0c2f5c6112dfa21e740f6d53c2f79
diff --git a/dev-haskell/time/time-1.4.ebuild b/dev-haskell/time/time-1.4.ebuild
new file mode 100644
index 000000000000..2efd67701bfe
--- /dev/null
+++ b/dev-haskell/time/time-1.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/time/time-1.4.ebuild,v 1.1 2012/03/04 04:59:15 gienah Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="4"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="A time library"
+HOMEPAGE="http://semantic.org/TimeLib/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-haskell/deepseq-1.1[profile?]
+ >=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
+
+CABAL_CORE_LIB_GHC_PV="7.4.0.20111218 7.4.0.20111219 7.4.0.20120126 7.4.1"
+
+# FIXME: fails in my timezone
+RESTRICT="test"
diff --git a/dev-haskell/x11-xft/files/x11-xft-0.3-ghc72.patch b/dev-haskell/x11-xft/files/x11-xft-0.3-ghc72.patch
new file mode 100644
index 000000000000..42e53fd3d0c5
--- /dev/null
+++ b/dev-haskell/x11-xft/files/x11-xft-0.3-ghc72.patch
@@ -0,0 +1,26 @@
+diff --git a/Graphics/X11/Xft.hsc b/Graphics/X11/Xft.hsc
+index b32d3c9..493c5ee 100644
+--- a/Graphics/X11/Xft.hsc
++++ b/Graphics/X11/Xft.hsc
+@@ -57,7 +57,7 @@ import Foreign.Marshal.Array
+ import Codec.Binary.UTF8.String as UTF8
+ import Data.Int
+ import Data.Word
+-import Monad
++import Control.Monad
+
+ #include
+
+diff --git a/X11-xft.cabal b/X11-xft.cabal
+index 06bba67..273c96a 100644
+--- a/X11-xft.cabal
++++ b/X11-xft.cabal
+@@ -9,7 +9,7 @@ synopsis: Bindings to the Xft, X Free Type interface library, and some Xre
+ description: Bindings to the Xft, X Free Type interface library, and some Xrender parts
+ exposed-modules: Graphics.X11.Xft, Graphics.X11.Xrender
+ extensions: ForeignFunctionInterface
+-build-depends: base, haskell98, X11>=1.2.1, utf8-string>=0.1
++build-depends: base, X11>=1.2.1, utf8-string>=0.1
+ ghc-options: -funbox-strict-fields
+ pkgconfig-depends: xft
+ extra-source-files: Hello.hs
diff --git a/dev-haskell/x11-xft/x11-xft-0.3.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.ebuild
index d1a323de118c..9a7c0276285b 100644
--- a/dev-haskell/x11-xft/x11-xft-0.3.ebuild
+++ b/dev-haskell/x11-xft/x11-xft-0.3.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11-xft/x11-xft-0.3.ebuild,v 1.2 2009/11/26 21:44:36 kolmodin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11-xft/x11-xft-0.3.ebuild,v 1.4 2012/03/04 05:12:57 gienah Exp $
+
+EAPI="4"
CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
+inherit base haskell-cabal
MY_PN="X11-xft"
MY_P="${MY_PN}-${PV}"
@@ -14,15 +16,17 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE=""
RDEPEND=">=dev-lang/ghc-6.6.1
- >=dev-haskell/utf8-string-0.1
- >=dev-haskell/x11-1.2.1
+ >=dev-haskell/utf8-string-0.1[profile?]
+ >=dev-haskell/x11-1.2.1[profile?]
x11-libs/libXft"
DEPEND="${RDEPEND}
dev-haskell/cabal"
S="${WORKDIR}/${MY_P}"
+
+PATCHES=("${FILESDIR}/${PN}-0.3-ghc72.patch")
diff --git a/dev-haskell/xml/Manifest b/dev-haskell/xml/Manifest
index c0189ba40a0c..13aa0a776651 100644
--- a/dev-haskell/xml/Manifest
+++ b/dev-haskell/xml/Manifest
@@ -1 +1,2 @@
+DIST xml-1.3.12.tar.gz 11921 RMD160 15265456fcfcc3ddd0746027ee679f17306f20f0 SHA1 c07bd8b388bf7491b0e8573516c5292e0a4efaa0 SHA256 51410e12facc989bad32133a58d3ffc624a2ce8e1b1b4cfc49c27fa0ecb7b8d2
DIST xml-1.3.8.tar.gz 11789 RMD160 68fcf8090c349f6cdd7879d416d0c9589b5864b8 SHA1 f440a852ac1e92dc0b7187e2cdcee7b2a4942dba SHA256 5da2ce4b6424fa98c7e1f79cc4875d40646d5ed95b053e36f71fa70488f81b59
diff --git a/dev-haskell/xml/xml-1.3.12.ebuild b/dev-haskell/xml/xml-1.3.12.ebuild
new file mode 100644
index 000000000000..e7acc8ad52a8
--- /dev/null
+++ b/dev-haskell/xml/xml-1.3.12.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/xml/xml-1.3.12.ebuild,v 1.1 2012/03/04 04:30:07 gienah Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI="4"
+
+CABAL_FEATURES="lib profile haddock hscolour hoogle"
+inherit haskell-cabal
+
+DESCRIPTION="A simple XML library."
+HOMEPAGE="http://code.galois.com"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/text[profile?]
+ >=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+ dev-haskell/cabal"
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 64a79bf753db..74ec12748196 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -2,4 +2,5 @@ DIST ecjsrc-3.4.zip 1280774 RMD160 8d12a84b9ff2b8df252bdc06309558559ce91d2e SHA1
DIST ecjsrc-3.5.2.zip 1298691 RMD160 f6dc987418682dd9d776a692383a37497656fc04 SHA1 7d79ac9602ffa825f6f3ea8ab5a3387b687f5215 SHA256 4ae91449962b1e2781b70713e299f9fa16fb1ce25a4d2bb335c13b55c08d6d74
DIST ecjsrc-3.6.zip 1310484 RMD160 82d9980aa4e6be1014d1bac396cceb2ab304cee3 SHA1 9bfda69c7c8528ecfe1b6cbcbe976b642069ca9c SHA256 bc2d624c5ca135d593c71a677674509f5801998ffe98c386749d15a46ee69242
DIST ecjsrc-3.7.1.jar 1365199 RMD160 bc6c18ad68544b2a3071e769fe395633db232793 SHA1 fcf9751ba022c340e2d01456462ea4949ceee991 SHA256 d8567a5de289b750dd9853654aeb941a8e48766b1d7ae80803c71d1f47fbe9b4
+DIST ecjsrc-3.7.2.jar 1366333 RMD160 628827d9bed955078db412976204fc785cf2f882 SHA1 75d8b5b90ff3bac912e06aa94f0f09fe5bc81c7a SHA256 755d871c3066f15cfaf5ea84075527eb97c92f9685058c3a326057e797f69e6b
DIST ecjsrc.zip 1215250 RMD160 938320ae54050e322bbb98c78b0e86d241862153 SHA1 e08a27fd77e5ac7af8f2c84beed175cd3fdd0c60 SHA256 f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild
new file mode 100644
index 000000000000..35e1dbb2ffb3
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-3.7.2.ebuild,v 1.1 2012/03/03 22:15:57 caster Exp $
+
+EAPI=4
+
+inherit java-pkg-2
+
+DMF="R-${PV}-201202080800"
+S="${WORKDIR}"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF/.0}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+SLOT="3.7"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4
+ ~dev-java/eclipse-ecj-${PV}
+ >=dev-java/ant-core-1.7"
+DEPEND="${RDEPEND}
+ app-arch/unzip
+ >=virtual/jdk-1.4"
+
+src_unpack() {
+ unpack ${A}
+ mkdir -p src/org/eclipse/jdt/{core,internal}
+ cp org/eclipse/jdt/core/JDTCompilerAdapter.java \
+ src/org/eclipse/jdt/core || die
+ cp -r org/eclipse/jdt/internal/antadapter \
+ src/org/eclipse/jdt/internal || die
+ rm -fr about* org
+}
+
+src_compile() {
+ cd src
+ java-pkg_filter-compiler jikes
+ ejavac -classpath "$(java-pkg_getjars ant-core,eclipse-ecj-${SLOT})" \
+ $(find org/ -name '*.java') || die "ejavac failed!"
+ find org/ -name '*.class' -o -name '*.properties' | \
+ xargs jar cf "${S}/${PN}.jar" || die "jar failed!"
+}
+
+src_install() {
+ java-pkg_dojar ${PN}.jar
+ insinto /usr/share/java-config-2/compiler
+ doins "${FILESDIR}/ecj-${SLOT}"
+}
diff --git a/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild b/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild
index dcc9b26e8841..3dd5c40585e0 100644
--- a/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild
+++ b/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild
@@ -1,14 +1,21 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild,v 1.2 2012/02/20 15:57:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-nodeps/ant-nodeps-1.8.2.ebuild,v 1.3 2012/03/03 22:53:27 caster Exp $
EAPI="4"
ANT_TASK_DEPNAME=""
+ANT_TASK_DISABLE_VM_DEPS="true"
inherit ant-tasks
-DESCRIPTION="Apache Ant's optional tasks requiring no external deps"
+# to disable vm switching
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+# disable QA notice
+JAVA_PKG_BSFIX="no"
+
+DESCRIPTION="Formerly Ant's optional tasks w/o external deps, now compat empty jar"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
diff --git a/dev-java/cortado/Manifest b/dev-java/cortado/Manifest
new file mode 100644
index 000000000000..8d2e54ef257d
--- /dev/null
+++ b/dev-java/cortado/Manifest
@@ -0,0 +1 @@
+DIST cortado-0.6.0.tar.gz 233854 RMD160 99de4bfce18c979a1c6479730df62dde9fc5364e SHA1 33b56d6a7e8a1d72a8a0ec0a4e069d0499b49ace SHA256 37a708bfceba5b7b0b544456bb3857f708c83734dfb3f3f1ababcc602b923e85
diff --git a/dev-java/cortado/cortado-0.6.0.ebuild b/dev-java/cortado/cortado-0.6.0.ebuild
new file mode 100644
index 000000000000..df874c12b9a8
--- /dev/null
+++ b/dev-java/cortado/cortado-0.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/cortado/cortado-0.6.0.ebuild,v 1.2 2012/03/03 20:39:34 tupone Exp $
+
+EAPI=2
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Multimedia framework for Java written by Fluendo"
+HOMEPAGE="http://www.theora.org/cortado/"
+SRC_URI="http://downloads.xiph.org/releases/cortado/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+
+COMMON_DEP=""
+
+RDEPEND=">=virtual/jre-1.4
+ ${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+ app-arch/unzip
+ ${COMMON_DEP}"
+
+EANT_BUILD_TARGET=stripped
+
+src_install() {
+ java-pkg_newjar output/dist/applet/${PN}-ovt-stripped-${PV}.jar
+ dodoc ChangeLog HACKING NEWS README RELEASE TODO \
+ || die "dodoc failed"
+}
diff --git a/dev-java/cortado/metadata.xml b/dev-java/cortado/metadata.xml
new file mode 100644
index 000000000000..ff5db0ba4080
--- /dev/null
+++ b/dev-java/cortado/metadata.xml
@@ -0,0 +1,22 @@
+
+
+
+ java
+
+ tupone@gentoo.org
+ Tupone Alfredo
+
+
+ Cortado is an open-source cross-browser and cross-platform video
+ playback solution based upon Java technology. Leveraging the huge
+ installation base of Java it allows web-authors to deliver Ogg Theora
+ content without having to worry about the media playback setup
+ installed on customers' machines. This enables e.g. Wikipedia to
+ deliver Ogg Theora video content embedded into articles to millions of
+ users. Originally developed at Fluendo, Cortado's latest versions are
+ now maintained by Xiph.org. If you're interested in using free media
+ delivery technology, e.g. to avoid the costs adjunctive to non-free
+ technologies like H.264, and want to reach a big potential user base,
+ Cortado may be the solution you've been looking for.
+
+
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index 64a79bf753db..74ec12748196 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -2,4 +2,5 @@ DIST ecjsrc-3.4.zip 1280774 RMD160 8d12a84b9ff2b8df252bdc06309558559ce91d2e SHA1
DIST ecjsrc-3.5.2.zip 1298691 RMD160 f6dc987418682dd9d776a692383a37497656fc04 SHA1 7d79ac9602ffa825f6f3ea8ab5a3387b687f5215 SHA256 4ae91449962b1e2781b70713e299f9fa16fb1ce25a4d2bb335c13b55c08d6d74
DIST ecjsrc-3.6.zip 1310484 RMD160 82d9980aa4e6be1014d1bac396cceb2ab304cee3 SHA1 9bfda69c7c8528ecfe1b6cbcbe976b642069ca9c SHA256 bc2d624c5ca135d593c71a677674509f5801998ffe98c386749d15a46ee69242
DIST ecjsrc-3.7.1.jar 1365199 RMD160 bc6c18ad68544b2a3071e769fe395633db232793 SHA1 fcf9751ba022c340e2d01456462ea4949ceee991 SHA256 d8567a5de289b750dd9853654aeb941a8e48766b1d7ae80803c71d1f47fbe9b4
+DIST ecjsrc-3.7.2.jar 1366333 RMD160 628827d9bed955078db412976204fc785cf2f882 SHA1 75d8b5b90ff3bac912e06aa94f0f09fe5bc81c7a SHA256 755d871c3066f15cfaf5ea84075527eb97c92f9685058c3a326057e797f69e6b
DIST ecjsrc.zip 1215250 RMD160 938320ae54050e322bbb98c78b0e86d241862153 SHA1 e08a27fd77e5ac7af8f2c84beed175cd3fdd0c60 SHA256 f41194a9580023afd11d18b82f6815b064af83c4f9ca407a40cd8d960bd112cc
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.7.2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.7.2.ebuild
new file mode 100644
index 000000000000..ba569b6efd9a
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.7.2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.7.2.ebuild,v 1.1 2012/03/03 22:15:42 caster Exp $
+
+EAPI="4"
+
+inherit java-pkg-2
+
+MY_PN="ecj"
+DMF="R-${PV}-201202080800"
+S="${WORKDIR}"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops/${DMF}/${MY_PN}src-${PV}.jar"
+
+IUSE="+ant userland_GNU"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="3.7"
+
+CDEPEND=">=app-admin/eselect-ecj-0.3"
+
+JAVA_PKG_WANT_SOURCE=1.4
+JAVA_PKG_WANT_TARGET=1.4
+
+DEPEND="${CDEPEND}
+ app-arch/unzip
+ >=virtual/jdk-1.6
+ userland_GNU? ( sys-apps/findutils )"
+RDEPEND="${CDEPEND}
+ >=virtual/jre-1.4"
+PDEPEND="ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # These have their own package.
+ rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+ rm -fr org/eclipse/jdt/internal/antadapter || die
+
+ # upstream build.xml excludes this
+ rm META-INF/eclipse.inf
+}
+
+src_compile() {
+ local javac_opts javac java jar
+
+ javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1"
+ javac="$(java-config -c)"
+ java="$(java-config -J)"
+ jar="$(java-config -j)"
+
+ find org/ -path org/eclipse/jdt/internal/compiler/apt -prune -o \
+ -path org/eclipse/jdt/internal/compiler/tool -prune -o -name '*.java' \
+ -print > sources-1.4
+ find org/eclipse/jdt/internal/compiler/{apt,tool} -name '*.java' > sources-1.6
+
+ mkdir -p bootstrap || die
+ cp -pPR org bootstrap || die
+ cd "${S}/bootstrap" || die
+
+ einfo "bootstrapping ${MY_PN} with ${javac} ..."
+ ${javac} ${javac_opts} @../sources-1.4 || die
+ ${javac} -encoding ISO-8859-1 -source 1.6 -target 1.6 @../sources-1.6 || die
+
+ find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' \
+ | xargs ${jar} cf ${MY_PN}.jar
+
+ cd "${S}" || die
+ einfo "building ${MY_PN} with bootstrapped ${MY_PN} ..."
+ ${java} -classpath bootstrap/${MY_PN}.jar \
+ org.eclipse.jdt.internal.compiler.batch.Main \
+ ${javac_opts} -nowarn @sources-1.4 || die
+ ${java} -classpath bootstrap/${MY_PN}.jar \
+ org.eclipse.jdt.internal.compiler.batch.Main \
+ -encoding ISO-8859-1 -source 1.6 -target 1.6 -nowarn @sources-1.6 || die
+
+ find org/ -name '*.class' -o -name '*.properties' -o -name '*.rsc' \
+ | xargs ${jar} cf ${MY_PN}.jar
+}
+
+src_install() {
+ java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+ org.eclipse.jdt.internal.compiler.batch.Main
+
+ # disable the class version verify, this has intentionally
+ # some classes with 1.6, but most is 1.4
+ JAVA_PKG_STRICT="" java-pkg_dojar ${MY_PN}.jar
+}
+
+pkg_postinst() {
+ einfo "To select between slots of ECJ..."
+ einfo " # eselect ecj"
+
+ eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+ eselect ecj update
+}
diff --git a/dev-java/icedtea-bin/Manifest b/dev-java/icedtea-bin/Manifest
index 83edd10bc513..a95d783bae6c 100644
--- a/dev-java/icedtea-bin/Manifest
+++ b/dev-java/icedtea-bin/Manifest
@@ -1,40 +1,24 @@
-DIST icedtea-bin-core-6.1.10.4-amd64.tar.bz2 35176677 RMD160 187ebe23df94efcaad05c675853f1f24c6a1555b SHA1 e060202c69ab7ff46c5bef75673f33957a596b92 SHA256 26e7655179ec5bb55934e3cb804297e3d337808134fc7fe6eaeee4a43b8ed2b9
-DIST icedtea-bin-core-6.1.10.4-x86.tar.bz2 36140827 RMD160 528a60952f810f5d74396fd9bd0f87cc6a30c440 SHA1 6a1bfdea50b9fb1627178a066065eb1a0b1e71e7 SHA256 2ac6a1e3f45a6157bc10579f3316df1dda4cd22b0b87341fb45a834fde2027c0
-DIST icedtea-bin-core-6.1.11-amd64.tar.bz2 35204282 RMD160 6e75cb0b50dc33818b10e83b78141ca20f5ca5f6 SHA1 0d184f2191cb97a2f12ab8019433f18d99ba0de3 SHA256 a3f7ca28d68c9a1fc0f5a308e555b2f6aada516c2855c7d12073dc93f98ab501
-DIST icedtea-bin-core-6.1.11-x86.tar.bz2 36176130 RMD160 3358fbc6d59765bf2a844038a1f3add5481910b2 SHA1 80ebbba2b90102235294aaf77dddb7e96593c731 SHA256 358f7fc641ded45d39414f391ceee800677733bb0fa741b5c6ceafe05e78bad9
DIST icedtea-bin-core-6.1.11.1-amd64.tar.bz2 35211505 RMD160 25610ab514f8f4164cc6fc8c977ce16e08ef35b0 SHA1 c30e3babbe4a0310d27c1bc674d1bcfd8ab31f89 SHA256 499ab85ff5fab2e2132e8b7371d89b8de4d5c6fc683ae299dd10daa45ad55fd7
DIST icedtea-bin-core-6.1.11.1-x86.tar.bz2 36183796 RMD160 cd0bbac611b99dc14c8d1cbd10b50bb6ce36bd33 SHA1 d21d7f861640763d8f34904d6d3fd6bd8d969daf SHA256 00960af708e2a5d5a87506973b4f21a74549efd0bdcb3c6f3708a27044a94610
DIST icedtea-bin-core-7.2.0-amd64.tar.bz2 34275230 RMD160 da0edc7874649c0134129d355599eef24df4259b SHA1 2ea5a4cd4ec55fa57f470deee1daea930b57ac96 SHA256 88da5d66efd14ab383d2ea0299e12e4e9a0f6824f29af1d5432ad85e4a6984fe
DIST icedtea-bin-core-7.2.0-x86.tar.bz2 35266178 RMD160 a982492f36ffe20bbd8efdc7185ecf83910348cd SHA1 647b1637d2107f717c1efd350715e8b2cf65aa69 SHA256 f464b8b9c804c354b49cb6c74c0eddf79d3b0bca5968df63c9528cc44d96f7c1
-DIST icedtea-bin-doc-6.1.10.4.tar.bz2 11637503 RMD160 3b79217c5fe8f787c7989346a83deee9555c4451 SHA1 4db17acd1497008fe0c7e0700627172b7476530b SHA256 dba0fc8f96f563d21f145ad7831a930c2fccd4d02ca6adcc9aea41dc86c8feb3
+DIST icedtea-bin-core-7.2.1-amd64.tar.bz2 34422285 RMD160 3578c8e12097ad7c5c6870e526bb9d6c020da948 SHA1 babd3ace5589d03b90c761659314ad9978ab8f78 SHA256 7fd650d9d728986e76be8d613f7ac7cf72913a9636ff4b23727cc0c01343e114
+DIST icedtea-bin-core-7.2.1-x86.tar.bz2 35461188 RMD160 9030e99953a52b3e5ede137e9f6087821f5ef3ca SHA1 f74add08de2fc518943e8b5909667d3f583fae3d SHA256 9f6b1c902de4ef11e930e63fa4ce34e5e14291d0b9c13a89768d2d1b04e4bcfd
DIST icedtea-bin-doc-6.1.11.1.tar.bz2 11635130 RMD160 c2bae7e723def1bc905d904ce6c8684fef7c60b0 SHA1 178994b77202248c3c78c7e686920863fa003e8c SHA256 f4e520e5fc4c7b4a88e21e6a24b55f6dd703a1c8e2e8b71fa3171d8679a49d01
-DIST icedtea-bin-doc-6.1.11.tar.bz2 11634766 RMD160 e45f701368d4faf4a18a69e1862beb080909fa44 SHA1 c3112eb0179fe777ffbbf4b3aeb536f8c7a7de57 SHA256 d8bc135e0d26cff773faaf932deb03ef71d9488a2d3a90fc61cb37b64cb4089e
DIST icedtea-bin-doc-7.2.0.tar.bz2 12519410 RMD160 fdf8fd65700bc2c9b0a32730aec871c6449bdab7 SHA1 a80f11ec3ad523feaa4d3e5e9d467808af9b0640 SHA256 be5e289f073df942ccc5289f710bd35bdb1f5b002fde742720eef9b13015aa5d
-DIST icedtea-bin-examples-6.1.10.4-amd64.tar.bz2 2163621 RMD160 6bb155a63befb0b2231daa26da51b30d1a1858cd SHA1 a8df3ef61f22daf61040fab782eb27cd61f96d5f SHA256 9784f3003e1901d99f651c6d03d228c94ef79d1a40c3b4227a4a38a19862f3bf
-DIST icedtea-bin-examples-6.1.10.4-x86.tar.bz2 2132911 RMD160 11e394788fb863d6b956d6dd459266ed25a7a6d2 SHA1 ec723731dd25352916a53b4ecbe29c22ceedbcc1 SHA256 8e5693b299af618ab70c50cfd8f5add0ce952aff41f41be802572beca04f608c
-DIST icedtea-bin-examples-6.1.11-amd64.tar.bz2 2164095 RMD160 06566ff7a05f0065e8a009eb83df9dc784bb93ce SHA1 7de6657de04da7b1c713aba9f8d36983602a99d3 SHA256 25a9bb252af1e09bce30ace182841b3070add012628ea3b753f2db886f925ecc
-DIST icedtea-bin-examples-6.1.11-x86.tar.bz2 2132561 RMD160 1c025a6287e19e2c7b8b25537b2580f5f2b64c60 SHA1 c6faf3a9c95c71c8cd67f50e7172869a77e002d6 SHA256 bc617b72feb708e70f816f2c60a10e2767a3ecf904bd121860d5d12dbce6ebeb
+DIST icedtea-bin-doc-7.2.1.tar.bz2 12518295 RMD160 eda11e9dc5a8b133d0eab93f3597a8f023a94a5d SHA1 4d0a402f87b9a783dfbee939542b68a90a16bf08 SHA256 5061f824c2888bad2aebb28930f74a64f5f913d175849c3ee16d8291fe79f398
DIST icedtea-bin-examples-6.1.11.1-amd64.tar.bz2 2164582 RMD160 12bcfaa380a8119178200bcd5f3ecc11f82c5aa8 SHA1 edc614ad9d70f4126dbab410e7032a2b5dd32786 SHA256 d1ac0a1f5d24b1b420c02fd1c4fad20d001a26633453c79c10105b58f0f2b255
DIST icedtea-bin-examples-6.1.11.1-x86.tar.bz2 2133905 RMD160 224128b4204d8ca3ee837c3f812d0f125d2b5034 SHA1 073c5b848f2b634d208bd74b77b5839c94ba4479 SHA256 27bc3312c52de408999a22f3d5bed40acfe04406702f65dc9759c4378be5716b
DIST icedtea-bin-examples-7.2.0-amd64.tar.bz2 2255942 RMD160 2443919fba3e1070a366f98fc63b63e8c7b417ae SHA1 cfeda7742a5af160bd8b8bebe1e9e7c2873018ed SHA256 8b775106f3648a0be6dfd149da9cdc30ba5751be3e70726cb36b4ef35d76ef86
DIST icedtea-bin-examples-7.2.0-x86.tar.bz2 2240784 RMD160 46e88354297d7540c18cbe229e7c72a9eb124c03 SHA1 14ca7a58d855fc0703d76ddc446ef206a858047e SHA256 4db0ddd883ca67e60e85ea5cb337504a7e97455327b3581e8d3535471855a53c
-DIST icedtea-bin-nsplugin-6.1.10.4-amd64.tar.bz2 907232 RMD160 6b6fb67ac9db0ece06f75852809600a0960e8b14 SHA1 e60e6607566803defe31f2e4be559ad5cdef8dae SHA256 b90b8a04e9d2b090a4b34bc6e0b9eb6a6199441cccfdd44f0aba423282179501
-DIST icedtea-bin-nsplugin-6.1.10.4-x86.tar.bz2 900726 RMD160 40aaac18af5f189c93a8fde4bd2b153bbca15dfe SHA1 68d74fd90aa3e6a6ba25e1078e4c0293a29329a8 SHA256 ba2b9c8dc27a301a37612d4469b0c878e25b37862021a347136e15eb3451c6ad
-DIST icedtea-bin-nsplugin-6.1.11-amd64.tar.bz2 906880 RMD160 47d54ad95d3ba505ef3b3e294c2a54b06acd2ad2 SHA1 b84d5d1f7c17af69442051ec082d207cb4f642bd SHA256 1ed4716f57f61d58435afa98406d615bb0587ea57396021f3b98efc6e142d989
-DIST icedtea-bin-nsplugin-6.1.11-x86.tar.bz2 900838 RMD160 4ceb32f7ecad134ec30be28369bf3d8c8fb5a4b2 SHA1 6a428985d43edcf33fd064091cfc83d6dea6bd3c SHA256 82d11ac1e5fd12fab5e9dd7ffd5b3964580cb4a20feb66d3c8765722f1910dce
+DIST icedtea-bin-examples-7.2.1-amd64.tar.bz2 2332698 RMD160 e46d06c2f9cb7c2ecb9ed2170571eb7f9a4fb728 SHA1 3bbe01386740e52a7676e0135d9bf7deb04ca381 SHA256 7fff369709838edcf84303d5fc3c12233ef4024a5b0c13a0fe5ca4be84e93389
+DIST icedtea-bin-examples-7.2.1-x86.tar.bz2 2309914 RMD160 c85bfe2265836cfb072ded11eadbd7dd25703af1 SHA1 56b5b5e38ba5d748aa08ac256dee4289566dc52f SHA256 4e176609ba23bb65226335fe20a19d7f79bbde35b19d11846dac277e5f33ee99
DIST icedtea-bin-nsplugin-6.1.11.1-amd64.tar.bz2 906944 RMD160 b2134ef14404587be943bae566cdfd26364cb3ad SHA1 fc940bb5a0d18e6c00ce681bcbadb73efd375662 SHA256 d9680a0e787d96edce5c4730cabc17df17047705badc33e0da0eaf69385c7b00
DIST icedtea-bin-nsplugin-6.1.11.1-x86.tar.bz2 900804 RMD160 2c85b5e6484106727fdd225bb726550a00383633 SHA1 577bb5fb73acd3ceeac65475198c5d9cb404c1bd SHA256 56d2d1f357e9fcb20ec7648ae7a14f77a30f9feb24916787e00fadeac5d3b8bd
DIST icedtea-bin-nsplugin-7.2.0-amd64.tar.bz2 942826 RMD160 9c0921a685d7cfb787081025b97afea7d8f59e41 SHA1 fa12b6c313da541a2be7f1621548da632f4b26fc SHA256 b7451d2cabd113b6622250731db8d1d31e596437f5a91cdbd03a04bb13679d34
DIST icedtea-bin-nsplugin-7.2.0-x86.tar.bz2 936501 RMD160 ae1525eb3079ddfeae83f331dec1174d26822deb SHA1 6f8da0307172ef979cd5fca628c9652f98e63327 SHA256 1777b4d4954793d535e7f681f6809cdc4ac48855e0fb1414dc9adfeb26b94498
-DIST icedtea-bin-src-6.1.10.4.tar.bz2 40826041 RMD160 98e55e1e5a0a998e5cb686b83f72a5788413abfa SHA1 9c0d2e100a4d349d4ae8207bfceba531115c2bdd SHA256 7c935f41fd254ba1ca9b95a0452d6b319dc838a2c189ed426fa15f8260d4d092
+DIST icedtea-bin-nsplugin-7.2.1-amd64.tar.bz2 942956 RMD160 5687b44950199be2b8301d74289d42596a0f56a6 SHA1 fc5f6952af1371f5ba86010fb2ee928aee401b2e SHA256 9b17ae63c0b3197e85953f90e84475eb6368fee9ee4bc23264c219a991edbe35
+DIST icedtea-bin-nsplugin-7.2.1-x86.tar.bz2 936221 RMD160 2c8fbd9cbf82af0772e940a4e9455826ef6b00e9 SHA1 99a4607fd43aff590f77ca545ea65e10248c0b39 SHA256 ff411dd903a7eb369f4ce3c27205411a2d7f05f00d2a1507ee95dce8795aa64d
DIST icedtea-bin-src-6.1.11.1.tar.bz2 40849905 RMD160 3a973f14ee45df2cc85056bcfd3a979c152c5b33 SHA1 173394b5ce77cb006592d121fd29221a6e5cf5f4 SHA256 5bee086bcd2774cdc8b31df53ffd455f2d77026244b947f815206cb363196eb9
-DIST icedtea-bin-src-6.1.11.tar.bz2 40848115 RMD160 3a74642c558336b1114a1644d6de54f88901efd0 SHA1 312481ccb66903124e3596e5734d1b215b13e9d1 SHA256 d7d960f5ad6ff7eb84ee3b54cd23f5fd49c5d84c876f94852fcb00c3366a5d92
DIST icedtea-bin-src-7.2.0.tar.bz2 41228114 RMD160 efd44d62e5213ccdefec460bdd360b4e024a9714 SHA1 55d60e3bbdc2af95d3799c8fef776a17ef38ccb2 SHA256 cca3216ce6dfc8a10eb62bc615f6b4460983950fb977ff4b38874effe81cc3c5
-DIST icedtea6-bin-core-1.10.4-amd64.tar.bz2 35182604 RMD160 b073884ce59c30303af3de7c05aa5324432c69d7 SHA1 9ad772cfaf755c1cf0d6261e10d2b48c016497b0 SHA256 3ab2d27f9ce6024854be87dd440da3a615f77f2afaac7fea5bf3a99f65c324f2
-DIST icedtea6-bin-core-1.10.4-x86.tar.bz2 36141759 RMD160 5d8eceeb6c68ed4bf349a5cfd168e2c6ff1fe83f SHA1 5fd628c6245f58357876336ab8c23a69ae3fe027 SHA256 0e11bdce0a3ec196d088a8e067a41d879f56c4fd75d4a24fa8d4b49d18a67a6f
-DIST icedtea6-bin-doc-1.10.4.tar.bz2 11635657 RMD160 9e5bf35f3a8205bb1c89a816ddb2eff05fc09141 SHA1 38b0740d015dd4a4ad1dcd348581710d7ec512a3 SHA256 43fe4bc069222fdda85fb03e0ad31f8c0d4a46fab22a64a4b09cecb22f73216f
-DIST icedtea6-bin-examples-1.10.4-amd64.tar.bz2 2163675 RMD160 96f03ac17528cb0053a821fb2deb87b0f154b954 SHA1 9841620b29ebf530f3b1ebdce6a540ced91a03be SHA256 801d807d03a874ec60c04c89b441604cf28a55186ae50ed29c41488ea24fb05f
-DIST icedtea6-bin-examples-1.10.4-x86.tar.bz2 2132874 RMD160 60dd79e57f70117d547b00b9baeb948a95e52793 SHA1 7870cccc74b544d412bd0053bc75ff78b38de043 SHA256 f7801df925be998ce11bb0f8340154f2113ccea6163e544133163a623a8ce6ec
-DIST icedtea6-bin-nsplugin-1.10.4-amd64.tar.bz2 907288 RMD160 a97e343c99909ceedf6dcff6fa1429ff9e3ed4e5 SHA1 2f73c33a5b17ea03f1f37f4a2446bf8d4141fd0d SHA256 6d832600bcb5bacd37cbb94e948dfb94f3472fd90b92009184b56fb66300d8d1
-DIST icedtea6-bin-nsplugin-1.10.4-x86.tar.bz2 900912 RMD160 bd90075b7784463dcc1c2e37e740619e032402b0 SHA1 251ccd527c8b2ddd38f3c92320687eecfd4e09d1 SHA256 4cc4ece22041fd659bcb1e3364c376a45c16d0ddc97b141e93591e9c171feaf9
-DIST icedtea6-bin-src-1.10.4.tar.bz2 40827387 RMD160 d6a610b3dc5ef5dd5e9e33e0e38f93e225c37394 SHA1 54f3ad33bfc1e512165e8de7e954c77c22ff0714 SHA256 d85de113997f4b8978d3b9312dfcd88d50debbf673118615e5a72244b56e8eab
+DIST icedtea-bin-src-7.2.1.tar.bz2 41253138 RMD160 a007f59d8639cb089db3584c96a2f8a66cc685a3 SHA1 1e2abb2f26f6ba054e8f149f70ef1214820c8ed1 SHA256 7ae867a543e93a415f463f953b82deb650a37253fb469c9dbf7fb3068f409bb2
diff --git a/dev-java/icedtea-bin/files/icedtea6-bin.env b/dev-java/icedtea-bin/files/icedtea6-bin.env
deleted file mode 100644
index 606b4ace61cd..000000000000
--- a/dev-java/icedtea-bin/files/icedtea6-bin.env
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/files/icedtea6-bin.env,v 1.1 2011/10/30 13:53:19 caster Exp $
-
-VERSION="IcedTea6-bin @PV@"
-JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea6-bin-@PV@"
-JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea6-bin-@PV@"
-JAVAC=${JAVA_HOME}/bin/javac
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
-LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
-MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/icedtea6-bin-@PV@/man"
-PROVIDES_TYPE="JDK JRE"
-PROVIDES_VERSION="1.6"
-# Taken from sun.boot.class.path property
-BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"
diff --git a/dev-java/icedtea-bin/icedtea-bin-1.10.4.ebuild b/dev-java/icedtea-bin/icedtea-bin-1.10.4.ebuild
deleted file mode 100644
index 12b4706b17d5..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-1.10.4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-1.10.4.ebuild,v 1.2 2011/11/01 11:18:26 chainsaw Exp $
-
-EAPI="3"
-
-inherit java-vm-2
-
-# this ebuild is for package+slot move from icedtea6-bin
-# and the installation thus follows the old layout
-# future versions will change it
-XPN="icedtea6-bin"
-XP="${XPN}-${PV}"
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK"
-TARBALL_VERSION="${PV}"
-SRC_URI="amd64? ( ${dist}/${XPN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
- x86? ( ${dist}/${XPN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
- doc? ( ${dist}/${XPN}-doc-${TARBALL_VERSION}.tar.bz2 )
- examples? (
- amd64? ( ${dist}/${XPN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
- x86? ( ${dist}/${XPN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
- )
- nsplugin? (
- amd64? ( ${dist}/${XPN}-nsplugin-${TARBALL_VERSION}-amd64.tar.bz2 )
- x86? ( ${dist}/${XPN}-nsplugin-${TARBALL_VERSION}-x86.tar.bz2 )
- )
- source? ( ${dist}/${XPN}-src-${TARBALL_VERSION}.tar.bz2 )"
-HOMEPAGE="http://icedtea.classpath.org"
-
-IUSE="X alsa doc examples nsplugin source"
-RESTRICT="strip"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="6"
-KEYWORDS="amd64 x86"
-
-S="${WORKDIR}/${XP}"
-
-RDEPEND=">=sys-devel/gcc-4.3
- >=sys-libs/glibc-2.11.2
- >=media-libs/giflib-4.1.6-r1
- virtual/jpeg
- >=media-libs/libpng-1.5
- >=sys-libs/zlib-1.2.3-r1
- "
-PDEPEND="
- alsa? ( >=media-libs/alsa-lib-1.0.20 )
- X? (
- >=media-libs/freetype-2.3.9:2
- >=media-libs/fontconfig-2.6.0-r2:1.0
- >=x11-libs/libXext-1.1
- >=x11-libs/libXi-1.3
- >=x11-libs/libXtst-1.1
- >=x11-libs/libX11-1.3
- x11-libs/libXt
- )
- nsplugin? (
- >=dev-libs/atk-1.30.0
- >=dev-libs/glib-2.20.5:2
- >=dev-libs/nspr-4.8
- >=x11-libs/cairo-1.8.8
- >=x11-libs/gtk+-2.20.1:2
- >=x11-libs/pango-1.24.5
- )"
-DEPEND=""
-
-pkg_setup() {
- java-vm-2_pkg_setup
- VMHANDLE="${XPN}"
-}
-
-src_install() {
- local dest="/opt/${XP}"
- local ddest="${D}/${dest}"
- dodir "${dest}" || die
-
- local arch=${ARCH}
-
- # doins can't handle symlinks.
- cp -pRP bin include jre lib man "${ddest}" || die "failed to copy"
-
- dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README} || die
- if use doc ; then
- dohtml -r ../doc/html/* || die "Failed to install documentation"
- fi
-
- if use examples; then
- cp -pRP share/{demo,sample} "${ddest}" || die
- fi
-
- if use source ; then
- cp src.zip "${ddest}" || die
- fi
-
- if use nsplugin ; then
- cd ..
- cp -pPR icedtea6-web-bin "${D}/opt/"
- install_mozilla_plugin "/opt/icedtea6-web-bin/$(get_libdir)/IcedTeaPlugin.so"
- docinto icedtea-web
- dodoc doc/icedtea-web/*
- fi
-
- set_java_env
- java-vm_revdep-mask "/opt/${XP}"
-}
-
-pkg_postinst() {
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-
- if use nsplugin; then
- elog "The icedtea6-bin browser plugin can be enabled using eselect java-nsplugin"
- elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
- elog "such as Firefox 3.5+ and recent Chromium versions."
- fi
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.10.4-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.10.4-r1.ebuild
deleted file mode 100644
index 8d91d0c7f011..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.10.4-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.10.4-r1.ebuild,v 1.2 2012/02/13 21:33:33 caster Exp $
-
-EAPI="4"
-
-inherit java-vm-2 prefix
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-TARBALL_VERSION="${PV}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-SRC_URI="
- amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
- x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
- doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
- examples? (
- amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
- x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
- )
- nsplugin? (
- amd64? ( ${dist}/${PN}-nsplugin-${TARBALL_VERSION}-amd64.tar.bz2 )
- x86? ( ${dist}/${PN}-nsplugin-${TARBALL_VERSION}-x86.tar.bz2 )
- )
- source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="6"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+X +alsa cjk +cups doc examples nsplugin source"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
-
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0.20"
-CUPS_COMMON_DEP="
- >=net-print/cups-1.4"
-X_COMMON_DEP="
- dev-libs/glib
- >=media-libs/freetype-2.3.9:2
- >=x11-libs/gtk+-2.20.1:2
- >=x11-libs/libX11-1.3
- >=x11-libs/libXext-1.1
- >=x11-libs/libXi-1.3
- >=x11-libs/libXtst-1.1"
-
-COMMON_DEP="
- >=media-libs/giflib-4.1.6-r1
- >=media-libs/libpng-1.5
- >=sys-devel/gcc-4.3
- >=sys-libs/glibc-2.11.2
- >=sys-libs/zlib-1.2.3-r1
- virtual/jpeg
- nsplugin? (
- >=dev-libs/atk-1.30.0
- >=dev-libs/glib-2.20.5:2
- >=dev-libs/nspr-4.8
- >=x11-libs/cairo-1.8.8
- >=x11-libs/pango-1.24.5
-
- )"
-
-RDEPEND="${COMMON_DEP}
- X? (
- ${X_COMMON_DEP}
- media-fonts/dejavu
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- )
- alsa? ( ${ALSA_COMMON_DEP} )
- cups? ( ${CUPS_COMMON_DEP} )"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}/${dest}"
- dodir "${dest}"
-
- # Ensures HeadlessGraphicsEnvironment is used.
- if ! use X; then
- rm -r jre/lib/$(get_system_arch)/xawt || die
- fi
-
- # doins can't handle symlinks.
- cp -pRP bin include jre lib man "${ddest}" || die
-
- # Remove on next bump as the needed marks are already set by icedtea ebuild.
- java-vm_set-pax-markings "${ddest}"
-
- dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
-
- if use doc; then
- dohtml -r ../doc/html/*
- fi
-
- if use examples; then
- cp -pRP share/{demo,sample} "${ddest}" || die
- fi
-
- if use source; then
- cp src.zip "${ddest}" || die
- fi
-
- if use nsplugin; then
- cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
- install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
- docinto icedtea-web
- dodoc ../doc/icedtea-web/*
- fi
-
- # Remove after next bump, handled by icedtea ebuild. Bug 390663
- cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
- eprefixify "${T}"/fontconfig.Gentoo.properties
- insinto "${dest}"/jre/lib
- doins "${T}"/fontconfig.Gentoo.properties
-
- set_java_env
- java-vm_revdep-mask "${dest}"
-}
-
-pkg_preinst() {
- if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
- # portage would preserve the symlink otherwise, related to bug #384397
- rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
- elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
- elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
- elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
- elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
- elog "and the same holds for any user VM settings. Sorry for the inconvenience."
- fi
-}
-
-pkg_postinst() {
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-
- if use nsplugin; then
- elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
- elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
- elog "such as Firefox 3.5+ and recent Chromium versions."
- fi
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.11.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.1.ebuild
similarity index 76%
rename from dev-java/icedtea-bin/icedtea-bin-6.1.11.ebuild
rename to dev-java/icedtea-bin/icedtea-bin-7.2.1.ebuild
index 314ca7ed41a4..efac259c5637 100644
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.11.ebuild
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.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-java/icedtea-bin/icedtea-bin-6.1.11.ebuild,v 1.1 2012/02/14 07:46:36 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.1.ebuild,v 1.1 2012/03/03 21:25:31 caster Exp $
EAPI="4"
@@ -26,7 +26,7 @@ SRC_URI="
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
LICENSE="GPL-2-with-linking-exception"
-SLOT="6"
+SLOT="7"
KEYWORDS="~amd64 ~x86"
IUSE="+X +alsa cjk +cups doc examples nsplugin source"
@@ -38,32 +38,33 @@ ALSA_COMMON_DEP="
CUPS_COMMON_DEP="
>=net-print/cups-1.4"
X_COMMON_DEP="
- dev-libs/glib
- >=media-libs/freetype-2.3.9:2
- >=x11-libs/gtk+-2.20.1:2
- >=x11-libs/libX11-1.3
- >=x11-libs/libXext-1.1
- >=x11-libs/libXi-1.3
- >=x11-libs/libXtst-1.1"
+ >=dev-libs/atk-1.30.0
+ >=dev-libs/glib-2.20.5:2
+ >=media-libs/fontconfig-2.6.0-r2:1.0
+ >=media-libs/freetype-2.3.9:2
+ >=x11-libs/cairo-1.8.8
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.20.1:2
+ >=x11-libs/libX11-1.3
+ >=x11-libs/libXext-1.1
+ >=x11-libs/libXi-1.3
+ x11-libs/libXrender
+ >=x11-libs/libXtst-1.1
+ >=x11-libs/pango-1.24.5"
COMMON_DEP="
>=media-libs/giflib-4.1.6-r1
+ media-libs/lcms:2
>=media-libs/libpng-1.5
>=sys-devel/gcc-4.3
>=sys-libs/glibc-2.11.2
>=sys-libs/zlib-1.2.3-r1
- virtual/jpeg
- nsplugin? (
- >=dev-libs/atk-1.30.0
- >=dev-libs/glib-2.20.5:2
- >=dev-libs/nspr-4.8
- >=x11-libs/cairo-1.8.8
- >=x11-libs/pango-1.24.5
-
- )"
+ virtual/jpeg"
+# cups is needed for X. #390945 #390975
RDEPEND="${COMMON_DEP}
X? (
+ ${CUPS_COMMON_DEP}
${X_COMMON_DEP}
media-fonts/dejavu
cjk? (
@@ -122,25 +123,14 @@ src_install() {
set_java_env
java-vm_revdep-mask "${dest}"
-}
-
-pkg_preinst() {
- if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
- # portage would preserve the symlink otherwise, related to bug #384397
- rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
- elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
- elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
- elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
- elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
- elog "and the same holds for any user VM settings. Sorry for the inconvenience."
- fi
+ java-vm_sandbox-predict /proc/self/coredump_filter
}
pkg_postinst() {
# Set as default VM if none exists
java-vm-2_pkg_postinst
- if use nsplugin; then
+ if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
elog "such as Firefox 3.5+ and recent Chromium versions."
diff --git a/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch b/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch
index 9827bcc6bd65..4f65145913c9 100644
--- a/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch
+++ b/dev-java/icedtea-web/files/fix-plugin-in-icedtea-7.patch
@@ -264,73 +264,6 @@ diff -r f0647c938535 -r 77640d74d21c netx/net/sourceforge/jnlp/PluginBridge.java
usePack = false;
useVersion = false;
String jargs = atts.get("java_arguments");
-diff -r f0647c938535 -r 77640d74d21c netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java
---- a/netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java Sat Jan 07 02:48:05 2012 -0500
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,63 +0,0 @@
--// Copyright (C) 2001-2003 Jon A. Maxwell (JAM)
--//
--// This library is free software; you can redistribute it and/or
--// modify it under the terms of the GNU Lesser General Public
--// License as published by the Free Software Foundation; either
--// version 2.1 of the License, or (at your option) any later version.
--//
--// This library is distributed in the hope that it will be useful,
--// but WITHOUT ANY WARRANTY; without even the implied warranty of
--// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
--// Lesser General Public License for more details.
--//
--// You should have received a copy of the GNU Lesser General Public
--// License along with this library; if not, write to the Free Software
--// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--
--package net.sourceforge.jnlp.runtime;
--
--/**
-- * Thread group for a JNLP application.
-- *
-- * @author Jon A. Maxwell (JAM) - initial author
-- * @version $Revision: 1.1 $
-- */
--public class AppThreadGroup extends ThreadGroup {
--
-- /** the app */
-- private ApplicationInstance app = null;
--
-- /**
-- * Creates new JavaAppThreadGroup
-- *
-- * @param name of the App
-- */
-- public AppThreadGroup(ThreadGroup parent, String name) {
-- super(parent, name);
-- }
--
-- /**
-- * Sets the JNLP app this group is for; can only be called once.
-- */
-- public void setApplication(ApplicationInstance app) {
-- if (this.app != null)
-- throw new IllegalStateException("Application can only be set once");
--
-- this.app = app;
-- }
--
-- /**
-- * Returns the JNLP app for this thread group.
-- */
-- public ApplicationInstance getApplication() {
-- return app;
-- }
--
-- /**
-- * Handle uncaught exceptions for the app.
-- */
-- public void uncaughtException(Thread t, Throwable e) {
-- super.uncaughtException(t, e);
-- }
--
--}
diff -r f0647c938535 -r 77640d74d21c plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Sat Jan 07 02:48:05 2012 -0500
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java Fri Apr 29 16:58:05 2011 -0400
diff --git a/dev-java/icedtea-web/icedtea-web-1.1.4-r8.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.4-r8.ebuild
index 789215e5752d..5d3db0638900 100644
--- a/dev-java/icedtea-web/icedtea-web-1.1.4-r8.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.1.4-r8.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-java/icedtea-web/icedtea-web-1.1.4-r8.ebuild,v 1.1 2012/03/02 23:21:55 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.4-r8.ebuild,v 1.2 2012/03/03 21:51:25 caster Exp $
# Build written by Andrew John Hughes (ahughes@redhat.com)
EAPI="4"
@@ -61,6 +61,7 @@ src_prepare() {
epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
# this should be included in next release, plugin doesn't work without it
epatch "${FILESDIR}"/fix-plugin-in-icedtea-7.patch
+ rm netx/net/sourceforge/jnlp/runtime/AppThreadGroup.java || die
eautoreconf
}
diff --git a/dev-java/miglayout/miglayout-4.0.ebuild b/dev-java/miglayout/miglayout-4.0.ebuild
index 2c6131e4df09..95db0ac3ea43 100644
--- a/dev-java/miglayout/miglayout-4.0.ebuild
+++ b/dev-java/miglayout/miglayout-4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/miglayout/miglayout-4.0.ebuild,v 1.1 2011/12/28 16:24:33 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/miglayout/miglayout-4.0.ebuild,v 1.2 2012/03/03 20:37:47 tupone Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="http://www.migcalendar.com/miglayout/versions/${PV}/${P}-sources.jar"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE="swt"
COMMON_DEP="
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 790289b967cf..c64eea208115 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -10,3 +10,6 @@ DIST swt-3.6.1-gtk-linux-x86_64.zip 5529321 RMD160 577c13612ce625d6aea97583cd511
DIST swt-3.7.1-gtk-linux-ppc64.zip 5687650 RMD160 2c8c0f00b4f001a4b0680d587f037499d258303c SHA1 0ef380192e28f028cb94c67071cbad648aaedf5f SHA256 11b0ea72554f0f75941b44ae76aaf70b326e1c0cda7328fbb5a83b682a5e653c
DIST swt-3.7.1-gtk-linux-x86.zip 5374283 RMD160 997e300ab267b6cbb5dc4f50610cecf752cf5417 SHA1 7d896033c84f2b0beef952aac0e2e0c73038c881 SHA256 94279a6ab1aab248641daf728bca34f4eb2f4b812aaebc1973c775320cb96942
DIST swt-3.7.1-gtk-linux-x86_64.zip 5671004 RMD160 9e9a82027b93557f8f7e44fc54d090b74cd59373 SHA1 2d8e18bc53d8a2d6ff1af5a4226756a11f4a107d SHA256 dd11d29a95391afed42ac3883c45a2bda7e4597c72c4b7b1291316e006139b75
+DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 RMD160 7d044aa9ed1cb837f45c155716f0d0a883c1bd44 SHA1 0f5a4df4dda5f46010ad889255df500a1b9c9034 SHA256 90106c1878470dfb78b665062a6a8f94c19cbb469221a37be4b7b985bed54c5e
+DIST swt-3.7.2-gtk-linux-x86.zip 5374609 RMD160 c4f26273b6ec94c64cf524f6cec25272ea2ed92c SHA1 1664a5d5b8121c2459ea78026cf58d986cd17f16 SHA256 4e31f4cf5c6eac378ecaf5e261e925e82c377902c61cfdefaa38b1c3ea445183
+DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 RMD160 515ca487a45db99ad7274a1bfe4f7fc6e43ba6a0 SHA1 edda25d3aa0329e83489b8a7e224cd2cf11a0215 SHA256 a92498e1fcd001b91a5128a414263908c876c5b74bd10c3276e08a8edd470443
diff --git a/dev-java/swt/swt-3.7.2.ebuild b/dev-java/swt/swt-3.7.2.ebuild
new file mode 100644
index 000000000000..df84248063df
--- /dev/null
+++ b/dev-java/swt/swt-3.7.2.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.7.2.ebuild,v 1.1 2012/03/03 22:10:27 caster Exp $
+
+EAPI=4
+
+inherit eutils java-pkg-2 java-ant-2 toolchain-funcs java-osgi
+
+MY_PV="${PV/_rc/RC}"
+MY_DMF="download.eclipse.org/eclipse/downloads/drops/R-${MY_PV}-201202080800"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="GTK based SWT Library"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="x86? (
+ http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+ )
+ x86-fbsd? (
+ http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+ )
+ amd64? (
+ http://${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip
+ )
+ ppc? (
+ http://${MY_DMF}/${MY_P}-gtk-linux-x86.zip
+ )
+ ppc64? (
+ http://${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip
+ )"
+
+SLOT="3.7"
+LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+IUSE="cairo gnome opengl webkit"
+COMMON=">=dev-libs/glib-2.6
+ >=x11-libs/gtk+-2.6.8:2
+ >=dev-libs/atk-1.10.2
+ cairo? ( >=x11-libs/cairo-1.4.14 )
+ gnome? (
+ =gnome-base/libgnome-2*
+ =gnome-base/gnome-vfs-2*
+ =gnome-base/libgnomeui-2*
+ )
+ opengl? (
+ virtual/opengl
+ virtual/glu
+ )
+ webkit? ( >=net-libs/webkit-gtk-1.2:2 )
+ x11-libs/libXtst"
+
+DEPEND=">=virtual/jdk-1.4
+ app-arch/unzip
+ x11-libs/libX11
+ x11-libs/libXrender
+ x11-libs/libXt
+ >=x11-libs/libXtst-1.1.0
+ x11-proto/inputproto
+ dev-util/pkgconfig
+ ${COMMON}"
+
+RDEPEND=">=virtual/jre-1.4
+ ${COMMON}"
+
+S="${WORKDIR}"
+
+# JNI libraries don't need SONAME, bug #253756
+QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
+
+src_unpack() {
+ local DISTFILE=${A}
+ unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
+ unpack "./src.zip"
+
+ # Cleanup the redirtied directory structure
+ rm -rf about_files/ || die
+}
+
+java_prepare() {
+ # Replace the build.xml to allow compilation without Eclipse tasks
+ cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
+ mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
+
+ # Fix Makefiles to respect flags and work with --as-needed
+ epatch "${FILESDIR}"/as-needed-and-flag-fixes-3.6.patch
+}
+
+src_compile() {
+ # Drop jikes support as it seems to be unfriendly with SWT
+ java-pkg_filter-compiler jikes
+
+ local AWT_ARCH
+ local JAWTSO="libjawt.so"
+ if [[ $(tc-arch) == 'x86' ]] ; then
+ AWT_ARCH="i386"
+ elif [[ $(tc-arch) == 'ppc' ]] ; then
+ AWT_ARCH="ppc"
+ elif [[ $(tc-arch) == 'ppc64' ]] ; then
+ AWT_ARCH="ppc64"
+ else
+ AWT_ARCH="amd64"
+ fi
+ if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
+ export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
+ elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
+ export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
+ elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
+ export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
+ else
+ eerror "${JAWTSO} not found in the JDK being used for compilation!"
+ die "cannot build AWT library"
+ fi
+
+ # Fix the pointer size for AMD64
+ [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
+
+ local platform="linux"
+
+ use elibc_FreeBSD && platform="freebsd"
+
+ local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
+
+ einfo "Building AWT library"
+ ${make} make_awt
+
+ einfo "Building SWT library"
+ ${make} make_swt
+
+ einfo "Building JAVA-AT-SPI bridge"
+ ${make} make_atk
+
+ if use gnome ; then
+ einfo "Building GNOME VFS support"
+ ${make} make_gnome
+ fi
+
+ if use cairo ; then
+ einfo "Building CAIRO support"
+ ${make} make_cairo
+ fi
+
+ if use opengl ; then
+ einfo "Building OpenGL component"
+ ${make} make_glx
+ fi
+
+ if use webkit ; then
+ einfo "Building the WebKitGTK+ component"
+
+ ${make} make_webkit
+ fi
+
+ einfo "Building JNI libraries"
+ eant compile
+
+ einfo "Copying missing files"
+ cp -i "${S}/version.txt" "${S}/build/version.txt"
+ cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
+ "${S}/build/org/eclipse/swt/internal/" || die
+
+ einfo "Packing JNI libraries"
+ eant jar
+}
+
+src_install() {
+ swtArch=${ARCH}
+ use amd64 && swtArch=x86_64
+ use x86-fbsd && swtArch=x86
+
+ sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
+ use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
+ use gnome || sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
+ use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
+ use webkit || sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
+ java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
+
+ java-pkg_sointo /usr/$(get_libdir)
+ java-pkg_doso *.so
+
+ dohtml about.html || die
+}
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 7021d44c2603..4de23a5a6bff 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -5,6 +5,7 @@ DIST ghc-6.10.4-sparc-sun-solaris2.tar.bz2 87371847 RMD160 6028d2224524c6dfeb7b9
DIST ghc-6.10.4-src.tar.bz2 8060565 RMD160 5f83baf2549f1f4bea140c6a80728c2a76f60ab6 SHA1 0566858b409066d98da70de5adb9a7030d0df5dc SHA256 d66a8e52572f4ff819fe5c4e34c6dd1e84a7763e25c3fadcc222453c0bd8534d
DIST ghc-6.12.3-src.tar.bz2 26592939 RMD160 021619aec4c820009e77745657bfdf0d9705f3e7 SHA1 d811be2131d4403ea452aa94fe71edd1b6bd0a79 SHA256 6cbdbe415011f2c7d15e4d850758d8d393f70617b88cb3237d2c602bb60e5e68
DIST ghc-7.0.4-src.tar.bz2 24205070 RMD160 80727043c2141a0472f9e2fffcdf5a8eb9fb55ec SHA1 469a7ed626e53bf02f1e73713dea61e172106fd5 SHA256 1a9b78d9d66c9c21de6c0932e36bb87406a4856f1611bf83bd44539bdc6ed0ed
+DIST ghc-7.4.1-src.tar.bz2 25272609 RMD160 00c6a4df54e55559812b0e289dbc6fe8523d18da SHA1 66c5a027fef1ed01c35c3493e964fb3657efc936 SHA256 721c09a49e519b7459b67b451b5103252ba3833906a7a24c3a3679ff94669a79
DIST ghc-bin-6.10.4-alpha.tbz2 84499083 RMD160 5f68a5592663d7c6abf3617ccab9aa35cbfc2d63 SHA1 88fb6020bf1fab2e0914c223087af94e926a1dda SHA256 cfe28ea83e000f1ba0853b78dd27b35fa5d823c4cb94699f901aec5e2705c315
DIST ghc-bin-6.10.4-amd64.tbz2 51566179 RMD160 68b261b4bbef89021a2c92e99c70db45ed85d9e7 SHA1 27e542cc49fa47566c59407fad1c9254d46a8d03 SHA256 2ced87862603a44a59744459a8231f587c0f225f70eb4861ad2db5098c2433a1
DIST ghc-bin-6.10.4-ia64.tbz2 86508052 RMD160 ea1f1de73be8ca51abd8eb748d92694ea4ade2f6 SHA1 eea28fe871e1e3821b370715930864d7fd955181 SHA256 2e8f03eec65329abb15c3d3351d8d4f896ac6c7fc8a8b3815807c3bd0329292e
diff --git a/dev-lang/ghc/files/ghc-7.2.1-freebsd-CHOST.patch b/dev-lang/ghc/files/ghc-7.2.1-freebsd-CHOST.patch
new file mode 100644
index 000000000000..da59cd789f99
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-7.2.1-freebsd-CHOST.patch
@@ -0,0 +1,13 @@
+diff --git a/aclocal.m4 b/aclocal.m4
+index 11bb003..52df243 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1545,7 +1545,7 @@ case "$1" in
+ freebsd|netbsd|openbsd|dragonfly|osf1|osf3|hpux|linuxaout|kfreebsdgnu|freebsd2|solaris2|cygwin32|mingw32|darwin|gnu|nextstep2|nextstep3|sunos4|ultrix|irix|aix|haiku)
+ $2="$1"
+ ;;
+- freebsd8) # like i686-gentoo-freebsd8
++ freebsd*) # like i686-gentoo-freebsd8 or i686-gentoo-freebsd8.2
+ $2="freebsd"
+ ;;
+ darwin*)
diff --git a/dev-lang/ghc/files/ghc-7.4-rc2-macos-prefix-respect-gcc.patch b/dev-lang/ghc/files/ghc-7.4-rc2-macos-prefix-respect-gcc.patch
new file mode 100644
index 000000000000..770fd650606b
--- /dev/null
+++ b/dev-lang/ghc/files/ghc-7.4-rc2-macos-prefix-respect-gcc.patch
@@ -0,0 +1,23 @@
+diff --git a/aclocal.m4 b/aclocal.m4
+index a377cb9..4f8fd69 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1950,17 +1950,7 @@ AC_DEFUN([XCODE_VERSION],[
+ # --------------------------------
+ # Finds where gcc is
+ AC_DEFUN([FIND_GCC],[
+- if test "$TargetOS_CPP" = "darwin" &&
+- test "$XCodeVersion1" -eq 4 &&
+- test "$XCodeVersion2" -lt 2
+- then
+- # In Xcode 4.1, 'gcc-4.2' is the gcc legacy backend (rather
+- # than the LLVM backend). We prefer the legacy gcc, but in
+- # Xcode 4.2 'gcc-4.2' was removed.
+- FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc-4.2])
+- else
+- FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc])
+- fi
++ FP_ARG_WITH_PATH_GNU_PROG([CC], [gcc])
+ export CC
+ WhatGccIsCalled="$CC"
+ AC_SUBST(WhatGccIsCalled)
diff --git a/dev-lang/ghc/ghc-7.0.4.ebuild b/dev-lang/ghc/ghc-7.0.4.ebuild
index 060cab0b7082..3f8751599230 100644
--- a/dev-lang/ghc/ghc-7.0.4.ebuild
+++ b/dev-lang/ghc/ghc-7.0.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.0.4.ebuild,v 1.4 2011/12/28 08:47:34 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.0.4.ebuild,v 1.5 2012/03/04 05:49:54 gienah Exp $
# Brief explanation of the bootstrap logic:
#
@@ -193,7 +193,7 @@ relocate_path() {
for file in "$@"
do
sed -i -e "s|$from|$to|g" \
- "$file" || die "path relocation failed for '$file'"
+ "$file" || die "path relocation failed for '$file'"
done
}
diff --git a/dev-lang/ghc/ghc-7.4.1.ebuild b/dev-lang/ghc/ghc-7.4.1.ebuild
new file mode 100644
index 000000000000..ca642085fc84
--- /dev/null
+++ b/dev-lang/ghc/ghc-7.4.1.ebuild
@@ -0,0 +1,599 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.4.1.ebuild,v 1.1 2012/03/04 05:49:54 gienah Exp $
+
+# Brief explanation of the bootstrap logic:
+#
+# Previous ghc ebuilds have been split into two: ghc and ghc-bin,
+# where ghc-bin was primarily used for bootstrapping purposes.
+# From now on, these two ebuilds have been combined, with the
+# binary USE flag used to determine whether or not the pre-built
+# binary package should be emerged or whether ghc should be compiled
+# from source. If the latter, then the relevant ghc-bin for the
+# arch in question will be used in the working directory to compile
+# ghc from source.
+#
+# This solution has the advantage of allowing us to retain the one
+# ebuild for both packages, and thus phase out virtual/ghc.
+
+# Note to users of hardened gcc-3.x:
+#
+# If you emerge ghc with hardened gcc it should work fine (because we
+# turn off the hardened features that would otherwise break ghc).
+# However, emerging ghc while using a vanilla gcc and then switching to
+# hardened gcc (using gcc-config) will leave you with a broken ghc. To
+# fix it you would need to either switch back to vanilla gcc or re-emerge
+# ghc (or ghc-bin). Note that also if you are using hardened gcc-3.x and
+# you switch to gcc-4.x that this will also break ghc and you'll need to
+# re-emerge ghc (or ghc-bin). People using vanilla gcc can switch between
+# gcc-3.x and 4.x with no problems.
+
+EAPI="4"
+
+inherit base autotools bash-completion-r1 eutils flag-o-matic multilib toolchain-funcs ghc-package versionator pax-utils
+
+DESCRIPTION="The Glasgow Haskell Compiler"
+HOMEPAGE="http://www.haskell.org/ghc/"
+
+# we don't have any binaries yet
+arch_binaries=""
+
+# sorted!
+#arch_binaries="$arch_binaries alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-${PV}-alpha.tbz2 )"
+#arch_binaries="$arch_binaries arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-${PV}-arm.tbz2 )"
+#arch_binaries="$arch_binaries amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-${PV}-amd64.tbz2 )"
+#arch_binaries="$arch_binaries ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-${PV}-ia64-fixed-fiw.tbz2 )"
+#arch_binaries="$arch_binaries ppc? ( mirror://gentoo/ghc-bin-${PV}-ppc.tbz2 )"
+#arch_binaries="$arch_binaries ppc64? ( mirror://gentoo/ghc-bin-${PV}-ppc64.tbz2 )"
+#arch_binaries="$arch_binaries sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-${PV}-sparc.tbz2 )"
+#arch_binaries="$arch_binaries x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-${PV}-x86.tbz2 )"
+
+# various ports:
+#arch_binaries="$arch_binaries x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-${PV}-x86-fbsd.tbz2 )"
+
+# 0 - yet
+yet_binary() {
+ case "${ARCH}" in
+ #alpha)
+ # return 0
+ # ;;
+ #arm)
+ # ewarn "ARM binary is built on armv5tel-eabi toolchain. Use with caution."
+ # return 0
+ # ;;
+ #amd64)
+ # return 0
+ # ;;
+ ##sparc)
+ # return 0
+ # ;;
+ #x86)
+ # return 0
+ # ;;
+ *)
+ return 1
+ ;;
+ esac
+}
+
+SRC_URI="!binary? ( http://www.haskell.org/ghc/dist/${PV}/${P}-src.tar.bz2 )"
+[[ -n $arch_binaries ]] && SRC_URI+=" !ghcbootstrap? ( $arch_binaries )"
+LICENSE="BSD"
+SLOT="0"
+# ghc on ia64 needs gcc to support -mcmodel=medium (or some dark hackery) to avoid TOC overflow
+KEYWORDS="~alpha ~amd64 -ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc ghcbootstrap llvm"
+IUSE+=" binary" # don't forget about me later!
+
+RDEPEND="
+ !kernel_Darwin? ( >=sys-devel/gcc-2.95.3 )
+ kernel_linux? ( >=sys-devel/binutils-2.17 )
+ kernel_SunOS? ( >=sys-devel/binutils-2.17 )
+ >=dev-lang/perl-5.6.1
+ >=dev-libs/gmp-5
+ !=gmp-5, even if >=gmp-4.1 would be enough. this is due to
+# that we want the binaries to use the latest versioun available, and not to be
+# built against gmp-4
+
+DEPEND="${RDEPEND}
+ ghcbootstrap? ( >=dev-haskell/alex-2.3
+ >=dev-haskell/happy-1.18
+ doc? ( app-text/docbook-xml-dtd:4.2
+ app-text/docbook-xml-dtd:4.5
+ app-text/docbook-xsl-stylesheets
+ >=dev-libs/libxslt-1.1.2 ) )"
+# In the ghcbootstrap case we rely on the developer having
+# >=ghc-5.04.3 on their $PATH already
+
+PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
+PDEPEND="
+ ${PDEPEND}
+ dev-haskell/random
+ dev-haskell/syb
+ llvm? ( sys-devel/llvm )"
+
+append-ghc-cflags() {
+ local flag compile assemble link
+ for flag in $*; do
+ case ${flag} in
+ compile) compile="yes";;
+ assemble) assemble="yes";;
+ link) link="yes";;
+ *)
+ [[ ${compile} ]] && GHC_FLAGS="${GHC_FLAGS} -optc${flag}" CFLAGS="${CFLAGS} ${flag}"
+ [[ ${assemble} ]] && GHC_FLAGS="${GHC_FLAGS} -opta${flag}" CFLAGS="${CFLAGS} ${flag}"
+ [[ ${link} ]] && GHC_FLAGS="${GHC_FLAGS} -optl${flag}" FILTERED_LDFLAGS="${FILTERED_LDFLAGS} ${flag}";;
+ esac
+ done
+}
+
+ghc_setup_cflags() {
+ # We need to be very careful with the CFLAGS we ask ghc to pass through to
+ # gcc. There are plenty of flags which will make gcc produce output that
+ # breaks ghc in various ways. The main ones we want to pass through are
+ # -mcpu / -march flags. These are important for arches like alpha & sparc.
+ # We also use these CFLAGS for building the C parts of ghc, ie the rts.
+ strip-flags
+ strip-unsupported-flags
+
+ GHC_FLAGS=""
+ for flag in ${CFLAGS}; do
+ case ${flag} in
+
+ # Ignore extra optimisation (ghc passes -O to gcc anyway)
+ # -O2 and above break on too many systems
+ -O*) ;;
+
+ # Arch and ABI flags are what we're really after
+ -m*) append-ghc-cflags compile assemble ${flag};;
+
+ # Debugging flags don't help either. You can't debug Haskell code
+ # at the C source level and the mangler discards the debug info.
+ -g*) ;;
+
+ # Ignore all other flags, including all -f* flags
+ esac
+ done
+
+ FILTERED_LDFLAGS=""
+ for flag in ${LDFLAGS}; do
+ case ${flag} in
+ # Pass the canary. we don't quite respect LDFLAGS, but we have an excuse!
+ "-Wl,--hash-style="*) append-ghc-cflags link ${flag};;
+
+ # Ignore all other flags
+ esac
+ done
+
+ # hardened-gcc needs to be disabled, because the mangler doesn't accept
+ # its output.
+ gcc-specs-pie && append-ghc-cflags compile link -nopie
+ gcc-specs-ssp && append-ghc-cflags compile -fno-stack-protector
+
+ # prevent from failind building unregisterised ghc:
+ # http://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg171602.html
+ use ppc64 && append-ghc-cflags compile -mminimal-toc
+ # fix the similar issue as ppc64 TOC on ia64. ia64 has limited size of small data
+ # currently ghc fails to build haddock
+ # http://osdir.com/ml/gnu.binutils.bugs/2004-10/msg00050.html
+ use ia64 && append-ghc-cflags compile -G0
+
+ # Unfortunately driver/split/ghc-split.lprl is dumb
+ # enough to preserve stack marking for each split object
+ # and it flags stack marking violation:
+ # * !WX --- --- usr/lib64/ghc-7.4.1/base-4.5.0.0/libHSbase-4.5.0.0.a:Fingerprint__1.o
+ # * !WX --- --- usr/lib64/ghc-7.4.1/base-4.5.0.0/libHSbase-4.5.0.0.a:Fingerprint__2.o
+ # * !WX --- --- usr/lib64/ghc-7.4.1/base-4.5.0.0/libHSbase-4.5.0.0.a:Fingerprint__3.o
+ case $($(tc-getAS) -v 2>&1 /dev/null || die
+ use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
+ use x86-solaris && unpack ghc-6.10.4-i386-unknown-solaris2.tar.bz2
+ use ppc-macos && unpack ghc-6.10.1-powerpc-apple-darwin.tar.bz2
+ use x86-macos && unpack ghc-6.10.1-i386-apple-darwin.tar.bz2
+ popd > /dev/null
+
+ pushd "${WORKDIR}"/ghc-bin-installer/ghc-6.10.? > /dev/null || die
+ # fix the binaries so they run, on Solaris we need an
+ # LD_LIBRARY_PATH which has our prefix libdirs, on
+ # Darwin we need to replace the frameworks with our libs
+ # from the prefix fix before installation, because some
+ # of the tools are actually used during configure/make
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ export LD_LIBRARY_PATH="${EPREFIX}/$(get_libdir):${EPREFIX}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
+ elif [[ ${CHOST} == *-darwin* ]] ; then
+ # http://hackage.haskell.org/trac/ghc/ticket/2942
+ pushd utils/haddock/dist-install/build > /dev/null
+ ln -s Haddock haddock >& /dev/null # fails on IN-sensitive
+ popd > /dev/null
+
+ local readline_framework=GNUreadline.framework/GNUreadline
+ local gmp_framework=/opt/local/lib/libgmp.3.dylib
+ local ncurses_file=/opt/local/lib/libncurses.5.dylib
+ for binary in $(scanmacho -BRE MH_EXECUTE -F '%F' .) ; do
+ install_name_tool -change \
+ ${readline_framework} \
+ "${EPREFIX}"/lib/libreadline.dylib \
+ ${binary} || die
+ install_name_tool -change \
+ ${gmp_framework} \
+ "${EPREFIX}"/usr/lib/libgmp.dylib \
+ ${binary} || die
+ install_name_tool -change \
+ ${ncurses_file} \
+ "${EPREFIX}"/usr/lib/libncurses.dylib \
+ ${binary} || die
+ done
+ # we don't do frameworks!
+ sed -i \
+ -e 's/\(frameworks = \)\["GMP"\]/\1[]/g' \
+ -e 's/\(extraLibraries = \)\["m"\]/\1["m","gmp"]/g' \
+ rts/package.conf.in || die
+ fi
+
+ # it is autoconf, but we really don't want to give it too
+ # much arguments, in fact we do the make in-place anyway
+ ./configure --prefix="${WORKDIR}"/usr || die
+ make install || die
+ popd > /dev/null
+ ;;
+ *)
+ relocate_ghc "${WORKDIR}"
+ ;;
+ esac
+ fi
+
+ sed -i -e "s|\"\$topdir\"|\"\$topdir\" ${GHC_FLAGS}|" \
+ "${S}/ghc/ghc.wrapper"
+
+ cd "${S}" # otherwise epatch will break
+
+ epatch "${FILESDIR}/ghc-7.0.4-CHOST-prefix.patch"
+
+ epatch "${FILESDIR}"/${PN}-7.0.4-darwin8.patch
+ # failed to apply. FIXME
+ #epatch "${FILESDIR}"/${PN}-6.12.3-mach-o-relocation-limit.patch
+
+ epatch "${FILESDIR}"/${PN}-7.4-rc2-macos-prefix-respect-gcc.patch
+ epatch "${FILESDIR}"/${PN}-7.2.1-freebsd-CHOST.patch
+
+ if use prefix; then
+ # Make configure find docbook-xsl-stylesheets from Prefix
+ sed -i -e '/^FP_DIR_DOCBOOK_XSL/s:\[.*\]:['"${EPREFIX}"'/usr/share/sgml/docbook/xsl-stylesheets/]:' utils/haddock/doc/configure.ac || die
+ fi
+
+ # as we have changed the build system
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ if ! use binary; then
+
+ # initialize build.mk
+ echo '# Gentoo changes' > mk/build.mk
+
+ # Put docs into the right place, ie /usr/share/doc/ghc-${PV}
+ echo "docdir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk
+ echo "htmldir = ${EPREFIX}/usr/share/doc/${P}" >> mk/build.mk
+
+ # We also need to use the GHC_FLAGS flags when building ghc itself
+ echo "SRC_HC_OPTS+=${GHC_FLAGS}" >> mk/build.mk
+ echo "SRC_CC_OPTS+=${CFLAGS}" >> mk/build.mk
+ echo "SRC_LD_OPTS+=${FILTERED_LDFLAGS}" >> mk/build.mk
+
+ # We can't depend on haddock except when bootstrapping when we
+ # must build docs and include them into the binary .tbz2 package
+ if use ghcbootstrap && use doc; then
+ echo "BUILD_DOCBOOK_PDF = NO" >> mk/build.mk
+ echo "BUILD_DOCBOOK_PS = NO" >> mk/build.mk
+ echo "BUILD_DOCBOOK_HTML = YES" >> mk/build.mk
+ echo "HADDOCK_DOCS = YES" >> mk/build.mk
+ else
+ echo "BUILD_DOCBOOK_PDF = NO" >> mk/build.mk
+ echo "BUILD_DOCBOOK_PS = NO" >> mk/build.mk
+ echo "BUILD_DOCBOOK_HTML = NO" >> mk/build.mk
+ echo "HADDOCK_DOCS = NO" >> mk/build.mk
+ fi
+
+ # circumvent a very strange bug that seems related with ghc producing
+ # too much output while being filtered through tee (e.g. due to
+ # portage logging) reported as bug #111183
+ echo "SRC_HC_OPTS+=-w" >> mk/build.mk
+
+ # some arches do not support ELF parsing for ghci module loading
+ # PPC64: never worked (should be easy to implement)
+ # alpha: never worked
+ # arm: unimplemented or never worked
+ if use alpha || use ppc64 || use arm; then
+ echo "GhcWithInterpreter=NO" >> mk/build.mk
+ fi
+
+ # we have to tell it to build unregisterised on some arches
+ # ppc64: EvilMangler currently does not understand some TOCs
+ # ia64: EvilMangler bitrot
+ if use alpha || use ia64 || use ppc64; then
+ echo "GhcUnregisterised=YES" >> mk/build.mk
+ echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
+ echo "SplitObjs=NO" >> mk/build.mk
+ echo "GhcRTSWays := debug" >> mk/build.mk
+ echo "GhcNotThreaded=YES" >> mk/build.mk
+ fi
+
+ # arm: no EvilMangler support, no NCG support
+ if use arm; then
+ echo "GhcUnregisterised=YES" >> mk/build.mk
+ echo "GhcWithNativeCodeGen=NO" >> mk/build.mk
+ fi
+
+ # Have "ld -r --relax" problem with split-objs on sparc:
+ if use sparc; then
+ echo "SplitObjs=NO" >> mk/build.mk
+ fi
+
+ if ! use llvm; then
+ echo "GhcWithLlvmCodeGen=NO" >> mk/build.mk
+ fi
+
+ # Get ghc from the unpacked binary .tbz2
+ # except when bootstrapping we just pick ghc up off the path
+ if ! use ghcbootstrap; then
+ export PATH="${WORKDIR}/usr/bin:${PATH}"
+ fi
+
+ # Since GHC 6.12.2 the GHC wrappers store which GCC version GHC was
+ # compiled with, by saving the path to it. The purpose is to make sure
+ # that GHC will use the very same gcc version when it compiles haskell
+ # sources, as the extra-gcc-opts files contains extra gcc options which
+ # match only this GCC version.
+ # However, this is not required in Gentoo, as only modern GCCs are used
+ # (>4).
+ # Instead, this causes trouble when for example ccache is used during
+ # compilation, but we don't want the wrappers to point to ccache.
+ # Due to the above, we simply set GCC to be "gcc". When compiling ghc it
+ # might point to ccache, once installed it will point to the users
+ # regular gcc.
+
+ econf --with-gcc=gcc || die "econf failed"
+ fi # ! use binary
+}
+
+src_compile() {
+ if ! use binary; then
+ emake all || die "make failed"
+ fi # ! use binary
+}
+
+src_install() {
+ if use binary; then
+ use prefix && mkdir -p "${ED}"
+ mv "${S}/usr" "${ED}"
+
+ # Remove the docs if not requested
+ if ! use doc; then
+ rm -rf "${ED}/usr/share/doc/${P}/*/" \
+ "${ED}/usr/share/doc/${P}/*.html" \
+ || die "could not remove docs (P vs PF revision mismatch?)"
+ fi
+ else
+ local insttarget="install"
+
+ # We only built docs if we were bootstrapping, otherwise
+ # we copy them out of the unpacked binary .tbz2
+ if use doc; then
+ if ! use ghcbootstrap; then
+ mkdir -p "${ED}/usr/share/doc"
+ mv "${WORKDIR}/usr/share/doc/${P}" "${ED}/usr/share/doc" \
+ || die "failed to copy docs"
+ fi
+ fi
+
+ emake -j1 ${insttarget} \
+ DESTDIR="${D}" \
+ || die "make ${insttarget} failed"
+
+ # remove wrapper and linker
+ rm -f "${ED}"/usr/bin/haddock*
+
+ # ghci uses mmap with rwx protection at it implements dynamic
+ # linking on it's own (bug #299709)
+ # so mark resulting binary
+ pax-mark -m "${ED}/usr/$(get_libdir)/${P}/ghc"
+
+ dodoc "${S}/README" "${S}/ANNOUNCE" "${S}/LICENSE" "${S}/VERSION"
+
+ dobashcompletion "${FILESDIR}/ghc-bash-completion"
+
+ fi
+
+ # path to the package.cache
+ PKGCACHE="${ED}/usr/$(get_libdir)/${P}/package.conf.d/package.cache"
+
+ # copy the package.conf, including timestamp, save it so we later can put it
+ # back before uninstalling, or when upgrading.
+ cp -p "${PKGCACHE}"{,.shipped} \
+ || die "failed to copy package.conf.d/package.cache"
+}
+
+pkg_preinst() {
+ # have we got an earlier version of ghc installed?
+ if has_version "<${CATEGORY}/${PF}"; then
+ haskell_updater_warn="1"
+ fi
+}
+
+pkg_postinst() {
+ ghc-reregister
+
+ # path to the package.cache
+ PKGCACHE="${EROOT}/usr/$(get_libdir)/${P}/package.conf.d/package.cache"
+
+ # give the cache a new timestamp, it must be as recent as
+ # the package.conf.d directory.
+ touch "${PKGCACHE}"
+
+ if [[ "${haskell_updater_warn}" == "1" ]]; then
+ ewarn
+ ewarn "\e[1;31m************************************************************************\e[0m"
+ ewarn
+ ewarn "You have just upgraded from an older version of GHC."
+ ewarn "You may have to run"
+ ewarn " 'haskell-updater --upgrade'"
+ ewarn "to rebuild all ghc-based Haskell libraries."
+ ewarn
+ ewarn "\e[1;31m************************************************************************\e[0m"
+ ewarn
+ fi
+
+ bash-completion_pkg_postinst
+}
+
+pkg_prerm() {
+ # Be very careful here... Call order when upgrading is (according to PMS):
+ # * src_install for new package
+ # * pkg_preinst for new package
+ # * pkg_postinst for new package
+ # * pkg_prerm for the package being replaced
+ # * pkg_postrm for the package being replaced
+ # so you'll actually be touching the new packages files, not the one you
+ # uninstall, due to that or installation directory ${P} will be the same for
+ # both packages.
+
+ # Call order for reinstalling is (according to PMS):
+ # * src_install
+ # * pkg_preinst
+ # * pkg_prerm for the package being replaced
+ # * pkg_postrm for the package being replaced
+ # * pkg_postinst
+
+ # Overwrite the modified package.cache with a copy of the
+ # original one, so that it will be removed during uninstall.
+
+ PKGCACHE="${EROOT}/usr/$(get_libdir)/${P}/package.conf.d/package.cache"
+ rm -rf "${PKGCACHE}"
+
+ cp -p "${PKGCACHE}"{.shipped,}
+}
diff --git a/dev-libs/libevent/Manifest b/dev-libs/libevent/Manifest
index bcd3a34d05b6..6e445dbaba23 100644
--- a/dev-libs/libevent/Manifest
+++ b/dev-libs/libevent/Manifest
@@ -1,5 +1,4 @@
DIST libevent-1.4.13-stable.tar.gz 499603 RMD160 b363aee80f73f27a68516d57c00592fe923aa40a SHA1 b0c4e9801b74f8bed1502353674288a5e4f1ca16 SHA256 d6fff1d7e7b79e6e083b482b0b55190f71ba597b55c3541d64c0572ddf0747a3
DIST libevent-1.4.14b-stable.tar.gz 474874 RMD160 5eb739f0ae812e81ca2e196fbed849529cfbc689 SHA1 4a834364c28ad652ddeb00b5f83872506eede7d4 SHA256 afa61b476a222ba43fc7cca2d24849ab0bbd940124400cb699915d3c60e46301
-DIST libevent-2.0.12-stable.tar.gz 822416 RMD160 c630fcc739e14b526c2ac37aec004f19c9bf9efc SHA1 fa2e1643101a8f8eba8e6fcffdce97cb9309c1d2 SHA256 ac0283f72e0f881e93ac3ae9497a20c78bd075c6c12506ad10e821aa1c29e5ab
DIST libevent-2.0.16-stable.tar.gz 837650 RMD160 8497386efb9dea0b1cf29ddfded5277a1e1e86f4 SHA1 9eb9fe3c0ec607525ed2dee6827687efcd0696ac SHA256 a578c7bcaf3bab1cc7924bd4d219f2ea621ab8c51dfc4f886e234b6ef4d38295
DIST libevent-2.0.17-stable.tar.gz 840289 RMD160 16a7e3cdb0dec496435758c8c2b0ae5f27f70b41 SHA1 cea3af2d4bd688784f270ac2ecae8ea6aaaa463f SHA256 51735d1241f9f6d2d6465d8abc76f7511764f6de7d81026120c629612296faa6
diff --git a/dev-libs/libevent/libevent-2.0.12.ebuild b/dev-libs/libevent/libevent-2.0.12.ebuild
deleted file mode 100644
index 295864fb17cf..000000000000
--- a/dev-libs/libevent/libevent-2.0.12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libevent/libevent-2.0.12.ebuild,v 1.9 2012/02/27 05:15:44 jer Exp $
-
-EAPI="2"
-
-inherit libtool
-
-MY_P="${P}-stable"
-
-DESCRIPTION="A library to execute a function when a specific event occurs on a file descriptor"
-HOMEPAGE="http://monkey.org/~provos/libevent/"
-SRC_URI="mirror://sourceforge/levent/files/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="ppc64"
-IUSE="static-libs test"
-
-RDEPEND="!<=dev-libs/9libs-1.0"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- # don't waste time building tests/samples
- sed -i \
- -e 's|^\(SUBDIRS =.*\)sample test\(.*\)$|\1\2|' \
- Makefile.in || die "sed Makefile.in failed"
-
- elibtoolize
-}
-
-src_configure() {
- econf $(use_enable static-libs static) || die "econf"
-}
-
-src_test() {
- emake -C test check | tee "${T}"/tests
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc README ChangeLog
- if ! use static-libs; then
- rm -f "${D}"/usr/lib*/libevent*.la
- fi
-}
diff --git a/dev-libs/libpqxx/libpqxx-4.0-r1.ebuild b/dev-libs/libpqxx/libpqxx-4.0-r1.ebuild
index 760dfc8ee492..e10cd36338f1 100644
--- a/dev-libs/libpqxx/libpqxx-4.0-r1.ebuild
+++ b/dev-libs/libpqxx/libpqxx-4.0-r1.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-4.0-r1.ebuild,v 1.3 2012/03/03 14:21:30 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpqxx/libpqxx-4.0-r1.ebuild,v 1.4 2012/03/03 21:24:57 klausman Exp $
EAPI="4"
inherit eutils
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
DESCRIPTION="C++ client API for PostgreSQL. The standard front-end for writing C++ programs that use PostgreSQL."
SRC_URI="http://pqxx.org/download/software/${PN}/${P}.tar.gz"
diff --git a/dev-libs/libxml2/libxml2-2.7.8-r5.ebuild b/dev-libs/libxml2/libxml2-2.7.8-r5.ebuild
index 19ee5a61dfa5..d06bb45519c7 100644
--- a/dev-libs/libxml2/libxml2-2.7.8-r5.ebuild
+++ b/dev-libs/libxml2/libxml2-2.7.8-r5.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-libs/libxml2/libxml2-2.7.8-r5.ebuild,v 1.7 2012/03/03 14:33:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libxml2/libxml2-2.7.8-r5.ebuild,v 1.8 2012/03/03 19:45:46 armin76 Exp $
EAPI="3"
PYTHON_DEPEND="python? 2"
@@ -16,7 +16,7 @@ HOMEPAGE="http://www.xmlsoft.org/"
LICENSE="MIT"
SLOT="2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="debug doc examples icu ipv6 python readline static-libs test"
XSTS_HOME="http://www.w3.org/XML/2004/xml-schema-test-suite"
diff --git a/dev-perl/XML-LibXML/Manifest b/dev-perl/XML-LibXML/Manifest
index 82e179fad432..45867b02f69a 100644
--- a/dev-perl/XML-LibXML/Manifest
+++ b/dev-perl/XML-LibXML/Manifest
@@ -2,3 +2,4 @@ DIST XML-LibXML-1.70.tar.gz 339682 RMD160 cc9cc88a10e6652ec9cedd7904ef84dc057170
DIST XML-LibXML-1.90.tar.gz 434964 RMD160 5486ca71522bca91421745662b4d64e1dc462dc3 SHA1 c341d23017fea980d7802274aa28ae30da35ea18 SHA256 e2fc57afda9d9fc756269c1f74de53b4d5a5c4840bf9a4dc5b6e2534082fa6c8
DIST XML-LibXML-1.91.tar.gz 439841 RMD160 e0e3dcc82602adba835f92f7b0d0324756dc5e98 SHA1 2ebd598f73db1569e19ae256c85de94003b8895a SHA256 117e015e405a9fc387081f5d12a2eec8ae0a728d7ffc130098f3cf45fe911acf
DIST XML-LibXML-1.93.tar.gz 440520 RMD160 d5d56fa819cbab95e2c07a129d3231bd8ace1ba6 SHA1 30ce8d4368277aa5ad86e0f4722718df26bbac3f SHA256 77bddfccd556dc28be2767ca01230b6148d9141761525561da0f292ff2273eda
+DIST XML-LibXML-1.94.tar.gz 440608 RMD160 b1bfa7d08950b41e5e6bf9cfd039df6682f0bae5 SHA1 e81807512977fb81ad20898646f4f8b70004c598 SHA256 2f2af69d7e4c30e3826c5520c542b60799d27351ad3bdb3f27bd0ca12552da03
diff --git a/dev-perl/XML-LibXML/XML-LibXML-1.940.0.ebuild b/dev-perl/XML-LibXML/XML-LibXML-1.940.0.ebuild
new file mode 100644
index 000000000000..3ebaf173d830
--- /dev/null
+++ b/dev-perl/XML-LibXML/XML-LibXML-1.940.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/XML-LibXML/XML-LibXML-1.940.0.ebuild,v 1.1 2012/03/04 07:46:08 tove Exp $
+
+EAPI=4
+
+MODULE_AUTHOR=SHLOMIF
+MODULE_VERSION=1.94
+inherit perl-module
+
+DESCRIPTION="A Perl module to parse XSL Transformational sheets using gnome's libXSLT"
+
+SLOT="0"
+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 ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="
+ >=dev-perl/XML-SAX-0.120.0
+ >=dev-libs/libxml2-2.6.21
+ >=dev-perl/XML-NamespaceSupport-1.70.0
+"
+DEPEND="${RDEPEND}
+ test? (
+ dev-perl/Test-Pod
+ )
+"
+
+SRC_TEST="do"
+
+# rac can't discern any difference between the build with or without
+# this, and if somebody wants to reactivate it, get it out of global
+# scope.
+#export PERL5LIB=`perl -e 'print map { ":$ENV{D}/$_" } @INC'`
+mytargets="pure_install doc_install"
+
+src_compile() {
+ export SKIP_SAX_INSTALL=1
+ perl-module_src_compile
+}
+
+pkg_postinst() {
+ pkg_update_parser add XML::LibXML::SAX::Parser
+ pkg_update_parser add XML::LibXML::SAX
+}
+
+pkg_postrm() {
+ pkg_update_parser remove XML::LibXML::SAX::Parser
+ pkg_update_parser remove XML::LibXML::SAX
+}
+
+pkg_update_parser() {
+ # pkg_update_parser [add|remove] $parser_module
+ local action=$1
+ local parser_module=$2
+
+ if [[ "$ROOT" = "/" ]] ; then
+ einfo "Update Parser: $1 $2"
+ perl -MXML::SAX -e "XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()" \
+ || ewarn "Update Parser: $1 $2 failed"
+ else
+ elog "To $1 $2 run:"
+ elog "perl -MXML::SAX -e 'XML::SAX->${action}_parser(q(${parser_module}))->save_parsers()'"
+ fi
+}
diff --git a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.0.12.ebuild b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.0.12.ebuild
index 664074a69273..e84736b12edd 100644
--- a/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.0.12.ebuild
+++ b/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.0.12.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.0.12.ebuild,v 1.5 2012/03/01 19:54:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Net_LDAP2/PEAR-Net_LDAP2-2.0.12.ebuild,v 1.6 2012/03/03 20:30:37 klausman Exp $
EAPI="4"
inherit php-pear-r1
-KEYWORDS="~alpha amd64 hppa ppc ~sparc x86"
+KEYWORDS="alpha amd64 hppa ppc ~sparc x86"
DESCRIPTION="OO interface for searching and manipulating LDAP-entries"
LICENSE="LGPL-2.1"
diff --git a/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.2.ebuild b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.2.ebuild
index 7dd41c117e46..5df59829b6ce 100644
--- a/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.2.ebuild
+++ b/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.2.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.2.ebuild,v 1.6 2012/02/01 11:13:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Spreadsheet_Excel_Writer/PEAR-Spreadsheet_Excel_Writer-0.9.2.ebuild,v 1.7 2012/03/03 20:31:40 klausman Exp $
inherit php-pear-r1 eutils
DESCRIPTION="Package for generating Excel spreadsheets"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86"
RDEPEND=">=dev-php/PEAR-OLE-0.5-r1"
IUSE=""
diff --git a/dev-util/biew/biew-6.1.0-r1.ebuild b/dev-util/biew/biew-6.1.0-r2.ebuild
similarity index 89%
rename from dev-util/biew/biew-6.1.0-r1.ebuild
rename to dev-util/biew/biew-6.1.0-r2.ebuild
index c1be1d2e9c40..7912e6029934 100644
--- a/dev-util/biew/biew-6.1.0-r1.ebuild
+++ b/dev-util/biew/biew-6.1.0-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/biew-6.1.0-r1.ebuild,v 1.3 2011/04/05 15:30:44 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/biew/biew-6.1.0-r2.ebuild,v 1.1 2012/03/04 09:54:46 pacho Exp $
EAPI=4
inherit eutils flag-o-matic toolchain-funcs versionator
@@ -28,6 +28,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-610-fix_localedep-1.patch"
epatch "${FILESDIR}/${PN}-610-portable_configure-1.patch"
+ epatch "${FILESDIR}/${PN}-610-crash.patch"
sed -i -e 's^man/man1/biew.1^share/man/man1/biew.1^' makefile || die "Failed to edit makefile."
}
diff --git a/dev-util/biew/files/biew-610-crash.patch b/dev-util/biew/files/biew-610-crash.patch
new file mode 100644
index 000000000000..244f94a7ad53
--- /dev/null
+++ b/dev-util/biew/files/biew-610-crash.patch
@@ -0,0 +1,28 @@
+If .biewrc does not exist, the setup dialog appears at program start. If you try
+to click a checkbox with the mouse, biew tries to dereference a null pointer
+(because the MainWindow is not yet set).
+
+This patch adds a workaround. Note that you actually cannot click a checkbox.
+But that is what users might expect. (Maybe the biew code should be changed to
+handle this properly.) Well, it is better not to crash, even if the checkboxes
+are not clickable.
+
+ –nico
+
+
+diff -Naur biew-610.orig/events.c biew-610/events.c
+--- biew-610.orig/events.c 2009-09-03 16:57:40.000000000 +0000
++++ biew-610/events.c 2011-09-06 09:41:01.000000000 +0000
+@@ -118,7 +118,11 @@
+ }
+ else
+ {
+- X1 = 0; X2 = twGetClientWidth(MainWnd); Y1 = 1; Y2 = twGetClientHeight(MainWnd) - 1;
++ TWindow *wnd =
++ MainWnd ? MainWnd : /*XXX:drop this line?*/
++ twGetWinAtPos(mx, my);
++ if(!wnd) return KE_MOUSE;
++ X1 = 0; X2 = twGetClientWidth(wnd); Y1 = 1; Y2 = twGetClientHeight(wnd) - 1;
+ }
+ wdh = X2 - X1;
+ hght = Y2 - Y1;
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index d3f05e111685..7a3026746cc7 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,2 +1,2 @@
-DIST schroot_1.4.14.orig.tar.gz 1109550 RMD160 b50b71c6642148785ef63c428f412ec98baf323d SHA1 1268cdd0985c67cfe7fd88537fe2fbfe11853290 SHA256 f7e05924f12b10f4bf4d19b08b7eca21411a8b66fa18c9793c18de853525b76c
DIST schroot_1.4.23.orig.tar.bz2 824291 RMD160 61d9a5e74a9fe9ae6260cdedc1edf6929d77cffc SHA1 896ff4c027e30bf22c3fe64fc39398c20c45c200 SHA256 84931c04a789211a87fa31e3b1a6f6d62b9354d3116ae99e2b6bfa0816349d16
+DIST schroot_1.4.25.orig.tar.bz2 828142 RMD160 7231ac5ffd2ffbc43b7f6930d7db437c6cec392e SHA1 9901b78a1b2ec55e4eb09e299f5224502df3d261 SHA256 664d56065d30a5ba8bfe116243f1ef075767d9d379d064f0a5298cbc7778a30c
diff --git a/dev-util/schroot/files/schroot-1.4.14-debug.patch b/dev-util/schroot/files/schroot-1.4.14-debug.patch
deleted file mode 100644
index 4b5b954e1bc0..000000000000
--- a/dev-util/schroot/files/schroot-1.4.14-debug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 741833bdcba4b9aa7e389d389f42e4fa504d7cc7 Mon Sep 17 00:00:00 2001
-From: Jonathan Callen
-Date: Wed, 5 Jan 2011 01:26:26 -0500
-Subject: [PATCH] schroot-base: fix build with --enable-debug
-
-Rename last instance of the variable sbuild::debug_level to
-sbuild::debug_log_level. This appears to have been missed in commit
-04c19bb6c28295a387e60066c48db7f443e5b925.
----
- bin/schroot-base/schroot-base-main.cc | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/bin/schroot-base/schroot-base-main.cc b/bin/schroot-base/schroot-base-main.cc
-index ac86018..d6cd0b0 100644
---- a/bin/schroot-base/schroot-base-main.cc
-+++ b/bin/schroot-base/schroot-base-main.cc
-@@ -106,7 +106,7 @@ main::run (int argc,
- this->program_options->parse(argc, argv);
-
- #ifdef SBUILD_DEBUG
-- sbuild::debug_level = sbuild::DEBUG_CRITICAL;
-+ sbuild::debug_log_level = sbuild::DEBUG_CRITICAL;
- #endif
-
- if (this->use_syslog)
---
-1.7.3.3
-
diff --git a/dev-util/schroot/schroot-1.4.14.ebuild b/dev-util/schroot/schroot-1.4.25.ebuild
similarity index 75%
rename from dev-util/schroot/schroot-1.4.14.ebuild
rename to dev-util/schroot/schroot-1.4.25.ebuild
index 2b9f7bdadc4a..ba56c14f4c53 100644
--- a/dev-util/schroot/schroot-1.4.14.ebuild
+++ b/dev-util/schroot/schroot-1.4.25.ebuild
@@ -1,34 +1,33 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.14.ebuild,v 1.7 2011/12/13 22:24:32 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/schroot/schroot-1.4.25.ebuild,v 1.1 2012/03/03 21:20:28 abcd Exp $
-EAPI="3"
-WANT_AUTOMAKE="1.11"
+EAPI="4"
-inherit autotools base flag-o-matic pam
+inherit autotools base pam versionator
MY_P=${PN}_${PV}
DESCRIPTION="Utility to execute commands in a chroot environment"
HOMEPAGE="http://packages.debian.org/source/sid/schroot"
-SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="amd64 x86"
-#IUSE="btrfs +dchroot debug doc lvm nls pam test"
-IUSE="+dchroot debug doc lvm nls pam test"
+KEYWORDS="~amd64 ~x86"
+IUSE="btrfs +dchroot debug doc lvm nls pam test"
COMMON_DEPEND="
>=dev-libs/boost-1.42.0
dev-libs/lockdev
>=sys-apps/util-linux-2.16
+ btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
lvm? ( sys-fs/lvm2 )
pam? ( sys-libs/pam )
"
-# btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 )
DEPEND="${COMMON_DEPEND}
+ sys-apps/groff
doc? (
app-doc/doxygen
media-gfx/graphviz
@@ -44,14 +43,11 @@ RDEPEND="${COMMON_DEPEND}
PATCHES=(
"${FILESDIR}/${PN}-1.4.7-tests.patch"
- "${FILESDIR}/${P}-debug.patch"
)
src_prepare() {
base_src_prepare
- append-flags -DBOOST_FILESYSTEM_VERSION=2
-
# Don't depend on cppunit unless we are testing
use test || sed -i '/AM_PATH_CPPUNIT/d' configure.ac
@@ -62,7 +58,7 @@ src_configure() {
root_tests=no
use test && (( EUID == 0 )) && root_tests=yes
econf \
- --disable-btrfs-snapshot \
+ $(use_enable btrfs btrfs-snapshot) \
$(use_enable doc doxygen) \
$(use_enable dchroot) \
$(use_enable dchroot dchroot-dsa) \
@@ -78,11 +74,10 @@ src_configure() {
--disable-static \
--localstatedir="${EPREFIX}"/var \
--with-bash-completion-dir="${EPREFIX}"/usr/share/bash-completion
-# $(use_enable btrfs btrfs-snapshot) \
}
src_compile() {
- emake all $(usev doc) || die "emake failed"
+ emake all $(usev doc)
}
src_test() {
@@ -94,21 +89,19 @@ src_test() {
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ default
insinto /usr/share/doc/${PF}/contrib/setup.d
- doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh || die "installation of contrib scripts failed"
-
- newinitd "${FILESDIR}"/schroot.initd schroot || die "installation of init.d script failed"
- newconfd "${FILESDIR}"/schroot.confd schroot || die "installation of conf.d file failed"
+ doins contrib/setup.d/09fsck contrib/setup.d/10mount-ssh
- dodoc AUTHORS ChangeLog NEWS README THANKS TODO || die "installation of docs failed"
+ newinitd "${FILESDIR}"/schroot.initd schroot
+ newconfd "${FILESDIR}"/schroot.confd schroot
if use doc; then
docinto html/sbuild
- dohtml doc/sbuild/html/* || die "installation of html docs failed"
+ dohtml doc/sbuild/html/*
docinto html/schroot
- dohtml doc/schroot/html/* || die "installation of html docs failed"
+ dohtml doc/schroot/html/*
fi
if use pam; then
@@ -121,9 +114,7 @@ src_install() {
}
pkg_preinst() {
- export had_older_1_4_1=false
- has_version "=dev-haskell/network-2.2[profile?]
+ =dev-lang/ghc-6.10.1
+ net-misc/curl
+ virtual/mta"
+
+# darcs also has a library version; we thus need $DEPEND
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ doc? ( virtual/latex-base
+ || ( dev-tex/latex2html[png]
+ dev-tex/latex2html[gif]
+ )
+ )
+ test? ( dev-haskell/test-framework[profile?]
+ dev-haskell/test-framework-hunit[profile?]
+ dev-haskell/test-framework-quickcheck2[profile?]
+ )
+ "
+
+src_prepare() {
+ cd "${S}/contrib"
+ epatch "${FILESDIR}/${PN}-1.0.9-bashcomp.patch"
+ cd ..
+
+ epatch "${FILESDIR}/${PN}-2.5.2-relax-regex-libs-deps.patch"
+ epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.2.patch"
+ epatch "${FILESDIR}/${PN}-2.5.2-tests-ghc-7.2.patch"
+ epatch "${FILESDIR}/${PN}-2.5.2-relax-http-libs-deps.patch"
+ epatch "${FILESDIR}/${PN}-2.5.2-ghc-7.4.patch"
+
+ # hlint tests tend to break on every newly released hlint
+ rm "${S}/tests/haskell_policy.sh"
+ rm "${S}/tests/external.sh" || die # relies on example.com layout bug #392647
+
+ # use a more recent API, and thus depend on a more recent package
+ sed -i -e "s/findBy/find/" "${S}/src/Darcs/Test/Patch/Info.hs" || die "sed s/findBy/find/ not necessary"
+}
+
+src_configure() {
+ # checking whether ghc supports -threaded flag
+ # Beware: http://www.haskell.org/ghc/docs/latest/html/users_guide/options-phases.html#options-linker
+ # contains: 'The ability to make a foreign call that does not block all other Haskell threads.'
+ # It might have interactivity impact.
+
+ threaded_flag=""
+ if $(ghc-getghc) --info | grep "Support SMP" | grep -q "YES"; then
+ threaded_flag="--flags=threaded"
+ einfo "$P will be built with threads support"
+ else
+ threaded_flag="--flags=-threaded"
+ einfo "$P will be built without threads support"
+ fi
+
+ # Use curl for net stuff to avoid strict version dep on HTTP and network
+ cabal_src_configure \
+ --flags=curl \
+ --flags=-http \
+ --flags=curl-pipelining \
+ --flags=color \
+ --flags=terminfo \
+ --flags=mmap \
+ $threaded_flag \
+ $(cabal_flag test)
+}
+
+src_test() {
+ # run cabal test from haskell-cabal
+ haskell-cabal_src_test || die "cabal test failed"
+
+ # run the unit tests (not part of cabal test for some reason...)
+ # breaks the cabal abstraction a bit...
+ "${S}/dist/build/unit/unit" || die "unit tests failed"
+}
+
+src_install() {
+ cabal_src_install
+ dobashcompletion "${S}/contrib/darcs_completion" "${PN}"
+
+ rm "${ED}/usr/bin/unit" 2> /dev/null
+
+ # fixup perms in such an an awkward way
+ mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
+ doman "${S}/darcs.1" || die "failed to register darcs.1 as a manpage"
+
+ # if tests were enabled, make sure the unit test driver is deleted
+ rm -rf "${ED}/usr/bin/unit"
+}
+
+pkg_postinst() {
+ ghc-package_pkg_postinst
+ bash-completion_pkg_postinst
+
+ ewarn "NOTE: in order for the darcs send command to work properly,"
+ ewarn "you must properly configure your mail transport agent to relay"
+ ewarn "outgoing mail. For example, if you are using ssmtp, please edit"
+ ewarn "${EPREFIX}/etc/ssmtp/ssmtp.conf with appropriate values for your site."
+}
diff --git a/dev-vcs/darcs/darcs-2.5.2.ebuild b/dev-vcs/darcs/darcs-2.5.2.ebuild
index fca1343234bb..2a64ec4849f2 100644
--- a/dev-vcs/darcs/darcs-2.5.2.ebuild
+++ b/dev-vcs/darcs/darcs-2.5.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2.ebuild,v 1.2 2011/12/08 20:42:47 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/darcs/darcs-2.5.2.ebuild,v 1.3 2012/03/04 07:20:25 gienah Exp $
EAPI="3"
CABAL_FEATURES="bin lib profile haddock hscolour"
-inherit haskell-cabal bash-completion
+inherit haskell-cabal bash-completion-r1
DESCRIPTION="a distributed, interactive, smart revision control system"
HOMEPAGE="http://darcs.net/"
@@ -15,19 +15,19 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="doc test"
-RDEPEND="=dev-haskell/hashed-storage-0.5*
- =dev-haskell/haskeline-0.6*
- =dev-haskell/html-1.0*
- =dev-haskell/network-2.2
- =dev-haskell/network-2.2[profile?]
+ =dev-lang/ghc-6.10.1
net-misc/curl
virtual/mta"
@@ -40,9 +40,9 @@ DEPEND="${RDEPEND}
dev-tex/latex2html[gif]
)
)
- test? ( dev-haskell/test-framework
- dev-haskell/test-framework-hunit
- dev-haskell/test-framework-quickcheck2
+ test? ( dev-haskell/test-framework[profile?]
+ dev-haskell/test-framework-hunit[profile?]
+ dev-haskell/test-framework-quickcheck2[profile?]
)
"
diff --git a/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch b/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch
new file mode 100644
index 000000000000..3b51fea4a953
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch
@@ -0,0 +1,139 @@
+--- darcs-2.5.2-orig/darcs.cabal 2011-12-19 20:44:08.644140399 +1100
++++ darcs-2.5.2/darcs.cabal 2011-12-24 10:03:14.325396692 +1100
+@@ -124,7 +124,7 @@
+ else
+ buildable: True
+
+- build-tools: ghc >= 6.10 && < 7.4
++ build-tools: ghc >= 6.10 && < 7.6
+
+ hs-source-dirs: src
+ include-dirs: src
+@@ -174,17 +174,17 @@
+ mtl >= 1.0 && < 2.1,
+ parsec >= 2.0 && < 3.2,
+ html == 1.0.*,
+- filepath >= 1.1.0.0 && < 1.3.0.0,
++ filepath >= 1.1.0.0 && < 1.5.0.0,
+ haskeline >= 0.6.2.2 && < 0.7,
+ hashed-storage >= 0.5.2 && < 0.6,
+ base >= 3,
+ bytestring >= 0.9.0 && < 0.10,
+ text == 0.11.*,
+- old-time == 1.0.*,
++ old-time >= 1.0 && < 1.2,
+ directory >= 1.0.0.0 && < 1.2.0.0,
+ process >= 1.0 && < 1.2,
+ containers >= 0.1 && < 0.5,
+- array >= 0.1 && < 0.4,
++ array >= 0.1 && < 0.5,
+ random == 1.0.*,
+ tar == 0.3.*,
+ zlib >= 0.5.1.0 && < 0.6.0.0,
+@@ -208,7 +208,7 @@
+ else
+ buildable: True
+
+- build-tools: ghc >= 6.10 && < 7.4
++ build-tools: ghc >= 6.10 && < 7.6
+
+ hs-source-dirs: src
+ include-dirs: src
+@@ -379,7 +379,7 @@
+ mtl >= 1.0 && < 2.1,
+ parsec >= 2.0 && < 3.2,
+ html == 1.0.*,
+- filepath >= 1.1.0.0 && < 1.3.0.0,
++ filepath >= 1.1.0.0 && < 1.5.0.0,
+ haskeline >= 0.6.2.2 && < 0.7,
+ hashed-storage >= 0.5.2 && < 0.6,
+ tar == 0.3.*
+@@ -390,11 +390,11 @@
+ build-depends: base >= 3,
+ bytestring >= 0.9.0 && < 0.10,
+ text == 0.11.*,
+- old-time == 1.0.*,
++ old-time >= 1.0 && < 1.2,
+ directory >= 1.0.0.0 && < 1.2.0.0,
+ process >= 1.0 && < 1.2,
+ containers >= 0.1 && < 0.5,
+- array >= 0.1 && < 0.4,
++ array >= 0.1 && < 0.5,
+ random == 1.0.*
+
+
+@@ -483,7 +483,7 @@
+ src/umask.c
+ src/Crypt/sha2.c
+
+- build-tools: ghc >= 6.10 && < 7.4
++ build-tools: ghc >= 6.10 && < 7.6
+
+ -- We need optimizations, regardless of what Hackage says
+ -- Note: "if true" works around a cabal bug with order of flag composition
+@@ -527,7 +527,7 @@
+ mtl >= 1.0 && < 2.1,
+ parsec >= 2.0 && < 3.2,
+ html == 1.0.*,
+- filepath >= 1.1.0.0 && < 1.3.0.0,
++ filepath >= 1.1.0.0 && < 1.5.0.0,
+ haskeline >= 0.6.2.2 && < 0.7,
+ hashed-storage >= 0.5.2 && < 0.6,
+ tar == 0.3.*
+@@ -538,11 +538,11 @@
+ build-depends: base >= 3,
+ bytestring >= 0.9.0 && < 0.10,
+ text == 0.11.*,
+- old-time == 1.0.*,
++ old-time >= 1.0 && < 1.2,
+ directory >= 1.0.0.0 && < 1.2.0.0,
+ process >= 1.0 && < 1.2,
+ containers >= 0.1 && < 0.5,
+- array >= 0.1 && < 0.4,
++ array >= 0.1 && < 0.5,
+ random == 1.0.*
+
+ if flag(curl)
+@@ -615,7 +615,7 @@
+ else
+ buildable: True
+
+- build-tools: ghc >= 6.10 && < 7.4
++ build-tools: ghc >= 6.10 && < 7.6
+
+ build-depends: base < 5,
+ extensible-exceptions >= 0.1 && < 0.2,
+@@ -623,7 +623,7 @@
+ mtl >= 1.0 && < 2.1,
+ parsec >= 2.0 && < 3.2,
+ html == 1.0.*,
+- filepath >= 1.1.0.0 && < 1.3.0.0,
++ filepath >= 1.1.0.0 && < 1.5.0.0,
+ QuickCheck >= 2.1.0.0,
+ HUnit >= 1.0,
+ test-framework >= 0.2.2,
+@@ -684,11 +684,11 @@
+ bytestring >= 0.9.0 && < 0.10,
+ haskeline >= 0.6.2.2 && < 0.7,
+ text == 0.11.*,
+- old-time == 1.0.*,
++ old-time >= 1.0 && < 1.2,
+ directory >= 1.0.0.0 && < 1.2.0.0,
+ process >= 1.0 && < 1.2,
+ containers >= 0.1 && < 0.5,
+- array >= 0.1 && < 0.4,
++ array >= 0.1 && < 0.5,
+ hashed-storage >= 0.5.2 && < 0.6,
+ random == 1.0.*
+
+--- darcs-2.5.2-orig/src/Darcs/Utils.hs 2011-03-14 09:40:46.000000000 +1100
++++ darcs-2.5.2/src/Darcs/Utils.hs 2011-12-24 10:07:16.125342597 +1100
+@@ -62,7 +62,7 @@
+ , TreeMonad, tree )
+ import Storage.Hashed.Tree( Tree, listImmediate, findTree )
+
+-showHexLen :: (Integral a) => Int -> a -> String
++showHexLen :: (Integral a, Show a) => Int -> a -> String
+ showHexLen n x = let s = showHex x ""
+ in replicate (n - length s) ' ' ++ s
+
diff --git a/dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch b/dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch
new file mode 100644
index 000000000000..05b1ea20e6a7
--- /dev/null
+++ b/dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch
@@ -0,0 +1,38 @@
+--- darcs-2.5.2-orig/darcs.cabal 2011-12-19 20:43:28.551322710 +1100
++++ darcs-2.5.2/darcs.cabal 2011-12-19 20:44:08.644140399 +1100
+@@ -195,7 +195,7 @@
+ build-depends: unix >= 1.0 && < 2.6
+ if flag(http)
+ build-depends: network >= 2.2 && < 2.4,
+- HTTP >= 3000.0 && < 4000.2
++ HTTP >= 3000.0 && < 4000.3
+
+
+ -- ----------------------------------------------------------------------
+@@ -420,7 +420,7 @@
+
+ if flag(http)
+ build-depends: network >= 2.2 && < 2.4,
+- HTTP >= 3000.0 && < 4000.2
++ HTTP >= 3000.0 && < 4000.3
+ cpp-options: -DHAVE_HTTP
+ x-have-http:
+
+@@ -554,7 +554,7 @@
+
+ if flag(http)
+ build-depends: network >= 2.2 && < 2.4,
+- HTTP >= 3000.0 && < 4000.2
++ HTTP >= 3000.0 && < 4000.3
+ cpp-options: -DHAVE_HTTP
+ x-have-http:
+
+@@ -705,7 +705,7 @@
+
+ if flag(http)
+ build-depends: network >= 2.2 && < 2.4,
+- HTTP >= 3000.0 && < 4000.2
++ HTTP >= 3000.0 && < 4000.3
+
+ if flag(color)
+ x-use-color:
diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index f9d46960f13f..68ff0a072d64 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -1,9 +1,9 @@
# Eclass for building dev-java/ant-* packages
#
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2 or later
# Author Vlastimil Babka
-# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.10 2012/02/16 22:25:20 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ant-tasks.eclass,v 1.11 2012/03/03 22:39:14 caster Exp $
# we set ant-core dep ourselves, restricted
JAVA_ANT_DISABLE_ANT_CORE_DEP=true
@@ -59,6 +59,13 @@ ANT_TASK_NAME="${PN#ant-}"
# -----------------------------------------------------------------------------
ANT_TASK_DEPNAME=${ANT_TASK_DEPNAME-${ANT_TASK_NAME}}
+# -----------------------------------------------------------------------------
+# @variable-preinherit ANT_TASK_DISABLE_VM_DEPS
+# @variable-default unset
+#
+# If set, no JDK/JRE deps are added.
+# -----------------------------------------------------------------------------
+
# -----------------------------------------------------------------------------
# @variable-internal ANT_TASK_PV
# @variable-default Just the number in $PV without any beta/RC suffixes
@@ -99,10 +106,15 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
-RDEPEND=">=virtual/jre-${ANT_TASK_JREVER}
- ~dev-java/ant-core-${PV}"
-DEPEND=">=virtual/jdk-${ANT_TASK_JDKVER}
- ${RDEPEND}"
+RDEPEND="~dev-java/ant-core-${PV}"
+DEPEND="${RDEPEND}"
+
+if [[ -z "${ANT_TASK_DISABLE_VM_DEPS}" ]]; then
+ RDEPEND=">=virtual/jre-${ANT_TASK_JREVER}
+ ${DEPEND}"
+ DEPEND=">=virtual/jdk-${ANT_TASK_JDKVER}
+ ${RDEPEND}"
+fi
# we need direct blockers with old ant-tasks for file collisions - bug #252324
if version_is_at_least 1.7.1 ; then
diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index a4d267856cde..a45e80832a78 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -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/eclass/toolchain.eclass,v 1.521 2012/03/03 02:47:11 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.523 2012/03/04 05:40:27 vapier Exp $
#
# Maintainer: Toolchain Ninjas
@@ -11,8 +11,20 @@ RESTRICT="strip" # cross-compilers need controlled stripping
inherit eutils versionator libtool toolchain-funcs flag-o-matic gnuconfig multilib fixheadtails pax-utils
+if [[ ${PV} == *9999* ]] ; then
+ EGIT_REPO_URI="git://gcc.gnu.org/git/gcc.git"
+ # naming style:
+ # gcc-9999 -> master
+ # gcc-4.7_pre9999 -> 4.7 branch
+ if [[ ${PV} == *_pre9999* ]] ; then
+ EGIT_BRANCH="${PN}_${PV%_pre9999}_branch"
+ EGIT_BRANCH=${EGIT_BRANCH//./_}
+ fi
+ inherit git-2
+fi
+
EXPORT_FUNCTIONS pkg_setup src_unpack src_compile src_test pkg_preinst src_install pkg_postinst pkg_prerm pkg_postrm
-DESCRIPTION="Based on the ${ECLASS} eclass"
+DESCRIPTION="The GNU Compiler Collection"
FEATURES=${FEATURES/multilib-strict/}
#----<< eclass stuff >>----
@@ -262,7 +274,7 @@ get_gcc_src_uri() {
GCC_SRC_URI="ftp://gcc.gnu.org/pub/gcc/prerelease-${PRERELEASE}/gcc-${PRERELEASE}.tar.bz2"
elif [[ -n ${SNAPSHOT} ]] ; then
GCC_SRC_URI="ftp://sources.redhat.com/pub/gcc/snapshots/${SNAPSHOT}/gcc-${SNAPSHOT}.tar.bz2"
- else
+ elif [[ ${PV} != *9999* ]] ; then
GCC_SRC_URI="mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_RELEASE_VER}.tar.bz2"
# we want all branch updates to be against the main release
[[ -n ${BRANCH_UPDATE} ]] && \
@@ -533,6 +545,13 @@ copy_minispecs_gcc_specs() {
#---->> pkg_* <<----
toolchain_pkg_setup() {
+ if [[ -n ${PRERELEASE}${SNAPSHOT} || ${PV} == *9999* ]] &&
+ [[ -z ${I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS} ]]
+ then
+ die "Please \`export I_PROMISE_TO_SUPPLY_PATCHES_WITH_BUGS=1\` or define it in your make.conf if you want to use this version." \
+ "This is to try and cut down on people filing bugs for a compiler we do not currently support."
+ fi
+
# Setup variables which would normally be in the profile
if is_crosscompile ; then
multilib_env ${CTARGET}
@@ -695,11 +714,13 @@ do_gcc_rename_java_bins() {
done
}
toolchain_src_unpack() {
+ [[ ${PV} == *9999* ]] && git-2_src_unpack
+
export BRANDING_GCC_PKGVERSION="Gentoo ${GCC_PVR}"
[[ -z ${UCLIBC_VER} ]] && [[ ${CTARGET} == *-uclibc* ]] && die "Sorry, this version does not support uClibc"
- [[ -z ${GCC_SVN} ]] && gcc_quick_unpack
+ gcc_quick_unpack
cd "${S}"
@@ -1684,7 +1705,7 @@ gcc_quick_unpack() {
unpack gcc-${PRERELEASE}.tar.bz2
elif [[ -n ${SNAPSHOT} ]] ; then
unpack gcc-${SNAPSHOT}.tar.bz2
- else
+ elif [[ ${PV} != *9999* ]] ; then
unpack gcc-${GCC_RELEASE_VER}.tar.bz2
# We want branch updates to be against a release tarball
if [[ -n ${BRANCH_UPDATE} ]] ; then
diff --git a/games-strategy/freecol/Manifest b/games-strategy/freecol/Manifest
index 691fa2700429..0cbb80158721 100644
--- a/games-strategy/freecol/Manifest
+++ b/games-strategy/freecol/Manifest
@@ -1 +1,2 @@
+DIST freecol-0.10.5-src.zip 43940502 RMD160 3abcce59962a4215c40d700c332004b6b9b3d651 SHA1 c2e59bdf1108e84a51174ad06a8ebc69cf9f45e6 SHA256 8971fbba22ee556e28ccb0f10a48faeb8a33f37c46b15c8ca01cae4d8899076f
DIST freecol-0.8.4-src.tar.gz 32836449 RMD160 d4f489852089c34245f312649668fd1413e06e54 SHA1 152164aa4901ab822e8949a68a140d1dd1537224 SHA256 d53de3da5d3cb3d5b1035033395e6fb1c6f54b7a4bd88c91bc52b7a3d18ca671
diff --git a/games-strategy/freecol/files/freecol-0.10.5-gentoo.patch b/games-strategy/freecol/files/freecol-0.10.5-gentoo.patch
new file mode 100644
index 000000000000..e0a7487ab025
--- /dev/null
+++ b/games-strategy/freecol/files/freecol-0.10.5-gentoo.patch
@@ -0,0 +1,30 @@
+--- build.xml.old 2012-03-03 20:28:27.470899027 +0100
++++ build.xml 2012-03-03 20:29:27.702662193 +0100
+@@ -41,15 +41,13 @@
+
+
+
+-
++
+
+-
++
+
+-
++
+
+
+-
+-
+
+
+
+@@ -151,7 +149,7 @@
+
+
+
+-
++
+
+
+
diff --git a/games-strategy/freecol/freecol-0.10.5.ebuild b/games-strategy/freecol/freecol-0.10.5.ebuild
new file mode 100644
index 000000000000..b1ce95d3d2f4
--- /dev/null
+++ b/games-strategy/freecol/freecol-0.10.5.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/freecol/freecol-0.10.5.ebuild,v 1.1 2012/03/03 20:42:07 tupone Exp $
+
+EAPI=2
+
+inherit base eutils java-pkg-2 java-ant-2 games
+
+DESCRIPTION="An open source clone of the game Colonization"
+HOMEPAGE="http://www.freecol.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEP="dev-java/jsr173
+ dev-java/wstx:3.2
+ dev-java/commons-cli:1
+ dev-java/cortado
+ dev-java/miglayout"
+
+DEPEND=">=virtual/jdk-1.5
+ app-arch/unzip
+ ${COMMON_DEP}"
+RDEPEND=">=virtual/jre-1.5
+ ${COMMON_DEP}"
+
+S="${WORKDIR}"/${PN}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+java_prepare() {
+ cd jars
+ rm jsr173_1.0_api.jar
+ rm wstx-lgpl-4.0pr1.jar
+ rm commons-cli-1.1.jar
+ rm miglayout-3.7.3.1-swing.jar
+ rm cortado-0.6.0.jar
+ rm jogg-0.0.7.jar
+ rm jorbis-0.0.15.jar
+}
+
+src_prepare() {
+ base_src_prepare
+ java-pkg-2_src_prepare
+}
+
+src_configure() {
+ java-ant-2_src_configure
+}
+
+src_compile() {
+ EANT_BUILD_TARGET=package
+ EANT_EXTRA_ARGS="
+ -Dstax.jar=$(java-pkg_getjars jsr173)
+ -Dwoodstox.jar=$(java-pkg_getjars wstx-3.2)
+ -Dcli.jar=$(java-pkg_getjars commons-cli-1)
+ -Dmiglayout.jar=$(java-pkg_getjars miglayout)
+ -Dcortado.jar=$(java-pkg_getjars cortado)
+ "
+ java-pkg-2_src_compile
+}
+
+src_install() {
+ java-pkg_jarinto "${GAMES_DATADIR}"/${PN}/jars
+ java-pkg_dojar jars/vorbisspi1.0.3.jar
+ java-pkg_dojar jars/tritonus_share.jar
+ java-pkg_jarinto "${GAMES_DATADIR}"/${PN}
+ java-pkg_dojar FreeCol.jar
+ java-pkg_dolauncher ${PN} \
+ -into "${GAMES_PREFIX}" \
+ --pwd "${GAMES_DATADIR}"/${PN} \
+ --jar FreeCol.jar \
+ --java_args -Xmx512M
+ insinto "${GAMES_DATADIR}"/${PN}
+ doins -r data schema splash.jpg || die "doins failed"
+ doicon ${PN}.xpm
+ make_desktop_entry ${PN} FreeCol
+ dodoc README || die "dodoc failed"
+ prepgamesdirs
+}
+
+pkg_setup() {
+ games_pkg_setup
+ java-pkg-2_pkg_setup
+}
+
+pkg_preinst() {
+ games_pkg_preinst
+ java-pkg-2_pkg_preinst
+}
diff --git a/gpe-base/libgpewidget/files/libgpewidget-0.117-linguas.patch b/gpe-base/libgpewidget/files/libgpewidget-0.117-linguas.patch
new file mode 100644
index 000000000000..85e3b68b6881
--- /dev/null
+++ b/gpe-base/libgpewidget/files/libgpewidget-0.117-linguas.patch
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.old 2012-03-03 20:53:16.237577607 +0100
++++ po/Makefile.in.in 2012-03-03 20:54:09.303580162 +0100
+@@ -56,7 +56,7 @@
+
+ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+
+-USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
++USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep -E \" ?$$lang ?\"`"; then printf "$$lang "; fi; done; fi)
+
+ USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
diff --git a/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild b/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild
index 1fd419678f7d..fe589969d714 100644
--- a/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild
+++ b/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild,v 1.7 2011/05/15 22:21:30 miknix Exp $
+# $Header: /var/cvsroot/gentoo-x86/gpe-base/libgpewidget/libgpewidget-0.117-r1.ebuild,v 1.8 2012/03/03 20:14:56 miknix Exp $
EAPI=2
GPE_TARBALL_SUFFIX="bz2"
@@ -34,6 +34,9 @@ GPE_DOCS="ChangeLog"
GPECONF="$(use_enable cairo)"
src_prepare() {
+ # Fix LINGUAS bug #406419
+ epatch "${FILESDIR}/${P}-linguas.patch"
+
# Fix underlinking, bug #367421
sed -i -e 's/^infoprint_LDADD =/infoprint_LDADD = -lX11/' Makefile.am \
|| die 'Failed to sed Makefile.am'
diff --git a/mail-filter/anomy-sanitizer/Manifest b/mail-filter/anomy-sanitizer/Manifest
index f3ba76cc134b..c119facf0257 100644
--- a/mail-filter/anomy-sanitizer/Manifest
+++ b/mail-filter/anomy-sanitizer/Manifest
@@ -1,2 +1,3 @@
DIST anomy-sanitizer-1.76.tar.gz 172722 RMD160 30c005dd475442e655aaaf7c0021cf1d54107d1b SHA1 621f7ce20876d8d5f8c3d756f8756a66dcbf7950 SHA256 aece7173df7984a6b1b050e58e9e1aaef2393ff9a5f7b808e3176ba76a3347f4
DIST sample_e-mail-architecture.png.tar 20480 RMD160 62eb78880013f5605ae1a92c541a100056401471 SHA1 bdf46f2e7d4b87f59c7fb31c769fe0d0767d33ce SHA256 1ead0d73dac23611dc5162f0203414364b96cd1b436682f78507b9b2bef57d9d
+DIST sample_e-mail-architektur.flw 7001 RMD160 8254f818d2f1239c3f0ea4066858db6eedb62374 SHA1 ca621688a192f08c5217c1a2b39011ce675edb31 SHA256 eca14ee6bf771a824c698c47a701cef26f4f496d29b3602722bfb0164a8616f6
diff --git a/mail-filter/anomy-sanitizer/anomy-sanitizer-1.76-r1.ebuild b/mail-filter/anomy-sanitizer/anomy-sanitizer-1.76-r1.ebuild
index 02e252a38e12..cccafffccc14 100644
--- a/mail-filter/anomy-sanitizer/anomy-sanitizer-1.76-r1.ebuild
+++ b/mail-filter/anomy-sanitizer/anomy-sanitizer-1.76-r1.ebuild
@@ -1,14 +1,16 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/anomy-sanitizer/anomy-sanitizer-1.76-r1.ebuild,v 1.3 2011/06/13 11:57:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/anomy-sanitizer/anomy-sanitizer-1.76-r1.ebuild,v 1.4 2012/03/04 10:16:05 pacho Exp $
+EAPI=4
inherit eutils
DESCRIPTION="Perl based e-mail filtering tool, sensitive to html tags, mime types and attachments"
HOMEPAGE="http://mailtools.anomy.net/"
SRC_URI="
http://dev.gentoo.org/~jlec/distfiles/sample_e-mail-architecture.png.tar
- http://mailtools.anomy.net/dist/${PN}-${PV}.tar.gz"
+ http://mailtools.anomy.net/dist/${PN}-${PV}.tar.gz
+ http://dev.gentoo.org/~pacho/maintainer-needed/sample_e-mail-architektur.flw"
LICENSE="GPL-2"
SLOT="0"
@@ -37,7 +39,7 @@ src_install() {
mv "${S}/contrib" "${D}/usr/share/doc/${PF}/"
insinto /usr/share/doc/${PF}/examples
- doins "${FILESDIR}"/*.{sh,flw} "${WORKDIR}"/*.png
+ doins "${FILESDIR}"/*.sh "${WORKDIR}"/*.png "${DISTDIR}"/*.flw
keepdir ${SANI_CONFDIR}
insinto ${SANI_CONFDIR}
diff --git a/mail-filter/anomy-sanitizer/files/sample_e-mail-architektur.flw b/mail-filter/anomy-sanitizer/files/sample_e-mail-architektur.flw
deleted file mode 100644
index 8ce3f47131c7..000000000000
Binary files a/mail-filter/anomy-sanitizer/files/sample_e-mail-architektur.flw and /dev/null differ
diff --git a/mail-filter/dovecot-antispam/Manifest b/mail-filter/dovecot-antispam/Manifest
index d2063c5f80ca..c37a675c2a9f 100644
--- a/mail-filter/dovecot-antispam/Manifest
+++ b/mail-filter/dovecot-antispam/Manifest
@@ -1,2 +1,3 @@
DIST dovecot-antispam-1.3.tar.bz2 26733 RMD160 1c570b7934577abee11b5659e69a00db9573016e SHA1 e6203cb79907b16632dc6a117faa254c6b975df3 SHA256 b745f13a791c080b49266e262f0c212503b9b9e0180746e78df3cca6b1ffc7a0
DIST dovecot-antispam-2.0_pre20101222.tar.bz2 55586 RMD160 5096b9c963de12483053c2b1abb062f9dd0d87e4 SHA1 ad7fdc2034e38d414b35c1488b2398961f866809 SHA256 d9f0891329a68cc7bb998ad9ba1fb0344aacf3895f7342cfb698677639ce72f8
+DIST dovecot-antispam-2.0_pre20120226.tar.bz2 55626 RMD160 4eb53ff21372e839397649a96bf135f3d359cbeb SHA1 1157e32074fcf6d5ec74cc34f638e9a99dc81fee SHA256 94877156e27383f8c27890d04cc6f597df9cedfc4d52969513f04910477f3933
diff --git a/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20101222.ebuild b/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20101222.ebuild
index 6b27ec3dd778..6c220b4a48dd 100644
--- a/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20101222.ebuild
+++ b/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20101222.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20101222.ebuild,v 1.1 2011/10/24 09:36:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20101222.ebuild,v 1.2 2012/03/03 20:00:43 radhermit Exp $
EAPI="4"
@@ -15,7 +15,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND=">=net-mail/dovecot-2"
+DEPEND="=net-mail/dovecot-2.0*"
RDEPEND="${DEPEND}"
DOCS=( README )
diff --git a/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20120226.ebuild b/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20120226.ebuild
new file mode 100644
index 000000000000..837c78ac3718
--- /dev/null
+++ b/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20120226.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dovecot-antispam/dovecot-antispam-2.0_pre20120226.ebuild,v 1.1 2012/03/03 19:51:09 radhermit Exp $
+
+EAPI="4"
+
+inherit autotools
+
+DESCRIPTION="A dovecot antispam plugin supporting multiple backends"
+HOMEPAGE="http://wiki2.dovecot.org/Plugins/Antispam"
+SRC_URI="http://dev.gentoo.org/~radhermit/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=net-mail/dovecot-2.1.0"
+RDEPEND="${DEPEND}"
+
+DOCS=( README )
+
+src_prepare() {
+ AT_M4DIR="m4" eautoreconf
+}
+
+pkg_postinst() {
+ elog
+ elog "You will need to install mail-filter/dspam or app-text/crm114"
+ elog "if you want to use the related backends in dovecot-antispam."
+ elog
+}
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 097ba1d1b5a7..656631eb3b3a 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,4 +1,4 @@
-DIST postfix-2.10-20120218.tar.gz 3760226 RMD160 d9935129ff9059b4216de0c4952447cc929f2fd8 SHA1 db0ee370224abb0be3b2e057788f739d606d46bf SHA256 4079af81f8ea6bfa02cad1f384a64714e3c84a2959317e06f13eb46b6c17a643
+DIST postfix-2.10-20120303.tar.gz 3763418 RMD160 62ce2aba5c354ba99ffe53faf01443343a319784 SHA1 dad01f456cc1ec85ac9b2f00949dce7ce5ec4a21 SHA256 8fcde474fdb1d8e834288f4035100f815a01157b611d56ea5298be5dbcab824d
DIST postfix-2.7.4.tar.gz 3423968 RMD160 4f3e0db43c55cd50b3fb4493dbc698ff3f343294 SHA1 c755ceb3a5ee983f3b72f08e1fffb6384b1f1865 SHA256 9bad5851e8a7c97890ee9465e7f675f7826d56361369d3e792a79eaf98ed2b11
DIST postfix-2.7.5.tar.gz 3425071 RMD160 a900ff09c0a54382a4af62b609f6ddaba17963fc SHA1 066cc87f602f2daf1d3207de92ca08de9eb16bab SHA256 2fe408f49bc8540bc41b44f1b7ee7a27561f1baa4e25ef55645778ba96d15932
DIST postfix-2.7.6.tar.gz 3425286 RMD160 9961b959ae34a1fe1d3bf70acce1f16e5ada255d SHA1 9a2cd652abdc0d3cf29563261d5c0f407d8d7bf9 SHA256 4f7546d25463c5fc300eccd05c302a44458b1cc8dfda02c7205daa0038d5ab17
diff --git a/mail-mta/postfix/postfix-2.10_pre20120218.ebuild b/mail-mta/postfix/postfix-2.10_pre20120303.ebuild
similarity index 98%
rename from mail-mta/postfix/postfix-2.10_pre20120218.ebuild
rename to mail-mta/postfix/postfix-2.10_pre20120303.ebuild
index 3d091976ab22..8d42bf6dd079 100644
--- a/mail-mta/postfix/postfix-2.10_pre20120218.ebuild
+++ b/mail-mta/postfix/postfix-2.10_pre20120303.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/mail-mta/postfix/postfix-2.10_pre20120218.ebuild,v 1.1 2012/02/18 19:40:32 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/postfix/postfix-2.10_pre20120303.ebuild,v 1.1 2012/03/04 05:44:31 eras Exp $
EAPI=4
@@ -216,8 +216,7 @@ src_install () {
# Set proper permissions on required files/directories
dodir /var/lib/postfix
keepdir /var/lib/postfix
- fowners postfix:postfix /var/lib/postfix
- fowners postfix:postfix /var/lib/postfix/.keep*
+ fowners -R postfix:postfix /var/lib/postfix
fperms 0750 /var/lib/postfix
fowners root:postdrop /usr/sbin/post{drop,queue}
fperms 02711 /usr/sbin/post{drop,queue}
diff --git a/media-gfx/fbv/fbv-1.0b.ebuild b/media-gfx/fbv/fbv-1.0b.ebuild
index c53d51354ddc..01b2a9602534 100644
--- a/media-gfx/fbv/fbv-1.0b.ebuild
+++ b/media-gfx/fbv/fbv-1.0b.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild,v 1.15 2011/09/14 11:31:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild,v 1.16 2012/03/04 09:16:22 pacho Exp $
EAPI=4
inherit eutils toolchain-funcs
@@ -22,7 +22,8 @@ DEPEND="${RDEPEND}"
src_prepare() {
epatch \
"${FILESDIR}"/oob-segfault-fbv-${PV}.diff \
- "${FILESDIR}"/${P}-libpng15.patch
+ "${FILESDIR}"/${P}-libpng15.patch \
+ "${FILESDIR}"/${P}-cc.patch
sed -i -e 's:-lungif:-lgif:g' configure Makefile || die
}
@@ -35,6 +36,8 @@ src_configure() {
use jpeg || myconf="${myconf} --without-libjpeg"
./configure \
+ --cc="$(tc-getCC)" \
+ --libs="${LDFLAGS}" \
--prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
diff --git a/media-gfx/fbv/files/fbv-1.0b-cc.patch b/media-gfx/fbv/files/fbv-1.0b-cc.patch
new file mode 100644
index 000000000000..531148f10816
--- /dev/null
+++ b/media-gfx/fbv/files/fbv-1.0b-cc.patch
@@ -0,0 +1,97 @@
+# --- T2-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# T2 SDE: package/.../fbv/cc.patch
+# Copyright (C) 2007 The T2 SDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This patch file is dual-licensed. It is available under the license the
+# patched project is licensed under, as long as it is an OpenSource license
+# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
+# of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+# --- T2-COPYRIGHT-NOTE-END ---
+
+Imported from Atmel.
+
+ - Rene Rebe
+
+diff -ur fbv-1.0b/configure fbv-1.0b-avr32/configure
+--- fbv-1.0b/configure 2004-09-07 13:29:27.000000000 +0200
++++ fbv-1.0b-avr32/configure 2006-05-04 11:10:06.000000000 +0200
+@@ -21,6 +21,7 @@
+ unset png
+ unset bmp
+ unset dfb
++unset CC
+
+ help(){
+ cat << EOF >&2
+@@ -33,6 +34,7 @@
+ General:
+ --help print this message
+ --libs=LIBS additional libraries required (try -lX11 for ungif, -lz for PNG)
++ --cc=CC specify compiler to use
+
+ Directory and file names:
+ --prefix=PREFIX install files in PREFIX [/usr/local]
+@@ -53,7 +55,7 @@
+ --long help,\
+ prefix:,srcdir:,bindir:,\
+ infodir:,mandir:,\
+-without-libungif,without-libjpeg,without-libpng,without-bmp,libs: \
++without-libungif,without-libjpeg,without-libpng,without-bmp,libs:,cc: \
+ -n "$BASENAME" -- "$@")
+
+ if [ $? != 0 ] ; then help ; exit 1 ; fi
+@@ -65,6 +67,7 @@
+ case "$1" in
+ -h|--help) help ; exit 0 ;;
+ --libs) libs="$2"; shift 2 ;;
++ --cc) CC="$2"; shift 2 ;;
+ --prefix) prefix="$2" ; shift 2 ;;
+ --srcdir) srcdir="$2" ; shift 2 ;;
+ --bindir) bindir="$2" ; shift 2 ;;
+@@ -80,6 +83,7 @@
+ esac
+ done
+
++[ -z "$CC" ] && CC=cc
+ [ -z "$prefix" ] && prefix="/usr/local"
+ [ -z "$bindir" ] && bindir="${prefix}/bin"
+ [ -z "$mandir" ] && mandir="${prefix}/man"
+@@ -106,12 +110,12 @@
+ ungif="no"
+ echo "libungif check" >>./config.log
+ echo " 1st:" >>./config.log
+-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
++$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs
+ if [ -e \$\$~test ]; then
+ libs="-lungif $libs" ; ungif="yes"
+ else
+ echo " 2nd: -lX11 -L$xdir/lib" >>./config.log
+- cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
++ $CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs
+ if [ -e \$\$~test ]; then
+ libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes"
+ fi
+@@ -124,7 +128,7 @@
+ echo -n "checking for libjpeg presence... "
+ if [ "$jpeg" != "disabled" ]; then
+ jpeg="no"
+-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
++$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs
+ if [ -e \$\$~test ]; then
+ libs="-ljpeg $libs" ; jpeg="yes"
+ fi
+@@ -135,7 +139,7 @@
+ echo -n "checking for libpng presence... "
+ if [ "$png" != "disabled" ]; then
+ png="no"
+-cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
++$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs
+ if [ -e \$\$~test ]; then
+ libs="-lpng $libs" ; png="yes"
+ fi
diff --git a/media-gfx/mcomix/mcomix-0.97.1.ebuild b/media-gfx/mcomix/mcomix-0.97.1.ebuild
index 60132b5b13dd..12c0b77dde6c 100644
--- a/media-gfx/mcomix/mcomix-0.97.1.ebuild
+++ b/media-gfx/mcomix/mcomix-0.97.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/media-gfx/mcomix/mcomix-0.97.1.ebuild,v 1.3 2012/02/26 05:00:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mcomix/mcomix-0.97.1.ebuild,v 1.4 2012/03/04 05:03:28 mr_bones_ Exp $
EAPI="3"
@@ -27,7 +27,6 @@ RDEPEND="${DEPEND}
virtual/jpeg
!media-gfx/comix"
-
src_install() {
distutils_src_install
insinto /etc/gconf/schemas/
diff --git a/media-libs/libpng/libpng-1.5.9.ebuild b/media-libs/libpng/libpng-1.5.9.ebuild
index 86d7a1c7f532..2d14afbd09a6 100644
--- a/media-libs/libpng/libpng-1.5.9.ebuild
+++ b/media-libs/libpng/libpng-1.5.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/media-libs/libpng/libpng-1.5.9.ebuild,v 1.10 2012/03/03 15:35:45 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libpng/libpng-1.5.9.ebuild,v 1.11 2012/03/03 19:58:29 armin76 Exp $
EAPI=4
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="as-is"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng neon static-libs"
RDEPEND="sys-libs/zlib"
diff --git a/media-libs/mesa/mesa-7.10.3.ebuild b/media-libs/mesa/mesa-7.10.3.ebuild
index 09f71d9f64c5..d86a6355cc41 100644
--- a/media-libs/mesa/mesa-7.10.3.ebuild
+++ b/media-libs/mesa/mesa-7.10.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.3.ebuild,v 1.11 2011/12/03 22:57:19 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.10.3.ebuild,v 1.12 2012/03/04 09:40:23 jlec Exp $
EAPI=3
@@ -72,7 +72,9 @@ RDEPEND="${EXTERNAL_DEPEND}
x11-libs/libXi
x11-libs/libXmu
x11-libs/libXxf86vm
- motif? ( x11-libs/openmotif )
+ motif? (
+ x11-libs/openmotif
+ !x11-libs/libGLw )
gallium? (
llvm? (
amd64? ( dev-libs/udis86 )
diff --git a/media-libs/mesa/mesa-7.11.2.ebuild b/media-libs/mesa/mesa-7.11.2.ebuild
index 83f96683fa08..630453b04ba0 100644
--- a/media-libs/mesa/mesa-7.11.2.ebuild
+++ b/media-libs/mesa/mesa-7.11.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.2.ebuild,v 1.8 2012/02/19 14:20:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.2.ebuild,v 1.9 2012/03/04 09:40:23 jlec Exp $
EAPI=3
@@ -70,7 +70,9 @@ RDEPEND="${EXTERNAL_DEPEND}
x11-libs/libXi
x11-libs/libXmu
x11-libs/libXxf86vm
- motif? ( x11-libs/openmotif )
+ motif? (
+ x11-libs/openmotif
+ !x11-libs/libGLw )
gallium? (
llvm? ( >=sys-devel/llvm-2.8 )
)
diff --git a/media-libs/mesa/mesa-7.11.ebuild b/media-libs/mesa/mesa-7.11.ebuild
index 73ceb12769c9..da77ebcac210 100644
--- a/media-libs/mesa/mesa-7.11.ebuild
+++ b/media-libs/mesa/mesa-7.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.ebuild,v 1.14 2011/12/03 22:57:19 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.ebuild,v 1.15 2012/03/04 09:40:23 jlec Exp $
EAPI=3
@@ -70,7 +70,9 @@ RDEPEND="${EXTERNAL_DEPEND}
x11-libs/libXi
x11-libs/libXmu
x11-libs/libXxf86vm
- motif? ( x11-libs/openmotif )
+ motif? (
+ x11-libs/openmotif
+ !x11-libs/libGLw )
gallium? (
llvm? ( =x11-libs/openmotif-2.3:0
>=media-libs/freetype-2.0
media-fonts/corefonts
diff --git a/media-libs/pymemphis/pymemphis-0.2.1.ebuild b/media-libs/pymemphis/pymemphis-0.2.1.ebuild
index 7b3cc7005537..abfdf97d7685 100644
--- a/media-libs/pymemphis/pymemphis-0.2.1.ebuild
+++ b/media-libs/pymemphis/pymemphis-0.2.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/media-libs/pymemphis/pymemphis-0.2.1.ebuild,v 1.4 2012/02/26 07:54:56 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/pymemphis/pymemphis-0.2.1.ebuild,v 1.5 2012/03/04 05:03:58 mr_bones_ Exp $
EAPI="3"
@@ -28,7 +28,6 @@ RDEPEND="
media-libs/memphis"
DEPEND="${RDEPEND}"
-
S="${WORKDIR}"/${PN}-mainline
src_prepare() {
diff --git a/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch
new file mode 100644
index 000000000000..38914fd77f15
--- /dev/null
+++ b/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/show_bug.cgi?id=406739
+Nikos Chantziaras 2012-03-03 03:13:39 EST
+
+There's a bug in the current version of SDL_mixer where failing to load a WAV sample will result in freeing a resource twice, resulting in an application crash. There is an upstream fix for this:
+
+http://hg.libsdl.org/SDL_mixer/rev/ea53a85853dd
+
+Upstream bug: http://bugzilla.libsdl.org/show_bug.cgi?id=1418
+
+--- a/mixer.c
++++ b/mixer.c
+@@ -610,13 +610,15 @@
+ break;
+ default:
+ SDL_SetError("Unrecognized sound file type");
+- return(0);
++ if ( freesrc ) {
++ SDL_RWclose(src);
++ }
++ loaded = NULL;
++ break;
+ }
+ if ( !loaded ) {
++ /* The individual loaders have closed src if needed */
+ SDL_free(chunk);
+- if ( freesrc ) {
+- SDL_RWclose(src);
+- }
+ return(NULL);
+ }
+
+
+
+
+
diff --git a/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild b/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild
index 5c720e189aa3..c576052903d7 100644
--- a/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild
+++ b/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild
@@ -1,8 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild,v 1.3 2012/02/08 18:41:32 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12.ebuild,v 1.4 2012/03/04 05:51:05 mr_bones_ Exp $
EAPI=4
+inherit eutils
MY_P=${P/sdl-/SDL_}
DESCRIPTION="Simple Direct Media Layer Mixer Library"
@@ -27,6 +28,10 @@ DEPEND=">=media-libs/libsdl-1.2.10
S=${WORKDIR}/${MY_P}
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-wav.patch
+}
+
src_configure() {
econf \
--disable-dependency-tracking \
diff --git a/media-plugins/vdr-duplicates/Manifest b/media-plugins/vdr-duplicates/Manifest
new file mode 100644
index 000000000000..f9e6f502ad51
--- /dev/null
+++ b/media-plugins/vdr-duplicates/Manifest
@@ -0,0 +1 @@
+DIST vdr-duplicates-0.0.4.tgz 14618 RMD160 b26dea0f19d631dfaac50fa4928540f9ca4f01b1 SHA1 59b49111efe2d4c32e8c74d624b98e6ec34803ae SHA256 de53834d4b090da3ad8884f5908485ff587e3c7518f84129f61d16d4d17f1422
diff --git a/app-portage/autounmask/metadata.xml b/media-plugins/vdr-duplicates/metadata.xml
similarity index 57%
rename from app-portage/autounmask/metadata.xml
rename to media-plugins/vdr-duplicates/metadata.xml
index 7096bfe7dc7a..5f9f14619db8 100644
--- a/app-portage/autounmask/metadata.xml
+++ b/media-plugins/vdr-duplicates/metadata.xml
@@ -1,11 +1,10 @@
+media-tv
-maintainer-needed@gentoo.org
+vdr@gentoo.org
+Gentoo VDR Project
-
-Unmasking packages the easy way.
-
diff --git a/media-plugins/vdr-duplicates/vdr-duplicates-0.0.4.ebuild b/media-plugins/vdr-duplicates/vdr-duplicates-0.0.4.ebuild
new file mode 100644
index 000000000000..37624ddf3772
--- /dev/null
+++ b/media-plugins/vdr-duplicates/vdr-duplicates-0.0.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-duplicates/vdr-duplicates-0.0.4.ebuild,v 1.1 2012/03/03 21:45:15 hd_brummy Exp $
+
+EAPI="4"
+
+inherit vdr-plugin
+
+DESCRIPTION="VDR Plugin: show duplicated records"
+HOMEPAGE="http://www.tolleri.net/vdr/"
+SRC_URI="http://www.tolleri.net/vdr/plugins/${P}.tgz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.6.0"
+RDEPEND="${DEPEND}"
diff --git a/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff
new file mode 100644
index 000000000000..3a8babbc16fb
--- /dev/null
+++ b/media-plugins/vdr-epgsearch/files/vdr-epgsearch-1.0.0_vdr-1.7.25.diff
@@ -0,0 +1,32 @@
+--- epgsearch/conflictcheck.h.bak 2012-03-03 15:33:15.000000000 +0100
++++ epgsearch/conflictcheck.h 2012-03-03 15:35:43.000000000 +0100
+@@ -169,12 +169,12 @@
+ result = true;
+ #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
+ else
+- result = Priority >= Setup.PrimaryLimit;
++ result = Priority >= 0;
+ #endif
+ #endif
+ }
+ else
+- result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
++ result = !IsPrimaryDevice() || Priority >= 0;
+ }
+ else
+ needsDetachReceivers = true;
+@@ -259,12 +259,12 @@
+ result = true;
+ #ifdef DO_REC_AND_PLAY_ON_PRIMARY_DEVICE
+ else
+- result = Priority >= Setup.PrimaryLimit;
++ result = Priority >= 0;
+ #endif
+ #endif
+ }
+ else
+- result = !IsPrimaryDevice() || Priority >= Setup.PrimaryLimit;
++ result = !IsPrimaryDevice() || Priority >= 0;
+ }
+ else
+ needsDetachReceivers = true;
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0.ebuild
index 669e496d143c..60d18e94be39 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-1.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/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0.ebuild,v 1.2 2012/02/16 15:09:16 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-1.0.0.ebuild,v 1.3 2012/03/03 21:15:53 hd_brummy Exp $
EAPI="4"
@@ -38,6 +38,10 @@ src_prepare() {
fix_vdr_libsi_include conflictcheck.c
+ if has_version ">=media-video/vdr-1.7.25"; then
+ epatch "${FILESDIR}/${P}_vdr-1.7.25.diff"
+ fi
+
# disable automagic deps
sed -i Makefile -e '/^AUTOCONFIG=/s/^/#/'
diff --git a/media-plugins/vdr-streamdev/files/vdr-streamdev-0.5.1_vdr-1.7.25.diff b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.5.1_vdr-1.7.25.diff
new file mode 100644
index 000000000000..32b9cc9664f2
--- /dev/null
+++ b/media-plugins/vdr-streamdev/files/vdr-streamdev-0.5.1_vdr-1.7.25.diff
@@ -0,0 +1,13 @@
+--- streamdev/client/device.c.bak 2012-03-03 15:27:48.000000000 +0100
++++ streamdev/client/device.c 2012-03-03 15:28:07.000000000 +0100
+@@ -313,8 +313,8 @@
+ m_Device->Lock();
+ if (m_Device->m_UpdatePriority && ClientSocket.DataSocket(siLive)) {
+ int Priority = m_Device->Priority();
+- if (m_Device == cDevice::ActualDevice() && Priority < Setup.PrimaryLimit)
+- Priority = Setup.PrimaryLimit;
++ if (m_Device == cDevice::ActualDevice() && Priority < 0)
++ Priority = 0;
+ if (m_Device->m_Priority != Priority && ClientSocket.SetPriority(Priority))
+ m_Device->m_Priority = Priority;
+ }
diff --git a/media-plugins/vdr-streamdev/vdr-streamdev-0.5.1-r1.ebuild b/media-plugins/vdr-streamdev/vdr-streamdev-0.5.1-r1.ebuild
new file mode 100644
index 000000000000..442f2c4bec17
--- /dev/null
+++ b/media-plugins/vdr-streamdev/vdr-streamdev-0.5.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-streamdev/vdr-streamdev-0.5.1-r1.ebuild,v 1.1 2012/03/03 20:52:08 hd_brummy Exp $
+
+EAPI="4"
+
+inherit vdr-plugin
+
+VERSION="497" # every bump, new version !
+
+DESCRIPTION="VDR Plugin: Client/Server streaming plugin"
+HOMEPAGE="http://projects.vdr-developer.org/projects/plg-streamdev"
+SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="client +server"
+
+DEPEND=">=media-video/vdr-1.5.9"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE=" || ( client server ) "
+
+src_prepare() {
+ vdr-plugin_src_prepare
+
+ if has_version ">=media-video/vdr-1.7.25"; then
+ epatch "${FILESDIR}/${P}_vdr-1.7.25.diff"
+ fi
+
+ # make subdir libdvbmpeg respect CXXFLAGS
+ sed -i Makefile \
+ -e '/CXXFLAGS.*+=/s:^:#:'
+
+ for flag in client server; do
+ if ! use ${flag}; then
+ sed -i Makefile \
+ -e '/^.PHONY:/s/'${flag}'//' \
+ -e '/^all:/s/'${flag}'//'
+ fi
+ done
+
+ sed -i server/Makefile \
+ -i client/Makefile \
+ -e "s:\$(CXXFLAGS) -shared:\$(CXXFLAGS) \$(LDFLAGS) -shared:"
+
+ fix_vdr_libsi_include server/livestreamer.c
+}
+
+src_install() {
+ vdr-plugin_src_install
+
+ cd "${S}"
+ if use server; then
+ insinto /etc/vdr/plugins/streamdev-server
+ newins streamdev-server/streamdevhosts.conf streamdevhosts.conf
+ chown vdr:vdr "${D}"/etc/vdr -R
+
+ insinto /usr/share/vdr/streamdev
+ doins streamdev-server/externremux.sh
+
+ insinto /usr/share/vdr/rcscript
+ newins "${FILESDIR}"/rc-addon-0.5.0.sh plugin-streamdev-server.sh
+
+ insinto /etc/conf.d
+ newins "${FILESDIR}"/confd-0.5.0 vdr.streamdev-server
+ fi
+}
+
+pkg_postinst() {
+ vdr-plugin_pkg_postinst
+
+ if [[ -e "${ROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf ]]; then
+ einfo "move config file to new config DIR ${ROOT}/etc/vdr/plugins/streamdev-server/"
+ mv "${ROOT}"/etc/vdr/plugins/streamdev/streamdevhosts.conf "${ROOT}"/etc/vdr/plugins/streamdev-server/streamdevhosts.conf
+ fi
+}
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild
index ab8942dfdc39..011483217032 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.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/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild,v 1.8 2012/03/03 14:45:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3.ebuild,v 1.9 2012/03/03 20:33:03 klausman Exp $
EAPI=2
@@ -12,7 +12,7 @@ SRC_URI="http://www.jackaudio.org/downloads/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
IUSE="3dnow altivec alsa coreaudio doc debug examples mmx oss sse cpudetection pam"
RDEPEND=">=media-libs/libsndfile-1.0.0
diff --git a/media-video/em8300-libraries/Manifest b/media-video/em8300-libraries/Manifest
index e6a6abff2ef5..560e26c04b52 100644
--- a/media-video/em8300-libraries/Manifest
+++ b/media-video/em8300-libraries/Manifest
@@ -1,3 +1,4 @@
DIST em8300-0.17.4.tar.gz 394137 RMD160 7f24dd9b3458811aadfb3d4dea4e14f55fb416f4 SHA1 94bf0e783c57d5c661e84c3a4a5b4f8850de735a SHA256 1dda9ed6ae350a22087df4ebafb495e4cff2f54b7b744ef062ec5f52a1ef0631
DIST em8300-0.18.0.tar.gz 395500 RMD160 0c9189f54a472c8378254ddcc30aec4dcfe1ce7e SHA1 f779cc74faa9dd97d37248ee379741b481b36d2a SHA256 c598d6dfceb6180c13f7575e493405c9a576322e09e06857d322a9b30f4cc960
+DIST em8300-0.18.0_p20120124.tar.gz 1842088 RMD160 17df820961d602987bb8276a6f82476f3ee679b7 SHA1 0f552b3a6686a56279862a3733c765952144aabe SHA256 227342e073873ccea48f72941e0ff1c83103f2e9889a95f772f938a141c4bf0c
DIST em8300-gtk-2.0.m4.tbz2 2626 RMD160 ec261ffedea180fac5d367718cf19f8d6fda15c7 SHA1 18c56b95c1bd4a76e51423b309c010049729deac SHA256 7c84db94da23cd31fbdf420fcb4decbd2624675085fdf35031b4e177a4596531
diff --git a/media-video/em8300-libraries/em8300-libraries-0.18.0_p20120124.ebuild b/media-video/em8300-libraries/em8300-libraries-0.18.0_p20120124.ebuild
new file mode 100644
index 000000000000..89d00f6ed746
--- /dev/null
+++ b/media-video/em8300-libraries/em8300-libraries-0.18.0_p20120124.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/em8300-libraries-0.18.0_p20120124.ebuild,v 1.1 2012/03/04 03:55:23 hd_brummy Exp $
+
+EAPI=2
+inherit autotools
+
+MY_P=${P/-libraries}
+
+DESCRIPTION="em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card libraries"
+HOMEPAGE="http://dxr3.sourceforge.net"
+SRC_URI="http://vdr.websitec.de/download/${MY_P}.tar.gz
+ mirror://gentoo/em8300-gtk-2.0.m4.tbz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="gtk modules"
+
+COMMON_DEPEND="gtk? ( x11-libs/gtk+:2 )"
+RDEPEND="${COMMON_DEPEND}
+ modules? ( ~media-video/em8300-modules-${PV} )"
+DEPEND="${COMMON_DEPEND}
+ dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # Separate kernel modules and fix Makefile bug.
+ sed -i \
+ -e 's:modules/\ ::g' \
+ -e "s:test -z \"\$(firmwaredir)\":test -z\"\$(DESTDIR)(firmwaredir)\":g" \
+ Makefile.am || die
+
+ # Fix asneeded linking.
+ sed -i \
+ -e "s:AM_LDFLAGS:LDADD:" \
+ {dhc,overlay}/Makefile.am || die
+
+ AT_M4DIR=${WORKDIR} eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable gtk gtktest)
+}
+
+src_install() {
+ dodir /lib/firmware
+ emake DESTDIR="${D}" em8300incdir=/usr/include/linux install || die
+ dodoc AUTHORS ChangeLog README
+}
+
+pkg_postinst() {
+ elog "The em8300 libraries and modules have now been installed,"
+ elog "you will probably want to add /usr/bin/em8300setup to your"
+ elog "/etc/conf.d/local.start so that your em8300 card is "
+ elog "properly initialized on boot."
+ elog
+ elog "If you still need a microcode other than the one included"
+ elog "with the package, you can simply use em8300setup "
+}
diff --git a/media-video/em8300-modules/Manifest b/media-video/em8300-modules/Manifest
index e5657199918d..a2849237ea5a 100644
--- a/media-video/em8300-modules/Manifest
+++ b/media-video/em8300-modules/Manifest
@@ -1,2 +1,3 @@
DIST em8300-0.17.4.tar.gz 394137 RMD160 7f24dd9b3458811aadfb3d4dea4e14f55fb416f4 SHA1 94bf0e783c57d5c661e84c3a4a5b4f8850de735a SHA256 1dda9ed6ae350a22087df4ebafb495e4cff2f54b7b744ef062ec5f52a1ef0631
DIST em8300-0.18.0.tar.gz 395500 RMD160 0c9189f54a472c8378254ddcc30aec4dcfe1ce7e SHA1 f779cc74faa9dd97d37248ee379741b481b36d2a SHA256 c598d6dfceb6180c13f7575e493405c9a576322e09e06857d322a9b30f4cc960
+DIST em8300-0.18.0_p20120124.tar.gz 1842088 RMD160 17df820961d602987bb8276a6f82476f3ee679b7 SHA1 0f552b3a6686a56279862a3733c765952144aabe SHA256 227342e073873ccea48f72941e0ff1c83103f2e9889a95f772f938a141c4bf0c
diff --git a/media-video/em8300-modules/em8300-modules-0.18.0_p20120124.ebuild b/media-video/em8300-modules/em8300-modules-0.18.0_p20120124.ebuild
new file mode 100644
index 000000000000..2ddca84df6b5
--- /dev/null
+++ b/media-video/em8300-modules/em8300-modules-0.18.0_p20120124.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.18.0_p20120124.ebuild,v 1.1 2012/03/04 03:56:58 hd_brummy Exp $
+
+EAPI=2
+inherit eutils linux-mod
+
+MY_P=${P/-modules}
+
+DESCRIPTION="em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card kernel modules"
+HOMEPAGE="http://dxr3.sourceforge.net"
+SRC_URI="http://vdr.websitec.de/download/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="virtual/linux-sources"
+
+CONFIG_CHECK="I2C"
+MODULE_NAMES="em8300(video:) bt865(video:) adv717x(video:)"
+
+S=${WORKDIR}/${MY_P}/modules
+
+src_compile() {
+ set_arch_to_kernel
+ emake KERNEL_LOCATION="${KERNEL_DIR}" || die
+}
+
+src_install() {
+ linux-mod_src_install
+
+ dodoc README-modoptions README-modules.conf
+
+ newsbin devices.sh em8300-devices.sh
+
+ insinto /etc/modprobe.d
+ newins "${FILESDIR}"/modules.em8300 em8300.conf
+
+ insinto /etc/udev/rules.d
+ newins em8300-udev.rules 15-em8300.rules
+}
+
+pkg_preinst() {
+ linux-mod_pkg_preinst
+
+ local old1="${ROOT}/etc/modprobe.d/em8300"
+ local old2="${ROOT}/etc/modules.d/em8300"
+ local new="${ROOT}/etc/modprobe.d/em8300.conf"
+
+ if [[ ! -a ${new} ]]; then
+ if [[ -a ${old1} ]]; then
+ elog "Renaming em8300-modprobe configuration to em8300.conf"
+ mv "${old1}" "${new}"
+ elif [[ -a ${old2} ]]; then
+ elog "Moving old em8300 configuration in /etc/modules.d to new"
+ elog "location in /etc/modprobe.d"
+ mv "${old2}" "${new}"
+ fi
+ fi
+}
diff --git a/media-video/minitube/Manifest b/media-video/minitube/Manifest
index 733b150156b6..cf257fb08101 100644
--- a/media-video/minitube/Manifest
+++ b/media-video/minitube/Manifest
@@ -1,2 +1,3 @@
DIST minitube-1.6.tar.gz 580452 RMD160 d3c6761944954e1a9c0661a2706138ac1b1542b0 SHA1 2e373ff8abe7abf8c0b1e9d38e7acae49287d13a SHA256 ec1df6e7e92291afab504942e2e0f64eb8ba055de2aeabb534616fd9bd7ecbfc
+DIST minitube-1.7.1.tar.gz 589478 RMD160 0284143ab6410894f262a95ef0c0e6d9bc07c8bd SHA1 9172bd1380b01a9b8e310ecc6fbdec1579b337c8 SHA256 0a0dc5f59dc5343f0928c428220c0cdc52014848399916a0741b999a8730acae
DIST minitube-1.7.tar.gz 566495 RMD160 97bdb1897b75627fc2c4806b1420a16bb38fea60 SHA1 ccf93da104584ccbfcbdc55b63c9725acb8cd490 SHA256 ceed4b685209a66321c007947aa9f9ce79886978b78d736dd88b77d4c3fbfb9d
diff --git a/media-video/minitube/minitube-1.7.1.ebuild b/media-video/minitube/minitube-1.7.1.ebuild
new file mode 100644
index 000000000000..f8f712a2c047
--- /dev/null
+++ b/media-video/minitube/minitube-1.7.1.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/media-video/minitube/minitube-1.7.1.ebuild,v 1.1 2012/03/03 19:08:03 hwoarang Exp $
+
+EAPI=4
+LANGS="ca da el en_US es es_AR es_ES fr gl hr hu ia id it nb nl pl pt pt_BR
+ ro ru sl sq sr sv_SE te tr zh_CN"
+LANGSLONG="ca_ES de_DE fi_FI he_IL id_ID ka_GE pl_PL uk_UA"
+
+inherit qt4-r2
+
+DESCRIPTION="Qt4 YouTube Client"
+HOMEPAGE="http://flavio.tordini.org/minitube"
+SRC_URI="http://flavio.tordini.org/files/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gstreamer kde"
+
+DEPEND=">=x11-libs/qt-gui-4.6:4[accessibility]
+ >=x11-libs/qt-dbus-4.6:4
+ kde? ( || ( media-libs/phonon[gstreamer?] >=x11-libs/qt-phonon-4.6:4 ) )
+ !kde? ( || ( >=x11-libs/qt-phonon-4.6:4 media-libs/phonon[gstreamer?] ) )
+ gstreamer? (
+ media-plugins/gst-plugins-soup
+ media-plugins/gst-plugins-ffmpeg
+ media-plugins/gst-plugins-faac
+ media-plugins/gst-plugins-faad
+ )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+DOCS="AUTHORS CHANGES TODO"
+
+src_prepare() {
+ qt4-r2_src_prepare
+
+ # Remove unneeded translations
+ local lang= trans=
+ for lang in ${LANGS}; do
+ use linguas_${lang} && trans+=" ${lang}.ts"
+ done
+ for lang in ${LANGSLONG}; do
+ use linguas_${lang%_*} && trans+=" ${lang}.ts"
+ done
+ if [[ -n ${trans} ]]; then
+ sed -i -e "/^TRANSLATIONS/s/+=.*/+=${trans}/" locale/locale.pri || die
+ fi
+}
+
+src_install() {
+ qt4-r2_src_install
+ newicon images/app.png minitube.png
+}
diff --git a/metadata/cache/app-admin/puppet-2.7.11 b/metadata/cache/app-admin/puppet-2.7.11
index 460941847cf8..9fcfb47e79e7 100644
--- a/metadata/cache/app-admin/puppet-2.7.11
+++ b/metadata/cache/app-admin/puppet-2.7.11
@@ -6,7 +6,7 @@ mirror://rubygems/puppet-2.7.11.gem
http://puppetlabs.com/
Apache-2.0
A system automation and configuration management software
-amd64 hppa ppc ~sparc x86
+amd64 hppa ppc sparc x86
elisp-common eutils java-utils-2 multilib ruby-fakegem ruby-ng toolchain-funcs user versionator xemacs-elisp-common
augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs test elibc_FreeBSD ruby_targets_ruby18 test test
|| ( ruby_targets_ruby18 )
diff --git a/metadata/cache/app-admin/python-updater-0.10-r2 b/metadata/cache/app-admin/python-updater-0.10-r2
new file mode 100644
index 000000000000..657de32cd191
--- /dev/null
+++ b/metadata/cache/app-admin/python-updater-0.10-r2
@@ -0,0 +1,22 @@
+
+dev-lang/python || ( >=sys-apps/portage-2.1.6 >=sys-apps/paludis-0.56.0 )
+0
+http://people.apache.org/~Arfrever/gentoo/python-updater-0.10.tar.bz2
+
+http://www.gentoo.org/proj/en/Python/
+GPL-2
+Script used to reinstall Python packages after changing of active Python versions
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+eutils multilib toolchain-funcs user
+
+
+
+
+
+
+compile install unpack
+
+
+
+
+
diff --git a/metadata/cache/app-admin/tenshi-0.12 b/metadata/cache/app-admin/tenshi-0.12
index e77b41f098e3..5fa9971a1355 100644
--- a/metadata/cache/app-admin/tenshi-0.12
+++ b/metadata/cache/app-admin/tenshi-0.12
@@ -12,7 +12,7 @@ eutils multilib toolchain-funcs user
-3
+4
install postinst prepare setup
diff --git a/metadata/cache/app-misc/vlock-2.2.2-r2 b/metadata/cache/app-misc/vlock-2.2.2-r2
deleted file mode 100644
index 3d625d2b57df..000000000000
--- a/metadata/cache/app-misc/vlock-2.2.2-r2
+++ /dev/null
@@ -1,22 +0,0 @@
-pam? ( sys-libs/pam ) test? ( dev-util/cunit )
-pam? ( sys-libs/pam )
-0
-http://cthulhu.c3d2.de/~toidinamai/vlock/archive/vlock-2.2.2.tar.gz
-
-http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html
-GPL-2
-A console screen locker
-alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
-eutils flag-o-matic multilib pam toolchain-funcs user
-pam test
-
-
-
-
-
-compile install setup unpack
-
-
-
-
-
diff --git a/metadata/cache/app-portage/autounmask-0.27 b/metadata/cache/app-portage/autounmask-0.27
deleted file mode 100644
index 96df39067721..000000000000
--- a/metadata/cache/app-portage/autounmask-0.27
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-lang/perl >=dev-perl/PortageXS-0.02.09 virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter
-dev-lang/perl >=dev-perl/PortageXS-0.02.09 virtual/perl-Term-ANSIColor dev-perl/Shell-EnvImporter sys-apps/portage
-0
-http://download.mpsna.de/opensource/autounmask/autounmask-0.27.tar.gz
-
-http://download.mpsna.de/opensource/autounmask/
-GPL-2
-autounmask - Unmasking packages the easy way
-alpha amd64 arm hppa ia64 ppc ~ppc64 sparc x86 ~x86-fbsd
-
-
-
-
-
-
-
-install
-
-
-
-
-
diff --git a/metadata/cache/app-portage/eix-0.23.9 b/metadata/cache/app-portage/eix-0.24.0
similarity index 95%
rename from metadata/cache/app-portage/eix-0.23.9
rename to metadata/cache/app-portage/eix-0.24.0
index afb4558e9423..324ff30af2b3 100644
--- a/metadata/cache/app-portage/eix-0.23.9
+++ b/metadata/cache/app-portage/eix-0.24.0
@@ -1,7 +1,7 @@
sqlite? ( >=dev-db/sqlite-3 ) nls? ( virtual/libintl ) zsh-completion? ( !!=dev-db/sqlite-3 ) nls? ( virtual/libintl ) zsh-completion? ( !!=sys-apps/portage-2.1 dev-python/pygtk:2 gnome-base/libglade:2.0 dev-python/pygtksourceview:2 nls? ( virtual/libintl ) nls? ( >=sys-devel/gettext-0.14 ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[xml,threads]
+>=sys-apps/portage-2.1 dev-python/pygtk:2 gnome-base/libglade:2.0 dev-python/pygtksourceview:2 nls? ( virtual/libintl ) >=app-admin/eselect-python-20091230 =dev-lang/python-2* =dev-lang/python-2*[xml,threads]
+0
+mirror://sourceforge/porthole/porthole-0.6.1.tar.bz2
+
+http://porthole.sourceforge.net
+GPL-2
+A GTK+-based frontend to Portage
+~amd64 ~ppc ~sparc ~x86 ~x86-fbsd
+distutils eutils multilib python toolchain-funcs user
+nls linguas_de linguas_pl linguas_ru linguas_vi linguas_it linguas_fr linguas_tr
+
+
+
+2
+
+compile install postinst postrm preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/app-text/dos2unix-5.2.1 b/metadata/cache/app-text/dos2unix-5.2.1
deleted file mode 100644
index b0242e54d510..000000000000
--- a/metadata/cache/app-text/dos2unix-5.2.1
+++ /dev/null
@@ -1,22 +0,0 @@
-!app-text/hd2u !app-text/unix2dos virtual/libintl dev-lang/perl
-!app-text/hd2u !app-text/unix2dos virtual/libintl
-0
-http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-5.2.1.tar.gz mirror://sourceforge/dos2unix/dos2unix-5.2.1.tar.gz
-
-http://www.xs4all.nl/~waterlan/dos2unix.html http://sourceforge.net/projects/dos2unix/
-BSD-2
-Convert DOS or MAC text files to UNIX format or vice versa
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
-eutils multilib toolchain-funcs user
-debug nls
-
-
-
-3
-
-compile install prepare
-
-
-
-
-
diff --git a/metadata/cache/dev-games/cegui-0.7.6-r1 b/metadata/cache/dev-games/cegui-0.7.6-r1
new file mode 100644
index 000000000000..ce101e74a0fe
--- /dev/null
+++ b/metadata/cache/dev-games/cegui-0.7.6-r1
@@ -0,0 +1,22 @@
+bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) truetype? ( media-libs/freetype:2 ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua dev-lua/toluapp ) ogre? ( >=dev-games/ogre-1.7 ) opengl? ( virtual/opengl virtual/glu media-libs/freeglut media-libs/glew ) pcre? ( dev-libs/libpcre ) tinyxml? ( dev-libs/tinyxml ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 ) zip? ( sys-libs/zlib[minizip] ) dev-util/pkgconfig doc? ( app-doc/doxygen )
+bidi? ( dev-libs/fribidi ) devil? ( media-libs/devil ) expat? ( dev-libs/expat ) truetype? ( media-libs/freetype:2 ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua dev-lua/toluapp ) ogre? ( >=dev-games/ogre-1.7 ) opengl? ( virtual/opengl virtual/glu media-libs/freeglut media-libs/glew ) pcre? ( dev-libs/libpcre ) tinyxml? ( dev-libs/tinyxml ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 ) zip? ( sys-libs/zlib[minizip] )
+0
+mirror://sourceforge/crayzedsgui/CEGUI-0.7.6.tar.gz doc? ( mirror://sourceforge/crayzedsgui/CEGUI-DOCS-0.7.6.tar.gz )
+
+http://www.cegui.org.uk/
+MIT
+Crazy Eddie's GUI System
+~amd64 -ppc ~x86
+
+bidi debug devil doc examples expat gtk irrlicht lua ogre opengl pcre static-libs tinyxml truetype xerces-c xml zip
+|| ( expat tinyxml xerces-c xml )
+
+
+4
+
+configure install prepare
+
+
+
+
+
diff --git a/metadata/cache/dev-games/ogre-1.7.4 b/metadata/cache/dev-games/ogre-1.7.4
new file mode 100644
index 000000000000..5b8752cff406
--- /dev/null
+++ b/metadata/cache/dev-games/ogre-1.7.4
@@ -0,0 +1,22 @@
+media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt boost? ( dev-libs/boost ) cg? ( media-gfx/nvidia-cg-toolkit ) freeimage? ( media-libs/freeimage ) ois? ( dev-games/ois ) threads? ( poco? ( dev-libs/poco ) tbb? ( dev-cpp/tbb ) ) zip? ( sys-libs/zlib dev-libs/zziplib ) x11-proto/xf86vidmodeproto dev-util/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libX11 x11-libs/libXaw x11-libs/libXrandr x11-libs/libXt boost? ( dev-libs/boost ) cg? ( media-gfx/nvidia-cg-toolkit ) freeimage? ( media-libs/freeimage ) ois? ( dev-games/ois ) threads? ( poco? ( dev-libs/poco ) tbb? ( dev-cpp/tbb ) ) zip? ( sys-libs/zlib dev-libs/zziplib )
+0
+mirror://sourceforge/ogre/ogre_src_v1-7-4.tar.bz2
+test
+http://www.ogre3d.org/
+MIT
+Object-oriented Graphics Rendering Engine
+~amd64 ~x86
+base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
++boost cg doc double-precision examples +freeimage ois +opengl poco profile tbb test threads tools +zip
+threads? ( || ( boost poco tbb ) )
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/ansi-wl-pprint-0.6.4 b/metadata/cache/dev-haskell/ansi-wl-pprint-0.6.4
new file mode 100644
index 000000000000..ff41d22499ce
--- /dev/null
+++ b/metadata/cache/dev-haskell/ansi-wl-pprint-0.6.4
@@ -0,0 +1,22 @@
+=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/ansi-wl-pprint/0.6.4/ansi-wl-pprint-0.6.4.tar.gz
+
+http://github.com/batterseapower/ansi-wl-pprint
+BSD
+The Wadler/Leijen Pretty Printer for colored ANSI terminal output
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+4
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/binary-0.5.1.0 b/metadata/cache/dev-haskell/binary-0.5.1.0
new file mode 100644
index 000000000000..bac3be5e6ed2
--- /dev/null
+++ b/metadata/cache/dev-haskell/binary-0.5.1.0
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/binary/0.5.1.0/binary-0.5.1.0.tar.gz
+
+http://code.haskell.org/binary/
+BSD
+Binary serialisation for Haskell values using lazy ByteStrings
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/cabal-1.14.0 b/metadata/cache/dev-haskell/cabal-1.14.0
new file mode 100644
index 000000000000..9eb17860b283
--- /dev/null
+++ b/metadata/cache/dev-haskell/cabal-1.14.0
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.10.1
+>=dev-lang/ghc-6.10.1 dev-util/pkgconfig dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/Cabal/1.14.0/Cabal-1.14.0.tar.gz
+test
+http://www.haskell.org/cabal/
+BSD
+A framework for packaging Haskell software
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc profile
+
+
+
+4
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/dataenc-0.14.0.3 b/metadata/cache/dev-haskell/dataenc-0.14.0.3
new file mode 100644
index 000000000000..733e03223d38
--- /dev/null
+++ b/metadata/cache/dev-haskell/dataenc-0.14.0.3
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/dataenc/0.14.0.3/dataenc-0.14.0.3.tar.gz
+
+http://www.haskell.org/haskellwiki/Library/Data_encoding
+BSD
+Data encoding library
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+4
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/deepseq-1.3.0.0 b/metadata/cache/dev-haskell/deepseq-1.3.0.0
new file mode 100644
index 000000000000..789d655a5ac3
--- /dev/null
+++ b/metadata/cache/dev-haskell/deepseq-1.3.0.0
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.10.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/deepseq/1.3.0.0/deepseq-1.3.0.0.tar.gz
+
+http://hackage.haskell.org/package/deepseq
+BSD
+Deep evaluation of data structures
+~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+4
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/extensible-exceptions-0.1.1.4 b/metadata/cache/dev-haskell/extensible-exceptions-0.1.1.4
new file mode 100644
index 000000000000..e9d521d3d89f
--- /dev/null
+++ b/metadata/cache/dev-haskell/extensible-exceptions-0.1.1.4
@@ -0,0 +1,22 @@
+>=dev-haskell/cabal-1.6 >=dev-lang/ghc-6.8.1 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.8.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/extensible-exceptions/0.1.1.4/extensible-exceptions-0.1.1.4.tar.gz
+
+http://hackage.haskell.org/cgi-bin/hackage-scripts/package/extensible-exceptions
+BSD
+Extensible exceptions
+~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/haddock-2.10.0_pre20120202 b/metadata/cache/dev-haskell/haddock-2.10.0_pre20120202
new file mode 100644
index 000000000000..2ef8e83f8077
--- /dev/null
+++ b/metadata/cache/dev-haskell/haddock-2.10.0_pre20120202
@@ -0,0 +1,22 @@
+dev-haskell/ghc-paths[profile?] =dev-haskell/xhtml-3000.2*[profile?] >=dev-lang/ghc-7.4 >=dev-haskell/cabal-1.10 hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+dev-haskell/ghc-paths[profile?] =dev-haskell/xhtml-3000.2*[profile?] >=dev-lang/ghc-7.4 dev-lang/ghc
+0
+http://dev.gentoo.org/~gienah/snapshots/haddock-2.10.0_pre20120202.tar.gz
+test
+http://www.haskell.org/haddock/
+BSD
+A documentation-generation tool for Haskell libraries
+~alpha ~amd64 -ia64 ~ppc ~sparc ~x86 ~x86-fbsd
+eutils ghc-package haskell-cabal multilib pax-utils toolchain-funcs user versionator
+hscolour profile
+
+
+
+4
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/hostname-1.0 b/metadata/cache/dev-haskell/hostname-1.0
index 3cda9766136f..bfbd718b59bf 100644
--- a/metadata/cache/dev-haskell/hostname-1.0
+++ b/metadata/cache/dev-haskell/hostname-1.0
@@ -6,13 +6,13 @@ http://hackage.haskell.org/packages/archive/hostname/1.0/hostname-1.0.tar.gz
http://hackage.haskell.org/package/hostname
BSD
A very simple package providing a cross-platform means of determining the hostname
-~amd64 ~x86
+~amd64 ~ppc64 ~x86
eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
doc hscolour profile
-3
+4
compile configure install postinst prerm setup test
diff --git a/metadata/cache/dev-haskell/hpc-0.5.1.1 b/metadata/cache/dev-haskell/hpc-0.5.1.1
new file mode 100644
index 000000000000..1b84494b0eef
--- /dev/null
+++ b/metadata/cache/dev-haskell/hpc-0.5.1.1
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.10.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/hpc/0.5.1.1/hpc-0.5.1.1.tar.gz
+
+http://hackage.haskell.org/package/hpc
+BSD
+Code Coverage Library for Haskell
+~amd64 ~x86
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+3
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/http-4000.1.2 b/metadata/cache/dev-haskell/http-4000.1.2
index da5699fc97e3..68c637d477db 100644
--- a/metadata/cache/dev-haskell/http-4000.1.2
+++ b/metadata/cache/dev-haskell/http-4000.1.2
@@ -1,5 +1,5 @@
-dev-haskell/mtl dev-haskell/network dev-haskell/parsec >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-dev-haskell/mtl dev-haskell/network dev-haskell/parsec >=dev-lang/ghc-6.8.2 dev-lang/ghc
+dev-haskell/mtl[profile?] dev-haskell/network[profile?] dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+dev-haskell/mtl[profile?] dev-haskell/network[profile?] dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2 dev-lang/ghc
0
http://hackage.haskell.org/packages/archive/HTTP/4000.1.2/HTTP-4000.1.2.tar.gz
@@ -12,9 +12,9 @@ doc hscolour profile
-3
+4
-compile configure install postinst prerm setup test
+compile configure install postinst prepare prerm setup test
diff --git a/metadata/cache/dev-haskell/http-4000.2.2 b/metadata/cache/dev-haskell/http-4000.2.2
new file mode 100644
index 000000000000..19ac5625a0dd
--- /dev/null
+++ b/metadata/cache/dev-haskell/http-4000.2.2
@@ -0,0 +1,22 @@
+=dev-haskell/mtl-2.0*[profile?] dev-haskell/network[profile?] dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/cabal-1.10 dev-haskell/hunit[profile?] dev-haskell/httpd-shed[profile?] =dev-haskell/split-0.1*[profile?] dev-haskell/test-framework[profile?] dev-haskell/test-framework-hunit[profile?] ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+=dev-haskell/mtl-2.0*[profile?] dev-haskell/network[profile?] dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/HTTP/4000.2.2/HTTP-4000.2.2.tar.gz
+
+https://github.com/haskell/HTTP
+BSD
+A library for client-side HTTP
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+base eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+test doc hscolour profile
+
+
+
+4
+
+compile configure install postinst prepare prerm setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/httpd-shed-0.4 b/metadata/cache/dev-haskell/httpd-shed-0.4
new file mode 100644
index 000000000000..4306d0592eb4
--- /dev/null
+++ b/metadata/cache/dev-haskell/httpd-shed-0.4
@@ -0,0 +1,22 @@
+dev-haskell/network[profile?] >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.2 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+dev-haskell/network[profile?] >=dev-lang/ghc-6.10.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/httpd-shed/0.4/httpd-shed-0.4.tar.gz
+
+http://hackage.haskell.org/package/httpd-shed
+BSD
+A simple web-server with an interact style API
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+4
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/network-2.3.0.11 b/metadata/cache/dev-haskell/network-2.3.0.11
new file mode 100644
index 000000000000..73e75b3cd7dc
--- /dev/null
+++ b/metadata/cache/dev-haskell/network-2.3.0.11
@@ -0,0 +1,22 @@
+dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.8 test? ( =dev-haskell/cabal-1.1.4 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/network/2.3.0.11/network-2.3.0.11.tar.gz
+
+http://github.com/haskell/network
+BSD
+Low-level networking interface
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+autotools base eutils ghc-package haskell-cabal libtool multilib toolchain-funcs user versionator
+test doc hscolour profile
+
+
+
+4
+
+compile configure install postinst prepare prerm setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/random-1.0.1.1 b/metadata/cache/dev-haskell/random-1.0.1.1
new file mode 100644
index 000000000000..e30fbad62f7a
--- /dev/null
+++ b/metadata/cache/dev-haskell/random-1.0.1.1
@@ -0,0 +1,22 @@
+dev-haskell/time[profile?] >=dev-lang/ghc-6.8.2
+dev-haskell/time[profile?] >=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/random/1.0.1.1/random-1.0.1.1.tar.gz
+
+http://hackage.haskell.org/package/random
+BSD
+random number library
+~alpha ~amd64 -ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+profile
+
+
+
+4
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/split-0.1.4.2 b/metadata/cache/dev-haskell/split-0.1.4.2
new file mode 100644
index 000000000000..e157b032f4d4
--- /dev/null
+++ b/metadata/cache/dev-haskell/split-0.1.4.2
@@ -0,0 +1,22 @@
+>=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/split/0.1.4.2/split-0.1.4.2.tar.gz
+
+http://code.haskell.org/~byorgey/code/split
+BSD
+Combinator library for splitting lists.
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x86-macos
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+4
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/test-framework-0.4.2.0 b/metadata/cache/dev-haskell/test-framework-0.4.2.0
index d6da4c42374d..3d4d5aeac685 100644
--- a/metadata/cache/dev-haskell/test-framework-0.4.2.0
+++ b/metadata/cache/dev-haskell/test-framework-0.4.2.0
@@ -1,12 +1,12 @@
->=dev-haskell/ansi-terminal-0.4.0 >=dev-haskell/ansi-wl-pprint-0.5.1 >=dev-haskell/hostname-1.0 >=dev-haskell/regex-posix-0.72 >=dev-haskell/time-1.1.2 >=dev-haskell/xml-1.3.5 >=dev-lang/ghc-6.10.4 >=dev-haskell/cabal-1.2.3 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
->=dev-haskell/ansi-terminal-0.4.0 >=dev-haskell/ansi-wl-pprint-0.5.1 >=dev-haskell/hostname-1.0 >=dev-haskell/regex-posix-0.72 >=dev-haskell/time-1.1.2 >=dev-haskell/xml-1.3.5 >=dev-lang/ghc-6.10.4 dev-lang/ghc
+>=dev-haskell/ansi-terminal-0.4.0[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1[profile?] >=dev-haskell/hostname-1.0[profile?] >=dev-haskell/regex-posix-0.72[profile?] >=dev-haskell/time-1.1.2[profile?] >=dev-haskell/xml-1.3.5[profile?] >=dev-lang/ghc-6.10.4 >=dev-haskell/cabal-1.2.3 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-haskell/ansi-terminal-0.4.0[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1[profile?] >=dev-haskell/hostname-1.0[profile?] >=dev-haskell/regex-posix-0.72[profile?] >=dev-haskell/time-1.1.2[profile?] >=dev-haskell/xml-1.3.5[profile?] >=dev-lang/ghc-6.10.4 dev-lang/ghc
0
http://hackage.haskell.org/packages/archive/test-framework/0.4.2.0/test-framework-0.4.2.0.tar.gz
http://batterseapower.github.com/test-framework/
BSD
Framework for running and organising tests, with HUnit and QuickCheck support
-~amd64 ~x86
+~amd64 ~ppc64 ~x86
eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
doc hscolour profile
diff --git a/metadata/cache/dev-haskell/test-framework-0.5 b/metadata/cache/dev-haskell/test-framework-0.5
new file mode 100644
index 000000000000..56a4eb416b7e
--- /dev/null
+++ b/metadata/cache/dev-haskell/test-framework-0.5
@@ -0,0 +1,22 @@
+>=dev-haskell/ansi-terminal-0.4.0[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1[profile?] >=dev-haskell/hostname-1.0[profile?] >=dev-haskell/regex-posix-0.72[profile?] >=dev-haskell/time-1.1.2[profile?] >=dev-haskell/xml-1.3.5[profile?] >=dev-lang/ghc-6.10.4 >=dev-haskell/cabal-1.2.3 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-haskell/ansi-terminal-0.4.0[profile?] >=dev-haskell/ansi-wl-pprint-0.5.1[profile?] >=dev-haskell/hostname-1.0[profile?] >=dev-haskell/regex-posix-0.72[profile?] >=dev-haskell/time-1.1.2[profile?] >=dev-haskell/xml-1.3.5[profile?] >=dev-lang/ghc-6.10.4 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/test-framework/0.5/test-framework-0.5.tar.gz
+
+http://batterseapower.github.com/test-framework/
+BSD
+Framework for running and organising tests, with HUnit and QuickCheck support
+~amd64 ~ppc64 ~x86
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+4
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/test-framework-hunit-0.2.7 b/metadata/cache/dev-haskell/test-framework-hunit-0.2.7
new file mode 100644
index 000000000000..4849566f775b
--- /dev/null
+++ b/metadata/cache/dev-haskell/test-framework-hunit-0.2.7
@@ -0,0 +1,22 @@
+>=dev-haskell/cabal-1.2.3 >=dev-lang/ghc-6.10 >=dev-haskell/hunit-1.2[profile?] >=dev-haskell/test-framework-0.2.0[profile?] doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.10 >=dev-haskell/hunit-1.2[profile?] >=dev-haskell/test-framework-0.2.0[profile?] dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/test-framework-hunit/0.2.7/test-framework-hunit-0.2.7.tar.gz
+
+http://batterseapower.github.com/test-framework/
+BSD
+HUnit support for the test-framework package.
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+4
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/test-framework-quickcheck2-0.2.12-r1 b/metadata/cache/dev-haskell/test-framework-quickcheck2-0.2.12-r1
new file mode 100644
index 000000000000..956486e11ed7
--- /dev/null
+++ b/metadata/cache/dev-haskell/test-framework-quickcheck2-0.2.12-r1
@@ -0,0 +1,22 @@
+=dev-haskell/quickcheck-2.4*[profile?] =dev-lang/ghc-6.10.4 >=dev-haskell/cabal-1.2.3 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+=dev-haskell/quickcheck-2.4*[profile?] =dev-lang/ghc-6.10.4 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/test-framework-quickcheck2/0.2.12/test-framework-quickcheck2-0.2.12.tar.gz
+
+http://batterseapower.github.com/test-framework/
+BSD
+QuickCheck2 support for the test-framework package.
+~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+4
+
+compile configure install postinst prepare prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/time-1.4 b/metadata/cache/dev-haskell/time-1.4
new file mode 100644
index 000000000000..0a1984bd59d0
--- /dev/null
+++ b/metadata/cache/dev-haskell/time-1.4
@@ -0,0 +1,22 @@
+>=dev-haskell/deepseq-1.1[profile?] >=dev-lang/ghc-6.10.1 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-haskell/deepseq-1.1[profile?] >=dev-lang/ghc-6.10.1 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/time/1.4/time-1.4.tar.gz
+test
+http://semantic.org/TimeLib/
+BSD
+A time library
+~alpha ~amd64 -ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+4
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-haskell/x11-xft-0.3 b/metadata/cache/dev-haskell/x11-xft-0.3
index ac23228c9fcb..1311ef26f7cc 100644
--- a/metadata/cache/dev-haskell/x11-xft-0.3
+++ b/metadata/cache/dev-haskell/x11-xft-0.3
@@ -1,20 +1,20 @@
->=dev-lang/ghc-6.6.1 >=dev-haskell/utf8-string-0.1 >=dev-haskell/x11-1.2.1 x11-libs/libXft dev-haskell/cabal doc? ( dev-haskell/haddock ) >=dev-haskell/cabal-1.1.4
->=dev-lang/ghc-6.6.1 >=dev-haskell/utf8-string-0.1 >=dev-haskell/x11-1.2.1 x11-libs/libXft dev-lang/ghc
+>=dev-lang/ghc-6.6.1 >=dev-haskell/utf8-string-0.1[profile?] >=dev-haskell/x11-1.2.1[profile?] x11-libs/libXft dev-haskell/cabal doc? ( dev-haskell/haddock ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.6.1 >=dev-haskell/utf8-string-0.1[profile?] >=dev-haskell/x11-1.2.1[profile?] x11-libs/libXft dev-lang/ghc
0
http://hackage.haskell.org/packages/archive/X11-xft/0.3/X11-xft-0.3.tar.gz
http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-xft
LGPL-2.1
Bindings to the Xft, X Free Type interface library, and some Xrender parts
-~amd64 ~x86
-eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+~amd64 ~ppc64 ~x86
+base eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
doc profile
+4
-
-compile install postinst prerm setup test
+compile configure install postinst prepare prerm setup test unpack
diff --git a/metadata/cache/dev-haskell/xml-1.3.12 b/metadata/cache/dev-haskell/xml-1.3.12
new file mode 100644
index 000000000000..613f2b5c7165
--- /dev/null
+++ b/metadata/cache/dev-haskell/xml-1.3.12
@@ -0,0 +1,22 @@
+dev-haskell/text[profile?] >=dev-lang/ghc-6.8.2 dev-haskell/cabal doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+dev-haskell/text[profile?] >=dev-lang/ghc-6.8.2 dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/xml/1.3.12/xml-1.3.12.tar.gz
+
+http://code.galois.com
+BSD
+A simple XML library.
+~amd64 ~ppc64 ~x86
+eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc hscolour profile
+
+
+
+4
+
+compile configure install postinst prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-java/ant-eclipse-ecj-3.7.2 b/metadata/cache/dev-java/ant-eclipse-ecj-3.7.2
new file mode 100644
index 000000000000..4d1925c7fc5a
--- /dev/null
+++ b/metadata/cache/dev-java/ant-eclipse-ecj-3.7.2
@@ -0,0 +1,22 @@
+>=virtual/jre-1.4 ~dev-java/eclipse-ecj-3.7.2 >=dev-java/ant-core-1.7 app-arch/unzip >=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1
+>=virtual/jre-1.4 ~dev-java/eclipse-ecj-3.7.2 >=dev-java/ant-core-1.7 >=dev-java/java-config-2.1.9-r1
+3.7
+http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/ecjsrc-3.7.2.jar
+
+http://www.eclipse.org/
+EPL-1.0
+Ant Compiler Adapter for Eclipse Java Compiler
+~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+eutils java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD
+
+
+
+4
+
+compile install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/ant-nodeps-1.8.2 b/metadata/cache/dev-java/ant-nodeps-1.8.2
index 5135198ebc8f..08d88b0838d3 100644
--- a/metadata/cache/dev-java/ant-nodeps-1.8.2
+++ b/metadata/cache/dev-java/ant-nodeps-1.8.2
@@ -1,11 +1,11 @@
->=dev-java/java-config-2.1.9-r1 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 >=virtual/jdk-1.4 >=virtual/jre-1.4 ~dev-java/ant-core-1.8.2 !dev-java/ant-tasks
->=dev-java/java-config-2.1.9-r1 >=virtual/jre-1.4 ~dev-java/ant-core-1.8.2
+>=dev-java/java-config-2.1.9-r1 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 ~dev-java/ant-core-1.8.2 !dev-java/ant-tasks
+>=dev-java/java-config-2.1.9-r1 ~dev-java/ant-core-1.8.2
0
mirror://apache/ant/source/apache-ant-1.8.2-src.tar.bz2 http://dev.gentoo.org/~caster/distfiles/ant-1.8.2-gentoo.tar.bz2
test
http://ant.apache.org/
Apache-2.0
-Apache Ant's optional tasks requiring no external deps
+Formerly Ant's optional tasks w/o external deps, now compat empty jar
~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
ant-tasks eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
elibc_FreeBSD elibc_FreeBSD
diff --git a/metadata/cache/dev-java/cortado-0.6.0 b/metadata/cache/dev-java/cortado-0.6.0
new file mode 100644
index 000000000000..f2b8b59499e6
--- /dev/null
+++ b/metadata/cache/dev-java/cortado-0.6.0
@@ -0,0 +1,22 @@
+>=virtual/jdk-1.4 app-arch/unzip >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
+0
+http://downloads.xiph.org/releases/cortado/cortado-0.6.0.tar.gz
+
+http://www.theora.org/cortado/
+GPL-2 LGPL-2
+Multimedia framework for Java written by Fluendo
+~amd64 ~x86
+eutils java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+2
+
+compile configure install preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/dev-java/eclipse-ecj-3.7.2 b/metadata/cache/dev-java/eclipse-ecj-3.7.2
new file mode 100644
index 000000000000..d905fe1543f6
--- /dev/null
+++ b/metadata/cache/dev-java/eclipse-ecj-3.7.2
@@ -0,0 +1,22 @@
+>=app-admin/eselect-ecj-0.3 app-arch/unzip >=virtual/jdk-1.6 userland_GNU? ( sys-apps/findutils ) >=dev-java/java-config-2.1.9-r1
+>=app-admin/eselect-ecj-0.3 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
+3.7
+http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/ecjsrc-3.7.2.jar
+
+http://www.eclipse.org/
+EPL-1.0
+Eclipse Compiler for Java
+~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris
+eutils java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
++ant userland_GNU elibc_FreeBSD
+
+ant? ( ~dev-java/ant-eclipse-ecj-3.7.2 )
+
+4
+
+compile install postinst postrm preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-java/icedtea-bin-1.10.4 b/metadata/cache/dev-java/icedtea-bin-1.10.4
deleted file mode 100644
index 4f4f5dae6f6d..000000000000
--- a/metadata/cache/dev-java/icedtea-bin-1.10.4
+++ /dev/null
@@ -1,22 +0,0 @@
-=dev-java/java-config-2*
->=sys-devel/gcc-4.3 >=sys-libs/glibc-2.11.2 >=media-libs/giflib-4.1.6-r1 virtual/jpeg >=media-libs/libpng-1.5 >=sys-libs/zlib-1.2.3-r1 =dev-java/java-config-2*
-6
-amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea6-bin-core-1.10.4-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea6-bin-core-1.10.4-x86.tar.bz2 ) doc? ( http://dev.gentoo.org/~caster/distfiles//icedtea6-bin-doc-1.10.4.tar.bz2 ) examples? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea6-bin-examples-1.10.4-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea6-bin-examples-1.10.4-x86.tar.bz2 ) ) nsplugin? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea6-bin-nsplugin-1.10.4-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea6-bin-nsplugin-1.10.4-x86.tar.bz2 ) ) source? ( http://dev.gentoo.org/~caster/distfiles//icedtea6-bin-src-1.10.4.tar.bz2 )
-strip
-http://icedtea.classpath.org
-GPL-2-with-linking-exception
-A Gentoo-made binary build of the icedtea6 JDK
-amd64 x86
-eutils fdo-mime java-vm-2 multilib pax-utils prefix toolchain-funcs user
-X alsa doc examples nsplugin source
-
-alsa? ( >=media-libs/alsa-lib-1.0.20 ) X? ( >=media-libs/freetype-2.3.9:2 >=media-libs/fontconfig-2.6.0-r2:1.0 >=x11-libs/libXext-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXtst-1.1 >=x11-libs/libX11-1.3 x11-libs/libXt ) nsplugin? ( >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.20.5:2 >=dev-libs/nspr-4.8 >=x11-libs/cairo-1.8.8 >=x11-libs/gtk+-2.20.1:2 >=x11-libs/pango-1.24.5 )
-
-3
-
-install postinst postrm prerm setup
-
-
-
-
-
diff --git a/metadata/cache/dev-java/icedtea-bin-6.1.10.4-r1 b/metadata/cache/dev-java/icedtea-bin-6.1.10.4-r1
deleted file mode 100644
index 8dc2d71770d4..000000000000
--- a/metadata/cache/dev-java/icedtea-bin-6.1.10.4-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-=dev-java/java-config-2*
->=media-libs/giflib-4.1.6-r1 >=media-libs/libpng-1.5 >=sys-devel/gcc-4.3 >=sys-libs/glibc-2.11.2 >=sys-libs/zlib-1.2.3-r1 virtual/jpeg nsplugin? ( >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.20.5:2 >=dev-libs/nspr-4.8 >=x11-libs/cairo-1.8.8 >=x11-libs/pango-1.24.5 ) X? ( dev-libs/glib >=media-libs/freetype-2.3.9:2 >=x11-libs/gtk+-2.20.1:2 >=x11-libs/libX11-1.3 >=x11-libs/libXext-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXtst-1.1 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0.20 ) cups? ( >=net-print/cups-1.4 ) =dev-java/java-config-2*
-6
-amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-6.1.10.4-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-6.1.10.4-x86.tar.bz2 ) doc? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-doc-6.1.10.4.tar.bz2 ) examples? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-6.1.10.4-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-6.1.10.4-x86.tar.bz2 ) ) nsplugin? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-6.1.10.4-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-6.1.10.4-x86.tar.bz2 ) ) source? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-src-6.1.10.4.tar.bz2 )
-strip
-http://icedtea.classpath.org
-GPL-2-with-linking-exception
-A Gentoo-made binary build of the IcedTea JDK
-~amd64 ~x86
-eutils fdo-mime java-vm-2 multilib pax-utils prefix toolchain-funcs user
-+X +alsa cjk +cups doc examples nsplugin source
-nsplugin? ( X )
-
-
-4
-
-install postinst postrm preinst prerm setup
-
-
-
-
-
diff --git a/metadata/cache/dev-java/icedtea-bin-6.1.11 b/metadata/cache/dev-java/icedtea-bin-6.1.11
deleted file mode 100644
index 09957e297428..000000000000
--- a/metadata/cache/dev-java/icedtea-bin-6.1.11
+++ /dev/null
@@ -1,22 +0,0 @@
-=dev-java/java-config-2*
->=media-libs/giflib-4.1.6-r1 >=media-libs/libpng-1.5 >=sys-devel/gcc-4.3 >=sys-libs/glibc-2.11.2 >=sys-libs/zlib-1.2.3-r1 virtual/jpeg nsplugin? ( >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.20.5:2 >=dev-libs/nspr-4.8 >=x11-libs/cairo-1.8.8 >=x11-libs/pango-1.24.5 ) X? ( dev-libs/glib >=media-libs/freetype-2.3.9:2 >=x11-libs/gtk+-2.20.1:2 >=x11-libs/libX11-1.3 >=x11-libs/libXext-1.1 >=x11-libs/libXi-1.3 >=x11-libs/libXtst-1.1 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0.20 ) cups? ( >=net-print/cups-1.4 ) =dev-java/java-config-2*
-6
-amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-6.1.11-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-6.1.11-x86.tar.bz2 ) doc? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-doc-6.1.11.tar.bz2 ) examples? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-6.1.11-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-6.1.11-x86.tar.bz2 ) ) nsplugin? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-6.1.11-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-6.1.11-x86.tar.bz2 ) ) source? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-src-6.1.11.tar.bz2 )
-strip
-http://icedtea.classpath.org
-GPL-2-with-linking-exception
-A Gentoo-made binary build of the IcedTea JDK
-~amd64 ~x86
-eutils fdo-mime java-vm-2 multilib pax-utils prefix toolchain-funcs user
-+X +alsa cjk +cups doc examples nsplugin source
-nsplugin? ( X )
-
-
-4
-
-install postinst postrm preinst prerm setup
-
-
-
-
-
diff --git a/metadata/cache/dev-java/icedtea-bin-7.2.1 b/metadata/cache/dev-java/icedtea-bin-7.2.1
new file mode 100644
index 000000000000..76b5edd185e4
--- /dev/null
+++ b/metadata/cache/dev-java/icedtea-bin-7.2.1
@@ -0,0 +1,22 @@
+=dev-java/java-config-2*
+>=media-libs/giflib-4.1.6-r1 media-libs/lcms:2 >=media-libs/libpng-1.5 >=sys-devel/gcc-4.3 >=sys-libs/glibc-2.11.2 >=sys-libs/zlib-1.2.3-r1 virtual/jpeg X? ( >=net-print/cups-1.4 >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.20.5:2 >=media-libs/fontconfig-2.6.0-r2:1.0 >=media-libs/freetype-2.3.9:2 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.20.1:2 >=x11-libs/libX11-1.3 >=x11-libs/libXext-1.1 >=x11-libs/libXi-1.3 x11-libs/libXrender >=x11-libs/libXtst-1.1 >=x11-libs/pango-1.24.5 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0.20 ) cups? ( >=net-print/cups-1.4 ) =dev-java/java-config-2*
+7
+amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-7.2.1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-core-7.2.1-x86.tar.bz2 ) doc? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-doc-7.2.1.tar.bz2 ) examples? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-7.2.1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-examples-7.2.1-x86.tar.bz2 ) ) nsplugin? ( amd64? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-7.2.1-amd64.tar.bz2 ) x86? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-nsplugin-7.2.1-x86.tar.bz2 ) ) source? ( http://dev.gentoo.org/~caster/distfiles//icedtea-bin-src-7.2.1.tar.bz2 )
+strip
+http://icedtea.classpath.org
+GPL-2-with-linking-exception
+A Gentoo-made binary build of the IcedTea JDK
+~amd64 ~x86
+eutils fdo-mime java-vm-2 multilib pax-utils prefix toolchain-funcs user
++X +alsa cjk +cups doc examples nsplugin source
+nsplugin? ( X )
+
+
+4
+
+install postinst postrm prerm setup
+
+
+
+
+
diff --git a/metadata/cache/dev-java/miglayout-4.0 b/metadata/cache/dev-java/miglayout-4.0
index ce796197912f..42e97d2dc580 100644
--- a/metadata/cache/dev-java/miglayout-4.0
+++ b/metadata/cache/dev-java/miglayout-4.0
@@ -6,7 +6,7 @@ http://www.migcalendar.com/miglayout/versions/4.0/miglayout-4.0-sources.jar
http://www.miglayout.com/
BSD
Easy to use yet very powerful Java Swing layout manager
-~amd64
+~amd64 ~x86
eutils java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
swt elibc_FreeBSD doc examples source
diff --git a/metadata/cache/dev-java/swt-3.7.2 b/metadata/cache/dev-java/swt-3.7.2
new file mode 100644
index 000000000000..156ba27fbdbb
--- /dev/null
+++ b/metadata/cache/dev-java/swt-3.7.2
@@ -0,0 +1,22 @@
+>=virtual/jdk-1.4 app-arch/unzip x11-libs/libX11 x11-libs/libXrender x11-libs/libXt >=x11-libs/libXtst-1.1.0 x11-proto/inputproto dev-util/pkgconfig >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) x11-libs/libXtst >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jre-1.4 >=dev-libs/glib-2.6 >=x11-libs/gtk+-2.6.8:2 >=dev-libs/atk-1.10.2 cairo? ( >=x11-libs/cairo-1.4.14 ) gnome? ( =gnome-base/libgnome-2* =gnome-base/gnome-vfs-2* =gnome-base/libgnomeui-2* ) opengl? ( virtual/opengl virtual/glu ) webkit? ( >=net-libs/webkit-gtk-1.2:2 ) x11-libs/libXtst >=dev-java/java-config-2.1.9-r1
+3.7
+x86? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) x86-fbsd? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) amd64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86_64.zip ) ppc? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-x86.zip ) ppc64? ( http://download.eclipse.org/eclipse/downloads/drops/R-3.7.2-201202080800/swt-3.7.2-gtk-linux-ppc64.zip )
+
+http://www.eclipse.org/
+CPL-1.0 LGPL-2.1 MPL-1.1
+GTK based SWT Library
+~amd64 ~ppc ~ppc64 ~x86
+eutils java-ant-2 java-osgi java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+cairo gnome opengl webkit elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
+
+
+
+4
+
+compile configure install preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/ghc-7.4.1 b/metadata/cache/dev-lang/ghc-7.4.1
new file mode 100644
index 000000000000..dc2ce7dfc5d4
--- /dev/null
+++ b/metadata/cache/dev-lang/ghc-7.4.1
@@ -0,0 +1,22 @@
+!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 !=dev-haskell/alex-2.3 >=dev-haskell/happy-1.18 doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 !=dev-perl/XML-SAX-0.120.0 >=dev-libs/libxml2-2.6.21 >=dev-perl/XML-NamespaceSupport-1.70.0 test? ( dev-perl/Test-Pod ) dev-lang/perl[-build]
+>=dev-perl/XML-SAX-0.120.0 >=dev-libs/libxml2-2.6.21 >=dev-perl/XML-NamespaceSupport-1.70.0 dev-lang/perl[-build]
+0
+mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-1.94.tar.gz
+
+http://search.cpan.org/dist/XML-LibXML/
+|| ( Artistic GPL-1 GPL-2 GPL-3 )
+A Perl module to parse XSL Transformational sheets using gnome's libXSLT
+~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 ~x64-solaris ~x86-solaris
+base eutils multilib perl-module toolchain-funcs user
+test
+
+
+
+4
+
+compile configure install postinst postrm prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-php/PEAR-Net_LDAP2-2.0.12 b/metadata/cache/dev-php/PEAR-Net_LDAP2-2.0.12
index 96d04252adea..41919b140e8d 100644
--- a/metadata/cache/dev-php/PEAR-Net_LDAP2-2.0.12
+++ b/metadata/cache/dev-php/PEAR-Net_LDAP2-2.0.12
@@ -6,7 +6,7 @@ http://pear.php.net/get/Net_LDAP2-2.0.12.tgz
http://pear.php.net/Net_LDAP2
LGPL-2.1
OO interface for searching and manipulating LDAP-entries
-~alpha amd64 hppa ppc ~sparc x86
+alpha amd64 hppa ppc ~sparc x86
multilib php-pear-r1 toolchain-funcs
diff --git a/metadata/cache/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.2 b/metadata/cache/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.2
index be4f09e7bc46..bcccc4dabd72 100644
--- a/metadata/cache/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.2
+++ b/metadata/cache/dev-php/PEAR-Spreadsheet_Excel_Writer-0.9.2
@@ -6,7 +6,7 @@ http://pear.php.net/get/Spreadsheet_Excel_Writer-0.9.2.tgz
http://pear.php.net/Spreadsheet_Excel_Writer
LGPL-2.1
Package for generating Excel spreadsheets
-~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86
+alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86
eutils multilib php-pear-r1 toolchain-funcs user
diff --git a/metadata/cache/dev-util/biew-6.1.0-r1 b/metadata/cache/dev-util/biew-6.1.0-r2
similarity index 100%
rename from metadata/cache/dev-util/biew-6.1.0-r1
rename to metadata/cache/dev-util/biew-6.1.0-r2
diff --git a/metadata/cache/dev-util/schroot-1.4.14 b/metadata/cache/dev-util/schroot-1.4.14
deleted file mode 100644
index 0d141beac918..000000000000
--- a/metadata/cache/dev-util/schroot-1.4.14
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) =sys-devel/automake-1.11* >=sys-devel/autoconf-2.68 sys-devel/libtool
->=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl )
-0
-mirror://debian/pool/main/s/schroot/schroot_1.4.14.orig.tar.gz
-
-http://packages.debian.org/source/sid/schroot
-GPL-3
-Utility to execute commands in a chroot environment
-amd64 x86
-autotools base eutils flag-o-matic libtool multilib pam toolchain-funcs user
-+dchroot debug doc lvm nls pam test
-
-
-
-3
-
-compile configure install postinst preinst prepare test unpack
-
-
-
-
-
diff --git a/metadata/cache/dev-util/schroot-1.4.25 b/metadata/cache/dev-util/schroot-1.4.25
new file mode 100644
index 000000000000..7bd2e9cca03f
--- /dev/null
+++ b/metadata/cache/dev-util/schroot-1.4.25
@@ -0,0 +1,22 @@
+>=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/groff doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl )
+0
+mirror://debian/pool/main/s/schroot/schroot_1.4.25.orig.tar.bz2
+
+http://packages.debian.org/source/sid/schroot
+GPL-3
+Utility to execute commands in a chroot environment
+~amd64 ~x86
+autotools base eutils flag-o-matic libtool multilib pam toolchain-funcs user versionator
+btrfs +dchroot debug doc lvm nls pam test
+
+
+
+4
+
+compile configure install postinst preinst prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/dev-vcs/darcs-2.4.4-r1 b/metadata/cache/dev-vcs/darcs-2.4.4-r1
index 81313008f6a4..c37465fe6475 100644
--- a/metadata/cache/dev-vcs/darcs-2.4.4-r1
+++ b/metadata/cache/dev-vcs/darcs-2.4.4-r1
@@ -1,5 +1,5 @@
->=dev-lang/ghc-6.8 >=dev-haskell/hashed-storage-0.4.13 =dev-haskell/haskeline-0.6* =dev-haskell/html-1.0* =dev-haskell/mmap-0.4* =dev-haskell/network-2.2 >=dev-haskell/parsec-2.0 =dev-haskell/cabal-1.6 dev-util/pkgconfig doc? ( virtual/latex-base dev-tex/latex2html ) test? ( dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
->=dev-lang/ghc-6.8 >=dev-haskell/hashed-storage-0.4.13 =dev-haskell/haskeline-0.6* =dev-haskell/html-1.0* =dev-haskell/mmap-0.4* =dev-haskell/network-2.2 >=dev-haskell/parsec-2.0 =dev-lang/ghc-6.8 >=dev-haskell/hashed-storage-0.4.13[profile?] =dev-haskell/haskeline-0.6*[profile?] =dev-haskell/html-1.0*[profile?] =dev-haskell/mmap-0.4*[profile?] =dev-haskell/network-2.2[profile?] >=dev-haskell/parsec-2.0[profile?] =dev-haskell/cabal-1.6 dev-util/pkgconfig doc? ( virtual/latex-base dev-tex/latex2html ) test? ( dev-haskell/test-framework[profile?] dev-haskell/test-framework-hunit[profile?] dev-haskell/test-framework-quickcheck2[profile?] ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+>=dev-lang/ghc-6.8 >=dev-haskell/hashed-storage-0.4.13[profile?] =dev-haskell/haskeline-0.6*[profile?] =dev-haskell/html-1.0*[profile?] =dev-haskell/mmap-0.4*[profile?] =dev-haskell/network-2.2[profile?] >=dev-haskell/parsec-2.0[profile?] =dev-haskell/network-2.2 =dev-lang/ghc-6.10.1 net-misc/curl virtual/mta >=dev-haskell/cabal-1.8 doc? ( virtual/latex-base || ( dev-tex/latex2html[png] dev-tex/latex2html[gif] ) ) test? ( dev-haskell/test-framework dev-haskell/test-framework-hunit dev-haskell/test-framework-quickcheck2 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
-=dev-haskell/hashed-storage-0.5* =dev-haskell/haskeline-0.6* =dev-haskell/html-1.0* =dev-haskell/network-2.2 =dev-lang/ghc-6.10.1 net-misc/curl virtual/mta dev-lang/ghc bash-completion? ( app-admin/eselect )
+=dev-haskell/hashed-storage-0.5*[profile?] =dev-haskell/haskeline-0.6*[profile?] =dev-haskell/html-1.0*[profile?] =dev-haskell/network-2.2[profile?] =dev-lang/ghc-6.10.1 net-misc/curl virtual/mta >=dev-haskell/cabal-1.8 doc? ( virtual/latex-base || ( dev-tex/latex2html[png] dev-tex/latex2html[gif] ) ) test? ( dev-haskell/test-framework[profile?] dev-haskell/test-framework-hunit[profile?] dev-haskell/test-framework-quickcheck2[profile?] ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+=dev-haskell/hashed-storage-0.5*[profile?] =dev-haskell/haskeline-0.6*[profile?] =dev-haskell/html-1.0*[profile?] =dev-haskell/network-2.2[profile?] =dev-lang/ghc-6.10.1 net-misc/curl virtual/mta dev-lang/ghc
0
http://hackage.haskell.org/packages/archive/darcs/2.5.2/darcs-2.5.2.tar.gz
@@ -7,10 +7,10 @@ http://darcs.net/
GPL-2
a distributed, interactive, smart revision control system
~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-bash-completion eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
-doc test doc hscolour profile bash-completion
+bash-completion-r1 eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc test doc hscolour profile
+
-bash-completion? ( app-shells/bash-completion )
3
diff --git a/metadata/cache/dev-vcs/darcs-2.5.2-r1 b/metadata/cache/dev-vcs/darcs-2.5.2-r1
new file mode 100644
index 000000000000..13970ddeeddb
--- /dev/null
+++ b/metadata/cache/dev-vcs/darcs-2.5.2-r1
@@ -0,0 +1,22 @@
+=dev-haskell/hashed-storage-0.5*[profile?] =dev-haskell/haskeline-0.6*[profile?] =dev-haskell/html-1.0*[profile?] =dev-haskell/network-2.2[profile?] =dev-lang/ghc-6.10.1 net-misc/curl virtual/mta >=dev-haskell/cabal-1.8 doc? ( virtual/latex-base || ( dev-tex/latex2html[png] dev-tex/latex2html[gif] ) ) test? ( dev-haskell/test-framework[profile?] dev-haskell/test-framework-hunit[profile?] dev-haskell/test-framework-quickcheck2[profile?] ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4
+=dev-haskell/hashed-storage-0.5*[profile?] =dev-haskell/haskeline-0.6*[profile?] =dev-haskell/html-1.0*[profile?] =dev-haskell/network-2.2[profile?] =dev-lang/ghc-6.10.1 net-misc/curl virtual/mta dev-lang/ghc
+0
+http://hackage.haskell.org/packages/archive/darcs/2.5.2/darcs-2.5.2.tar.gz
+
+http://darcs.net/
+GPL-2
+a distributed, interactive, smart revision control system
+~alpha ~amd64 -ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
+bash-completion-r1 eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
+doc test doc hscolour profile
+
+
+
+4
+
+compile configure install postinst prepare prerm setup test
+
+
+
+
+
diff --git a/metadata/cache/games-strategy/freecol-0.10.5 b/metadata/cache/games-strategy/freecol-0.10.5
new file mode 100644
index 000000000000..e3d88f4ff0d7
--- /dev/null
+++ b/metadata/cache/games-strategy/freecol-0.10.5
@@ -0,0 +1,22 @@
+>=virtual/jdk-1.5 app-arch/unzip dev-java/jsr173 dev-java/wstx:3.2 dev-java/commons-cli:1 dev-java/cortado dev-java/miglayout >=dev-java/java-config-2.1.9-r1 >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+>=virtual/jre-1.5 dev-java/jsr173 dev-java/wstx:3.2 dev-java/commons-cli:1 dev-java/cortado dev-java/miglayout >=dev-java/java-config-2.1.9-r1
+0
+mirror://sourceforge/freecol/freecol-0.10.5-src.zip
+
+http://www.freecol.org/
+GPL-2
+An open source clone of the game Colonization
+~amd64 ~x86
+base eutils games java-ant-2 java-pkg-2 java-utils-2 multilib toolchain-funcs user versionator
+elibc_FreeBSD elibc_FreeBSD
+
+
+
+2
+
+compile configure install postinst preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/mail-filter/anomy-sanitizer-1.76-r1 b/metadata/cache/mail-filter/anomy-sanitizer-1.76-r1
index 2d91f52c05bc..b622f6d13ae3 100644
--- a/metadata/cache/mail-filter/anomy-sanitizer-1.76-r1
+++ b/metadata/cache/mail-filter/anomy-sanitizer-1.76-r1
@@ -1,7 +1,7 @@
dev-lang/perl >=virtual/perl-MIME-Base64-2.12-r2 >=dev-perl/Mail-Audit-2.1-r1 dev-perl/Convert-TNEF dev-perl/MIME-tools dev-perl/libwww-perl virtual/mta
0
-http://dev.gentoo.org/~jlec/distfiles/sample_e-mail-architecture.png.tar http://mailtools.anomy.net/dist/anomy-sanitizer-1.76.tar.gz
+http://dev.gentoo.org/~jlec/distfiles/sample_e-mail-architecture.png.tar http://mailtools.anomy.net/dist/anomy-sanitizer-1.76.tar.gz http://dev.gentoo.org/~pacho/maintainer-needed/sample_e-mail-architektur.flw
http://mailtools.anomy.net/
GPL-2
@@ -12,7 +12,7 @@ eutils multilib toolchain-funcs user
-
+4
install postinst postrm preinst
diff --git a/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20101222 b/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20101222
index 68c1e1555347..54b653e8c6a7 100644
--- a/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20101222
+++ b/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20101222
@@ -1,5 +1,5 @@
->=net-mail/dovecot-2 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
->=net-mail/dovecot-2
+=net-mail/dovecot-2.0* || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+=net-mail/dovecot-2.0*
0
http://dev.gentoo.org/~radhermit/distfiles/dovecot-antispam-2.0_pre20101222.tar.bz2
diff --git a/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20120226 b/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20120226
new file mode 100644
index 000000000000..cb94aea453af
--- /dev/null
+++ b/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20120226
@@ -0,0 +1,22 @@
+>=net-mail/dovecot-2.1.0 || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-mail/dovecot-2.1.0
+0
+http://dev.gentoo.org/~radhermit/distfiles/dovecot-antispam-2.0_pre20120226.tar.bz2
+
+http://wiki2.dovecot.org/Plugins/Antispam
+GPL-2
+A dovecot antispam plugin supporting multiple backends
+~amd64 ~x86
+autotools eutils libtool multilib toolchain-funcs user
+
+
+
+
+4
+
+postinst prepare
+
+
+
+
+
diff --git a/metadata/cache/mail-mta/postfix-2.10_pre20120218 b/metadata/cache/mail-mta/postfix-2.10_pre20120303
similarity index 96%
rename from metadata/cache/mail-mta/postfix-2.10_pre20120218
rename to metadata/cache/mail-mta/postfix-2.10_pre20120303
index 6ae43218d9b4..c890c5926204 100644
--- a/metadata/cache/mail-mta/postfix-2.10_pre20120218
+++ b/metadata/cache/mail-mta/postfix-2.10_pre20120303
@@ -1,7 +1,7 @@
>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) ssl? ( dev-libs/openssl )
>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2 ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( >=dev-libs/openssl-0.9.6g ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase selinux? ( sec-policy/selinux-postfix ) !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward
0
-ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.10-20120218.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )
+ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-2.10-20120303.tar.gz vda? ( http://vda.sourceforge.net/VDA/postfix-vda-v10-2.8.5.patch )
http://www.postfix.org/
IBM
diff --git a/metadata/cache/media-libs/libpng-1.5.9 b/metadata/cache/media-libs/libpng-1.5.9
index a6513f6f3d25..085cb5b30fec 100644
--- a/metadata/cache/media-libs/libpng-1.5.9
+++ b/metadata/cache/media-libs/libpng-1.5.9
@@ -6,7 +6,7 @@ mirror://sourceforge/libpng/libpng-1.5.9.tar.xz apng? ( mirror://sourceforge/lib
http://www.libpng.org/
as-is
Portable Network Graphics library
-alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
eutils libtool multilib toolchain-funcs user
apng neon static-libs
diff --git a/metadata/cache/media-libs/mesa-7.10.3 b/metadata/cache/media-libs/mesa-7.10.3
index 997116004283..e05b271e30e2 100644
--- a/metadata/cache/media-libs/mesa-7.10.3
+++ b/metadata/cache/media-libs/mesa-7.10.3
@@ -1,5 +1,5 @@
->=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) =x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) =dev-lang/python-2* dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230
->=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) =x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) >=app-admin/eselect-python-20091230
+>=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) =x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) =dev-lang/python-2* dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230
+>=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) =x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) >=app-admin/eselect-python-20091230
0
ftp://ftp.freedesktop.org/pub/mesa/7.10.3/MesaLib-7.10.3.tar.bz2 mirror://gentoo/mesa-7.10.1-gentoo-patches-01.tar.bz2
diff --git a/metadata/cache/media-libs/mesa-7.11 b/metadata/cache/media-libs/mesa-7.11
index 25d2dbd09d7d..79dbdea7c5a6 100644
--- a/metadata/cache/media-libs/mesa-7.11
+++ b/metadata/cache/media-libs/mesa-7.11
@@ -1,5 +1,5 @@
->=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif ) gallium? ( llvm? ( =x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) =dev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230
->=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif ) gallium? ( llvm? ( =x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) >=app-admin/eselect-python-20091230
+>=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( =x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) =dev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230
+>=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( =x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) >=app-admin/eselect-python-20091230
0
ftp://ftp.freedesktop.org/pub/mesa/7.11/MesaLib-7.11.tar.bz2
diff --git a/metadata/cache/media-libs/mesa-7.11.2 b/metadata/cache/media-libs/mesa-7.11.2
index 30a727e00e67..f7a203b4fc0c 100644
--- a/metadata/cache/media-libs/mesa-7.11.2
+++ b/metadata/cache/media-libs/mesa-7.11.2
@@ -1,5 +1,5 @@
->=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif ) gallium? ( llvm? ( >=sys-devel/llvm-2.8 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) =dev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230
->=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif ) gallium? ( llvm? ( >=sys-devel/llvm-2.8 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) >=app-admin/eselect-python-20091230
+>=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( >=sys-devel/llvm-2.8 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) =dev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230
+>=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( >=sys-devel/llvm-2.8 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) >=app-admin/eselect-python-20091230
0
ftp://ftp.freedesktop.org/pub/mesa/7.11.2/MesaLib-7.11.2.tar.bz2 mirror://gentoo/mesa-7.11.2-gentoo-patches-01.tar.bz2
diff --git a/metadata/cache/media-libs/mesa-7.9.2 b/metadata/cache/media-libs/mesa-7.9.2
index c3b15a7d4757..2a359088754e 100644
--- a/metadata/cache/media-libs/mesa-7.9.2
+++ b/metadata/cache/media-libs/mesa-7.9.2
@@ -1,5 +1,5 @@
-!=app-admin/eselect-mesa-0.0.3 >=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) =x11-libs/libdrm-2.4.23[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( =x11-libs/libdrm-2.4.23[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.23[video_cards_radeon] ) =dev-lang/python-2* dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend >=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230
-!=app-admin/eselect-mesa-0.0.3 >=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) =x11-libs/libdrm-2.4.23[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( =x11-libs/libdrm-2.4.23[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.23[video_cards_radeon] ) >=app-admin/eselect-python-20091230
+!=app-admin/eselect-mesa-0.0.3 >=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) =x11-libs/libdrm-2.4.23[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( =x11-libs/libdrm-2.4.23[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.23[video_cards_radeon] ) =dev-lang/python-2* dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend >=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230
+!=app-admin/eselect-mesa-0.0.3 >=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) =x11-libs/libdrm-2.4.23[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( =x11-libs/libdrm-2.4.23[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.23[video_cards_radeon] ) >=app-admin/eselect-python-20091230
0
ftp://ftp.freedesktop.org/pub/mesa/7.9.2/MesaLib-7.9.2.tar.bz2
diff --git a/metadata/cache/media-libs/openinventor-2.1.5.10-r3 b/metadata/cache/media-libs/openinventor-2.1.5.10-r3
index 3d574912e4e1..31d788e5b25f 100644
--- a/metadata/cache/media-libs/openinventor-2.1.5.10-r3
+++ b/metadata/cache/media-libs/openinventor-2.1.5.10-r3
@@ -1,5 +1,5 @@
-media-libs/mesa[motif] >=x11-libs/openmotif-2.3:0 >=media-libs/freetype-2.0 media-fonts/corefonts virtual/jpeg dev-util/byacc
-media-libs/mesa[motif] >=x11-libs/openmotif-2.3:0 >=media-libs/freetype-2.0 media-fonts/corefonts virtual/jpeg
+|| ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) >=x11-libs/openmotif-2.3:0 >=media-libs/freetype-2.0 media-fonts/corefonts virtual/jpeg dev-util/byacc
+|| ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) >=x11-libs/openmotif-2.3:0 >=media-libs/freetype-2.0 media-fonts/corefonts virtual/jpeg
0
ftp://oss.sgi.com/projects/inventor/download/inventor-2.1.5-10.src.tar.gz
diff --git a/metadata/cache/media-libs/sdl-mixer-1.2.12 b/metadata/cache/media-libs/sdl-mixer-1.2.12
index 450cfb3a93bc..83cc7d387043 100644
--- a/metadata/cache/media-libs/sdl-mixer-1.2.12
+++ b/metadata/cache/media-libs/sdl-mixer-1.2.12
@@ -7,14 +7,14 @@ http://www.libsdl.org/projects/SDL_mixer/
ZLIB
Simple Direct Media Layer Mixer Library
~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-
+eutils multilib toolchain-funcs user
flac fluidsynth mad midi mikmod modplug mp3 playtools static-libs timidity vorbis +wav
midi? ( || ( timidity fluidsynth ) )
4
-configure install
+configure install prepare
diff --git a/metadata/cache/media-plugins/vdr-duplicates-0.0.4 b/metadata/cache/media-plugins/vdr-duplicates-0.0.4
new file mode 100644
index 000000000000..53e9bd0c4056
--- /dev/null
+++ b/metadata/cache/media-plugins/vdr-duplicates-0.0.4
@@ -0,0 +1,22 @@
+>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+>=media-video/vdr-1.6.0 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+0
+http://www.tolleri.net/vdr/plugins/vdr-duplicates-0.0.4.tgz
+
+http://www.tolleri.net/vdr/
+GPL-2
+VDR Plugin: show duplicated records
+~amd64 ~x86
+base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin
+
+
+
+
+4
+
+compile config configure install postinst postrm prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/media-plugins/vdr-streamdev-0.5.1-r1 b/metadata/cache/media-plugins/vdr-streamdev-0.5.1-r1
new file mode 100644
index 000000000000..2a5acf86be83
--- /dev/null
+++ b/metadata/cache/media-plugins/vdr-streamdev-0.5.1-r1
@@ -0,0 +1,22 @@
+>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 virtual/linuxtv-dvb-headers
+>=media-video/vdr-1.5.9 >=media-tv/gentoo-vdr-scripts-0.4.2 >=app-admin/eselect-vdr-0.0.2
+0
+mirror://vdr-developerorg/497/vdr-streamdev-0.5.1.tgz
+
+http://projects.vdr-developer.org/projects/plg-streamdev
+GPL-2
+VDR Plugin: Client/Server streaming plugin
+~amd64 ~x86
+base eutils flag-o-matic multilib toolchain-funcs user vdr-plugin
+client +server
+|| ( client server )
+
+
+4
+
+compile config configure install postinst postrm prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/media-sound/jack-audio-connection-kit-0.121.3 b/metadata/cache/media-sound/jack-audio-connection-kit-0.121.3
index 06a8eb957ddf..8c67859fd2b4 100644
--- a/metadata/cache/media-sound/jack-audio-connection-kit-0.121.3
+++ b/metadata/cache/media-sound/jack-audio-connection-kit-0.121.3
@@ -6,7 +6,7 @@ http://www.jackaudio.org/downloads/jack-audio-connection-kit-0.121.3.tar.gz
http://www.jackaudio.org
GPL-2 LGPL-2.1
A low-latency audio server
-~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
+alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
eutils flag-o-matic multilib toolchain-funcs user
3dnow altivec alsa coreaudio doc debug examples mmx oss sse cpudetection pam
diff --git a/metadata/cache/media-video/em8300-libraries-0.18.0_p20120124 b/metadata/cache/media-video/em8300-libraries-0.18.0_p20120124
new file mode 100644
index 000000000000..64306aab6e51
--- /dev/null
+++ b/metadata/cache/media-video/em8300-libraries-0.18.0_p20120124
@@ -0,0 +1,22 @@
+gtk? ( x11-libs/gtk+:2 ) dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gtk? ( x11-libs/gtk+:2 ) modules? ( ~media-video/em8300-modules-0.18.0_p20120124 )
+0
+http://vdr.websitec.de/download/em8300-0.18.0_p20120124.tar.gz mirror://gentoo/em8300-gtk-2.0.m4.tbz2
+
+http://dxr3.sourceforge.net
+GPL-2
+em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card libraries
+~amd64 ~ppc ~x86
+autotools eutils libtool multilib toolchain-funcs user
+gtk modules
+
+
+
+2
+
+configure install postinst prepare
+
+
+
+
+
diff --git a/metadata/cache/media-video/em8300-modules-0.18.0_p20120124 b/metadata/cache/media-video/em8300-modules-0.18.0_p20120124
new file mode 100644
index 000000000000..fa43f3035db4
--- /dev/null
+++ b/metadata/cache/media-video/em8300-modules-0.18.0_p20120124
@@ -0,0 +1,22 @@
+virtual/linux-sources kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+kernel_linux? ( virtual/modutils )
+0
+http://vdr.websitec.de/download/em8300-0.18.0_p20120124.tar.gz
+
+http://dxr3.sourceforge.net
+GPL-2
+em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card kernel modules
+~amd64 ~ppc ~x86
+eutils linux-info linux-mod multilib toolchain-funcs user versionator
+kernel_linux
+
+
+
+2
+
+compile install postinst postrm preinst setup
+
+
+
+
+
diff --git a/metadata/cache/media-video/minitube-1.7.1 b/metadata/cache/media-video/minitube-1.7.1
new file mode 100644
index 000000000000..13c6a6b55d1e
--- /dev/null
+++ b/metadata/cache/media-video/minitube-1.7.1
@@ -0,0 +1,22 @@
+>=x11-libs/qt-gui-4.6:4[accessibility] >=x11-libs/qt-dbus-4.6:4 kde? ( || ( media-libs/phonon[gstreamer?] >=x11-libs/qt-phonon-4.6:4 ) ) !kde? ( || ( >=x11-libs/qt-phonon-4.6:4 media-libs/phonon[gstreamer?] ) ) gstreamer? ( media-plugins/gst-plugins-soup media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-faac media-plugins/gst-plugins-faad )
+>=x11-libs/qt-gui-4.6:4[accessibility] >=x11-libs/qt-dbus-4.6:4 kde? ( || ( media-libs/phonon[gstreamer?] >=x11-libs/qt-phonon-4.6:4 ) ) !kde? ( || ( >=x11-libs/qt-phonon-4.6:4 media-libs/phonon[gstreamer?] ) ) gstreamer? ( media-plugins/gst-plugins-soup media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-faac media-plugins/gst-plugins-faad )
+0
+http://flavio.tordini.org/files/minitube/minitube-1.7.1.tar.gz
+
+http://flavio.tordini.org/minitube
+GPL-3
+Qt4 YouTube Client
+~amd64 ~x86
+base eutils multilib qt4-r2 toolchain-funcs user
+debug gstreamer kde linguas_ca linguas_da linguas_el linguas_en_US linguas_es linguas_es_AR linguas_es_ES linguas_fr linguas_gl linguas_hr linguas_hu linguas_ia linguas_id linguas_it linguas_nb linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sl linguas_sq linguas_sr linguas_sv_SE linguas_te linguas_tr linguas_zh_CN linguas_ca linguas_de linguas_fi linguas_he linguas_id linguas_ka linguas_pl linguas_uk
+
+
+
+4
+
+compile configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/net-dialup/minicom-2.4 b/metadata/cache/net-dialup/minicom-2.4
deleted file mode 100644
index 95cf7da6d4a0..000000000000
--- a/metadata/cache/net-dialup/minicom-2.4
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/ncurses nls? ( sys-devel/gettext )
-sys-libs/ncurses net-dialup/lrzsz
-0
-http://alioth.debian.org/download.php/3195/minicom-2.4.tar.gz
-
-http://alioth.debian.org/projects/minicom
-GPL-2
-Serial Communication Program
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux
-eutils multilib toolchain-funcs user
-nls linguas_cs linguas_da linguas_de linguas_es linguas_fi linguas_fr linguas_hu linguas_id linguas_ja linguas_nb linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_rw linguas_sv linguas_vi linguas_zh_TW
-
-
-
-3
-
-configure install preinst prepare
-
-
-
-
-
diff --git a/metadata/cache/net-dns/idnkit-1.0-r1 b/metadata/cache/net-dns/idnkit-1.0-r1
deleted file mode 100644
index 76df7a660074..000000000000
--- a/metadata/cache/net-dns/idnkit-1.0-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/glibc || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
-sys-libs/glibc
-0
-http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-1.0-src.tar.gz
-
-http://www.nic.ad.jp/ja/idn/idnkit/download/
-JNIC
-Toolkit for Internationalized Domain Names (IDN)
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
-autotools eutils fixheadtails libtool multilib toolchain-funcs user
-
-
-
-
-2
-
-install prepare
-
-
-
-
-
diff --git a/metadata/cache/net-dns/libidn-1.22 b/metadata/cache/net-dns/libidn-1.22
deleted file mode 100644
index eba5c6d0c6aa..000000000000
--- a/metadata/cache/net-dns/libidn-1.22
+++ /dev/null
@@ -1,22 +0,0 @@
-emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=sys-devel/gettext-0.17 ) java? ( >=virtual/jdk-1.4 doc? ( dev-java/gjdoc ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
-emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( virtual/libintl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-0
-mirror://gnu/libidn/libidn-1.22.tar.gz
-
-http://www.gnu.org/software/libidn/
-LGPL-2.1 GPL-3
-Internationalized Domain Names (IDN) implementation
-alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-elisp-common eutils java-pkg-opt-2 java-utils-2 mono multilib toolchain-funcs user versionator
-doc emacs java mono nls static-libs elibc_FreeBSD java
-
-
-
-
-
-compile install postinst postrm preinst setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-dns/libidn-1.22-r1 b/metadata/cache/net-dns/libidn-1.22-r1
deleted file mode 100644
index 209463576f06..000000000000
--- a/metadata/cache/net-dns/libidn-1.22-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( >=sys-devel/gettext-0.17 ) java? ( >=virtual/jdk-1.4 doc? ( dev-java/gjdoc ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
-emacs? ( virtual/emacs ) mono? ( >=dev-lang/mono-0.95 ) nls? ( virtual/libintl ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
-0
-mirror://gnu/libidn/libidn-1.22.tar.gz
-
-http://www.gnu.org/software/libidn/
-LGPL-2.1 GPL-3
-Internationalized Domain Names (IDN) implementation
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-elisp-common eutils java-pkg-opt-2 java-utils-2 mono multilib toolchain-funcs user versionator
-doc emacs java mono nls static-libs elibc_FreeBSD java
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/net-ftp/pftpfxp-0.11.4.6-r3 b/metadata/cache/net-ftp/pftpfxp-0.11.4.6-r3
deleted file mode 100644
index 7bc3d0ce4c31..000000000000
--- a/metadata/cache/net-ftp/pftpfxp-0.11.4.6-r3
+++ /dev/null
@@ -1,22 +0,0 @@
-ssl? ( >=dev-libs/openssl-0.9.6c )
-ssl? ( >=dev-libs/openssl-0.9.6c )
-0
-http://www.derijk.org/pftp/pftpfxp-v0.11.4mew6.tgz
-
-http://pftpmew.tanesha.net
-as-is
-The powerful curses-based ftp/fxp client, mew edition
-~amd64 ~ppc x86
-eutils multilib toolchain-funcs user
-ssl
-
-
-
-
-
-compile install postinst unpack
-
-
-
-
-
diff --git a/metadata/cache/net-ftp/pftpfxp-1.11 b/metadata/cache/net-ftp/pftpfxp-1.12
similarity index 52%
rename from metadata/cache/net-ftp/pftpfxp-1.11
rename to metadata/cache/net-ftp/pftpfxp-1.12
index 7bc48551bd54..1981c346d9b1 100644
--- a/metadata/cache/net-ftp/pftpfxp-1.11
+++ b/metadata/cache/net-ftp/pftpfxp-1.12
@@ -1,9 +1,9 @@
-ssl? ( >=dev-libs/openssl-0.9.6c )
-ssl? ( >=dev-libs/openssl-0.9.6c )
+app-arch/unzip ssl? ( >=dev-libs/openssl-0.9.6c )
+
0
-http://www.derijk.org/pftp/pftp-shit.v.1.11.zip
+http://www.geekspot.nl/wp-content/uploads/2011/03/pftp-shit.v.1.12.zip
-http://www.derijk.org/pftp/
+http://www.geekspot.nl/?page_id=6
as-is
The powerful curses-based ftp/fxp client, shit edition
~amd64 ~ppc ~x86
@@ -12,7 +12,7 @@ ssl
-2
+4
compile configure install postinst prepare
diff --git a/metadata/cache/net-misc/clockspeed-0.62-r6 b/metadata/cache/net-misc/clockspeed-0.62-r6
index 2ce415210ea5..a29a84fc6453 100644
--- a/metadata/cache/net-misc/clockspeed-0.62-r6
+++ b/metadata/cache/net-misc/clockspeed-0.62-r6
@@ -1,7 +1,7 @@
sys-apps/groff
selinux? ( sec-policy/selinux-clockspeed ) net-dns/djbdns
0
-http://cr.yp.to/clockspeed/clockspeed-0.62.tar.gz
+http://cr.yp.to/clockspeed/clockspeed-0.62.tar.gz http://dev.gentoo.org/~pacho/maintainer-needed/leapsecs.dat.20081114
test
http://cr.yp.to/clockspeed.html
as-is
@@ -12,7 +12,7 @@ static selinux
-2
+4
configure install prepare
diff --git a/metadata/cache/net-misc/dropbear-2012.55 b/metadata/cache/net-misc/dropbear-2012.55
index 21f00de80ea4..68a9ddfaa1fd 100644
--- a/metadata/cache/net-misc/dropbear-2012.55
+++ b/metadata/cache/net-misc/dropbear-2012.55
@@ -6,7 +6,7 @@ http://matt.ucc.asn.au/dropbear/releases/dropbear-2012.55.tar.bz2 http://matt.uc
http://matt.ucc.asn.au/dropbear/dropbear.html
MIT
small SSH 2 client/server designed for small memory environments
-alpha amd64 ~arm hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
eutils flag-o-matic multilib pam portability savedconfig toolchain-funcs user
bsdpty minimal multicall pam static syslog zlib savedconfig
pam? ( !static )
diff --git a/metadata/cache/net-misc/vtun-3.0.1 b/metadata/cache/net-misc/vtun-3.0.1
deleted file mode 100644
index 3a183ea012f6..000000000000
--- a/metadata/cache/net-misc/vtun-3.0.1
+++ /dev/null
@@ -1,22 +0,0 @@
-ssl? ( >=dev-libs/openssl-0.9.6c ) lzo? ( >=dev-libs/lzo-2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante ) sys-devel/bison
-ssl? ( >=dev-libs/openssl-0.9.6c ) lzo? ( >=dev-libs/lzo-2 ) zlib? ( sys-libs/zlib ) socks5? ( net-proxy/dante )
-0
-mirror://sourceforge/vtun/vtun-3.0.1.tar.gz
-
-http://vtun.sourceforge.net
-GPL-2
-Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression.
-~alpha ~amd64 ~ppc ~sparc ~x86
-
-lzo socks5 ssl zlib
-
-
-
-
-
-compile install postinst
-
-
-
-
-
diff --git a/metadata/cache/net-misc/vtun-3.0.2-r1 b/metadata/cache/net-misc/vtun-3.0.2-r1
index f8e0ced0d598..ae1b0eb3f4e6 100644
--- a/metadata/cache/net-misc/vtun-3.0.2-r1
+++ b/metadata/cache/net-misc/vtun-3.0.2-r1
@@ -12,9 +12,9 @@ lzo socks5 ssl zlib
-2
+4
-configure install postinst prepare
+compile configure install postinst prepare
diff --git a/metadata/cache/net-p2p/tribler-5.5.18 b/metadata/cache/net-p2p/tribler-5.5.18
deleted file mode 100644
index 2690a7cdc05b..000000000000
--- a/metadata/cache/net-p2p/tribler-5.5.18
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-lang/python-2.5[sqlite] >=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 >=dev-libs/openssl-0.9.8 vlc? ( >=media-video/vlc-1.0.1 ) app-arch/unzip >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
->=dev-lang/python-2.5[sqlite] >=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 >=dev-libs/openssl-0.9.8 vlc? ( >=media-video/vlc-1.0.1 ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-http://dl.tribler.org/tribler_5.5.18-1ubuntu1_all.deb
-
-http://www.tribler.org/
-LGPL-2.1
-Bittorrent client that does not require a website to discover content
-~amd64 ~x86
-eutils multilib python toolchain-funcs user
-vlc
-
-
-
-4
-
-compile install postinst postrm prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/net-p2p/tribler-5.5.10-r1 b/metadata/cache/net-p2p/tribler-5.5.20
similarity index 93%
rename from metadata/cache/net-p2p/tribler-5.5.10-r1
rename to metadata/cache/net-p2p/tribler-5.5.20
index d6aca409c24d..4a7084a3ae9a 100644
--- a/metadata/cache/net-p2p/tribler-5.5.10-r1
+++ b/metadata/cache/net-p2p/tribler-5.5.20
@@ -1,7 +1,7 @@
>=dev-lang/python-2.5[sqlite] >=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 >=dev-libs/openssl-0.9.8 vlc? ( >=media-video/vlc-1.0.1 ) app-arch/unzip >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
>=dev-lang/python-2.5[sqlite] >=dev-python/m2crypto-0.16 >=dev-python/wxpython-2.8 >=dev-python/apsw-3.6 >=dev-libs/openssl-0.9.8 vlc? ( >=media-video/vlc-1.0.1 ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
0
-http://dl.tribler.org/tribler_5.5.10-1ubuntu1_all.deb
+http://dl.tribler.org/tribler_5.5.20-1ubuntu1_all.deb
http://www.tribler.org/
LGPL-2.1
diff --git a/metadata/cache/sci-biology/arb-5.1-r1 b/metadata/cache/sci-biology/arb-5.1-r1
index f62204abedfd..a7338da1c3ae 100644
--- a/metadata/cache/sci-biology/arb-5.1-r1
+++ b/metadata/cache/sci-biology/arb-5.1-r1
@@ -1,5 +1,5 @@
-app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx x11-libs/libXaw x11-libs/libXpm x11-libs/openmotif:0 opengl? ( media-libs/glew media-libs/freeglut media-libs/mesa[motif] )
-app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx x11-libs/libXaw x11-libs/libXpm x11-libs/openmotif:0 opengl? ( media-libs/glew media-libs/freeglut media-libs/mesa[motif] ) sci-visualization/gnuplot
+app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx x11-libs/libXaw x11-libs/libXpm x11-libs/openmotif:0 opengl? ( media-libs/glew media-libs/freeglut || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) )
+app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx x11-libs/libXaw x11-libs/libXpm x11-libs/openmotif:0 opengl? ( media-libs/glew media-libs/freeglut || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) ) sci-visualization/gnuplot
0
http://download.arb-home.de/release/arb_5.1/arbsrc.tgz -> arb-5.1.tgz mirror://gentoo/arb-5.1-glibc2.10.patch.bz2 http://dev.gentoo.org/~jlec/arb-5.1-linker.patch.bz2
diff --git a/metadata/cache/sci-biology/arb-5.2 b/metadata/cache/sci-biology/arb-5.2
index 502888a59119..bd7ce3070790 100644
--- a/metadata/cache/sci-biology/arb-5.2
+++ b/metadata/cache/sci-biology/arb-5.2
@@ -1,5 +1,5 @@
-app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx x11-libs/libXaw x11-libs/libXpm x11-libs/openmotif:0 opengl? ( media-libs/glew media-libs/freeglut media-libs/mesa[motif] ) sys-process/time
-app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx x11-libs/libXaw x11-libs/libXpm x11-libs/openmotif:0 opengl? ( media-libs/glew media-libs/freeglut media-libs/mesa[motif] ) sci-visualization/gnuplot
+app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx x11-libs/libXaw x11-libs/libXpm x11-libs/openmotif:0 opengl? ( media-libs/glew media-libs/freeglut || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) ) sys-process/time
+app-text/sablotron media-libs/libpng media-libs/tiff www-client/lynx x11-libs/libXaw x11-libs/libXpm x11-libs/openmotif:0 opengl? ( media-libs/glew media-libs/freeglut || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) ) sci-visualization/gnuplot
0
http://download.arb-home.de/release/arb_5.2/arbsrc.tgz -> arb-5.2.tgz http://dev.gentoo.org/~jlec/distfiles/arb-5.2-linker.patch.bz2
diff --git a/metadata/cache/sci-chemistry/ccpn-2.1.3.1_p100806 b/metadata/cache/sci-chemistry/ccpn-2.1.3.1_p100806
index 09523ce34935..50d2a38d42a8 100644
--- a/metadata/cache/sci-chemistry/ccpn-2.1.3.1_p100806
+++ b/metadata/cache/sci-chemistry/ccpn-2.1.3.1_p100806
@@ -1,7 +1,7 @@
dev-lang/tk dev-python/numpy dev-tcltk/tix x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
dev-lang/tk dev-python/numpy dev-tcltk/tix x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
0
-http://www.bio.cam.ac.uk/ccpn/download/ccpnmr/analysis2.1.3_1.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-100806.patch.bz2
+http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.1.3_1.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-100806.patch.bz2
mirror
http://www.ccpn.ac.uk/ccpn
|| ( CCPN LGPL-2.1 )
diff --git a/metadata/cache/sci-chemistry/ccpn-2.1.5_p120109 b/metadata/cache/sci-chemistry/ccpn-2.1.5_p120109
index fdd908c1a9d4..a23ef9e688ce 100644
--- a/metadata/cache/sci-chemistry/ccpn-2.1.5_p120109
+++ b/metadata/cache/sci-chemistry/ccpn-2.1.5_p120109
@@ -1,7 +1,7 @@
dev-lang/tk[threads] >=dev-python/numpy-1.4 >=dev-tcltk/tix-8.4.3 =sci-libs/ccpn-data-2.1.5* >=sci-libs/ccpn-data-2.1.5_p111011 sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
dev-lang/tk[threads] >=dev-python/numpy-1.4 >=dev-tcltk/tix-8.4.3 =sci-libs/ccpn-data-2.1.5* >=sci-libs/ccpn-data-2.1.5_p111011 sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
0
-http://www.bio.cam.ac.uk/ccpn/download/ccpnmr/analysis2.1.5.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.1.5-120109.patch.xz
+http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.1.5.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.1.5-120109.patch.xz
mirror
http://www.ccpn.ac.uk/ccpn
|| ( CCPN LGPL-2.1 )
diff --git a/metadata/cache/sci-chemistry/ccpn-2.1.5_p120304 b/metadata/cache/sci-chemistry/ccpn-2.1.5_p120304
new file mode 100644
index 000000000000..1967dd5babda
--- /dev/null
+++ b/metadata/cache/sci-chemistry/ccpn-2.1.5_p120304
@@ -0,0 +1,22 @@
+dev-lang/tk[threads] >=dev-python/numpy-1.4 >=dev-tcltk/tix-8.4.3 =sci-libs/ccpn-data-2.1.5* >=sci-libs/ccpn-data-2.1.5_p111011 sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
+dev-lang/tk[threads] >=dev-python/numpy-1.4 >=dev-tcltk/tix-8.4.3 =sci-libs/ccpn-data-2.1.5* >=sci-libs/ccpn-data-2.1.5_p111011 sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
+0
+http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.1.5.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.1.5-120304.patch.xz
+mirror
+http://www.ccpn.ac.uk/ccpn
+|| ( CCPN LGPL-2.1 )
+The Collaborative Computing Project for NMR
+~amd64 ~x86 ~amd64-linux ~x86-linux
+eutils multilib portability python toolchain-funcs user versionator
+extendnmr +opengl
+
+extendnmr? ( <=sci-chemistry/aria-2.3.2 sci-chemistry/prodecomp )
+
+3
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/ccpn-2.2.1_p120109 b/metadata/cache/sci-chemistry/ccpn-2.2.1_p120109
index 26938978daa1..823cd83cb0fb 100644
--- a/metadata/cache/sci-chemistry/ccpn-2.2.1_p120109
+++ b/metadata/cache/sci-chemistry/ccpn-2.2.1_p120109
@@ -1,7 +1,7 @@
dev-lang/tk[threads] >=dev-python/numpy-1.4 >=dev-tcltk/tix-8.4.3 =sci-libs/ccpn-data-2.2.1* >=sci-libs/ccpn-data-2.2.1_p111011 sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
dev-lang/tk[threads] >=dev-python/numpy-1.4 >=dev-tcltk/tix-8.4.3 =sci-libs/ccpn-data-2.2.1* >=sci-libs/ccpn-data-2.2.1_p111011 sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
0
-http://www.bio.cam.ac.uk/ccpn/download/ccpnmr/analysis2.2.1.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.2.1-120109.patch.xz
+http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.2.1.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.2.1-120109.patch.xz
mirror
http://www.ccpn.ac.uk/ccpn
|| ( CCPN LGPL-2.1 )
diff --git a/metadata/cache/sci-chemistry/ccpn-2.2.1_p120304 b/metadata/cache/sci-chemistry/ccpn-2.2.1_p120304
new file mode 100644
index 000000000000..95f5ca142e83
--- /dev/null
+++ b/metadata/cache/sci-chemistry/ccpn-2.2.1_p120304
@@ -0,0 +1,22 @@
+dev-lang/tk[threads] >=dev-python/numpy-1.4 >=dev-tcltk/tix-8.4.3 =sci-libs/ccpn-data-2.2.1* >=sci-libs/ccpn-data-2.2.1_p111011 sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
+dev-lang/tk[threads] >=dev-python/numpy-1.4 >=dev-tcltk/tix-8.4.3 =sci-libs/ccpn-data-2.2.1* >=sci-libs/ccpn-data-2.2.1_p111011 sci-biology/psipred x11-libs/libXext x11-libs/libX11 opengl? ( media-libs/freeglut dev-python/pyglet ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[ssl,tk] =dev-lang/python-2.6*[ssl,tk] =dev-lang/python-2.5*[ssl,tk] )
+0
+http://www-old.ccpn.ac.uk/download/ccpnmr/analysis2.2.1.tar.gz http://dev.gentoo.org/~jlec/distfiles/ccpn-update-2.2.1-120304.patch.xz
+mirror
+http://www.ccpn.ac.uk/ccpn
+|| ( CCPN LGPL-2.1 )
+The Collaborative Computing Project for NMR
+~amd64 ~x86 ~amd64-linux ~x86-linux
+eutils multilib portability python toolchain-funcs user versionator
+extendnmr +opengl
+
+extendnmr? ( >=sci-chemistry/aria-2.3.2-r1 sci-chemistry/prodecomp )
+
+3
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/openbabel-2.3.1 b/metadata/cache/sci-chemistry/openbabel-2.3.1
new file mode 100644
index 000000000000..a853373be07f
--- /dev/null
+++ b/metadata/cache/sci-chemistry/openbabel-2.3.1
@@ -0,0 +1,22 @@
+dev-cpp/eigen:2 dev-libs/libxml2:2 !sci-chemistry/babel sci-libs/inchi sys-libs/zlib wxwidgets? ( x11-libs/wxGTK:2.8[X] ) >=dev-util/cmake-2.4.8 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+dev-cpp/eigen:2 dev-libs/libxml2:2 !sci-chemistry/babel sci-libs/inchi sys-libs/zlib wxwidgets? ( x11-libs/wxGTK:2.8[X] )
+0
+mirror://sourceforge/openbabel/openbabel-2.3.1.tar.gz
+
+http://openbabel.sourceforge.net/
+GPL-2
+Interconverts file formats used in molecular modeling
+~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+base cmake-utils eutils flag-o-matic multilib toolchain-funcs user wxwidgets
+doc perl python wxwidgets
+
+perl? ( sci-chemistry/openbabel-perl ) python? ( sci-chemistry/openbabel-python )
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/openbabel-perl-2.3.1 b/metadata/cache/sci-chemistry/openbabel-perl-2.3.1
new file mode 100644
index 000000000000..c74af539626d
--- /dev/null
+++ b/metadata/cache/sci-chemistry/openbabel-perl-2.3.1
@@ -0,0 +1,22 @@
+dev-lang/perl ~sci-chemistry/openbabel-2.3.1 >=dev-lang/swig-2 dev-util/cmake >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-lang/perl[-build]
+dev-lang/perl ~sci-chemistry/openbabel-2.3.1 dev-lang/perl[-build]
+0
+mirror://sourceforge/openbabel/openbabel-2.3.1.tar.gz
+
+http://openbabel.sourceforge.net/
+GPL-2
+Perl bindings for OpenBabel
+~amd64 ~x86 ~amd64-linux ~x86-linux
+base cmake-utils eutils flag-o-matic multilib perl-module toolchain-funcs user
+
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare prerm test unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/openbabel-python-2.3.1 b/metadata/cache/sci-chemistry/openbabel-python-2.3.1
new file mode 100644
index 000000000000..4065ba4e02ab
--- /dev/null
+++ b/metadata/cache/sci-chemistry/openbabel-python-2.3.1
@@ -0,0 +1,22 @@
+dev-cpp/eigen:2 dev-libs/libxml2:2 !sci-chemistry/babel ~sci-chemistry/openbabel-2.3.1 sys-libs/zlib >=dev-lang/swig-2 >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+dev-cpp/eigen:2 dev-libs/libxml2:2 !sci-chemistry/babel ~sci-chemistry/openbabel-2.3.1 sys-libs/zlib >=app-admin/eselect-python-20091230 =dev-lang/python-2*
+0
+mirror://sourceforge/openbabel/openbabel-2.3.1.tar.gz
+
+http://openbabel.sourceforge.net/
+GPL-2
+Python bindings for OpenBabel (including Pybel)
+~amd64 ~x86 ~amd64-linux ~x86-linux
+distutils eutils flag-o-matic multilib python toolchain-funcs user
+
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/sci-geosciences/grass-6.4.1 b/metadata/cache/sci-geosciences/grass-6.4.1
index 1dae7695a089..cd87f0c44050 100644
--- a/metadata/cache/sci-geosciences/grass-6.4.1
+++ b/metadata/cache/sci-geosciences/grass-6.4.1
@@ -1,5 +1,5 @@
->=app-admin/eselect-1.2 sci-libs/gdal sci-libs/proj sys-libs/gdbm sys-libs/ncurses sys-libs/zlib cairo? ( x11-libs/cairo[X?,opengl?] ) ffmpeg? ( virtual/ffmpeg ) fftw? ( sci-libs/fftw:3.0 ) gmath? ( virtual/blas virtual/lapack ) jpeg? ( virtual/jpeg ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) readline? ( sys-libs/readline ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/openmotif-2.3:0 opengl? ( media-libs/mesa[motif] ) ) opengl? ( virtual/opengl >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] ) ) !python? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) !wxwidgets? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) ) dev-util/pkgconfig sys-devel/flex sys-devel/gettext sys-devel/bison X? ( x11-proto/xextproto x11-proto/xproto python? ( wxwidgets? ( dev-lang/swig ) ) ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
->=app-admin/eselect-1.2 sci-libs/gdal sci-libs/proj sys-libs/gdbm sys-libs/ncurses sys-libs/zlib cairo? ( x11-libs/cairo[X?,opengl?] ) ffmpeg? ( virtual/ffmpeg ) fftw? ( sci-libs/fftw:3.0 ) gmath? ( virtual/blas virtual/lapack ) jpeg? ( virtual/jpeg ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) readline? ( sys-libs/readline ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/openmotif-2.3:0 opengl? ( media-libs/mesa[motif] ) ) opengl? ( virtual/opengl >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] ) ) !python? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) !wxwidgets? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+>=app-admin/eselect-1.2 sci-libs/gdal sci-libs/proj sys-libs/gdbm sys-libs/ncurses sys-libs/zlib cairo? ( x11-libs/cairo[X?,opengl?] ) ffmpeg? ( virtual/ffmpeg ) fftw? ( sci-libs/fftw:3.0 ) gmath? ( virtual/blas virtual/lapack ) jpeg? ( virtual/jpeg ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) readline? ( sys-libs/readline ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/openmotif-2.3:0 opengl? ( || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) ) ) opengl? ( virtual/opengl >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] ) ) !python? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) !wxwidgets? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) ) dev-util/pkgconfig sys-devel/flex sys-devel/gettext sys-devel/bison X? ( x11-proto/xextproto x11-proto/xproto python? ( wxwidgets? ( dev-lang/swig ) ) ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+>=app-admin/eselect-1.2 sci-libs/gdal sci-libs/proj sys-libs/gdbm sys-libs/ncurses sys-libs/zlib cairo? ( x11-libs/cairo[X?,opengl?] ) ffmpeg? ( virtual/ffmpeg ) fftw? ( sci-libs/fftw:3.0 ) gmath? ( virtual/blas virtual/lapack ) jpeg? ( virtual/jpeg ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) readline? ( sys-libs/readline ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/openmotif-2.3:0 opengl? ( || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) ) ) opengl? ( virtual/opengl >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] ) ) !python? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) !wxwidgets? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
6
http://grass.osgeo.org/grass64/source/grass-6.4.1.tar.gz
diff --git a/metadata/cache/sci-geosciences/grass-6.4.1-r1 b/metadata/cache/sci-geosciences/grass-6.4.1-r1
index c97da0bb31a6..dbebbf655d39 100644
--- a/metadata/cache/sci-geosciences/grass-6.4.1-r1
+++ b/metadata/cache/sci-geosciences/grass-6.4.1-r1
@@ -1,5 +1,5 @@
->=app-admin/eselect-1.2 sci-libs/gdal sci-libs/proj sys-libs/gdbm sys-libs/ncurses sys-libs/zlib cairo? ( x11-libs/cairo[X?,opengl?] ) ffmpeg? ( virtual/ffmpeg ) fftw? ( sci-libs/fftw:3.0 ) gmath? ( virtual/blas virtual/lapack ) jpeg? ( virtual/jpeg ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) readline? ( sys-libs/readline ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/openmotif-2.3:0 opengl? ( media-libs/mesa[motif] ) ) opengl? ( virtual/opengl >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] ) ) !python? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) !wxwidgets? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) ) dev-util/pkgconfig sys-devel/flex sys-devel/gettext sys-devel/bison X? ( x11-proto/xextproto x11-proto/xproto python? ( wxwidgets? ( dev-lang/swig ) ) ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
->=app-admin/eselect-1.2 sci-libs/gdal sci-libs/proj sys-libs/gdbm sys-libs/ncurses sys-libs/zlib cairo? ( x11-libs/cairo[X?,opengl?] ) ffmpeg? ( virtual/ffmpeg ) fftw? ( sci-libs/fftw:3.0 ) gmath? ( virtual/blas virtual/lapack ) jpeg? ( virtual/jpeg ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) readline? ( sys-libs/readline ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/openmotif-2.3:0 opengl? ( media-libs/mesa[motif] ) ) opengl? ( virtual/opengl >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] ) ) !python? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) !wxwidgets? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+>=app-admin/eselect-1.2 sci-libs/gdal sci-libs/proj sys-libs/gdbm sys-libs/ncurses sys-libs/zlib cairo? ( x11-libs/cairo[X?,opengl?] ) ffmpeg? ( virtual/ffmpeg ) fftw? ( sci-libs/fftw:3.0 ) gmath? ( virtual/blas virtual/lapack ) jpeg? ( virtual/jpeg ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) readline? ( sys-libs/readline ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/openmotif-2.3:0 opengl? ( || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) ) ) opengl? ( virtual/opengl >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] ) ) !python? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) !wxwidgets? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) ) dev-util/pkgconfig sys-devel/flex sys-devel/gettext sys-devel/bison X? ( x11-proto/xextproto x11-proto/xproto python? ( wxwidgets? ( dev-lang/swig ) ) ) >=sys-apps/sed-4 >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
+>=app-admin/eselect-1.2 sci-libs/gdal sci-libs/proj sys-libs/gdbm sys-libs/ncurses sys-libs/zlib cairo? ( x11-libs/cairo[X?,opengl?] ) ffmpeg? ( virtual/ffmpeg ) fftw? ( sci-libs/fftw:3.0 ) gmath? ( virtual/blas virtual/lapack ) jpeg? ( virtual/jpeg ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) readline? ( sys-libs/readline ) sqlite? ( dev-db/sqlite:3 ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXaw x11-libs/libXext x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/openmotif-2.3:0 opengl? ( || ( media-libs/mesa[motif] ( media-libs/mesa x11-libs/libGLw ) ) ) ) opengl? ( virtual/opengl >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) python? ( wxwidgets? ( >=dev-python/wxpython-2.8.10.1[cairo,opengl?] ) ) !python? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) !wxwidgets? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) ) >=app-admin/eselect-python-20091230 python? ( =dev-lang/python-2* )
6
http://grass.osgeo.org/grass64/source/grass-6.4.1.tar.gz
diff --git a/metadata/cache/sys-auth/pam_mysql-0.7_rc1-r4 b/metadata/cache/sys-auth/pam_mysql-0.7_rc1-r4
index 71cff8539544..7612e61a74c6 100644
--- a/metadata/cache/sys-auth/pam_mysql-0.7_rc1-r4
+++ b/metadata/cache/sys-auth/pam_mysql-0.7_rc1-r4
@@ -6,7 +6,7 @@ mirror://sourceforge/pam-mysql/pam_mysql-0.7RC1.tar.gz
http://pam-mysql.sourceforge.net/
GPL-2
pam_mysql is a module for pam to authenticate users with mysql
-~alpha amd64 ppc ~sparc x86
+alpha amd64 ppc ~sparc x86
autotools eutils flag-o-matic libtool multilib pam toolchain-funcs user
openssl
diff --git a/metadata/cache/sys-auth/realtime-base-0.1 b/metadata/cache/sys-auth/realtime-base-0.1
index 41373bff892f..2514b6e6f574 100644
--- a/metadata/cache/sys-auth/realtime-base-0.1
+++ b/metadata/cache/sys-auth/realtime-base-0.1
@@ -6,7 +6,7 @@ virtual/pam
http://www.jackaudio.org/linux_rt_config
as-is
Sets up realtime scheduling
-~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
+alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
eutils multilib toolchain-funcs user
diff --git a/metadata/cache/sys-block/partimage-0.6.9 b/metadata/cache/sys-block/partimage-0.6.9
index 50fba7037fe4..523c57fc764c 100644
--- a/metadata/cache/sys-block/partimage-0.6.9
+++ b/metadata/cache/sys-block/partimage-0.6.9
@@ -12,9 +12,9 @@ nls nologin pam ssl static
-3
+4
-config configure install postinst setup
+config configure install postinst prepare setup
diff --git a/metadata/cache/sys-devel/binutils-2.22-r1 b/metadata/cache/sys-devel/binutils-2.22-r1
index 0bbb13200c10..68ed4afbaeee 100644
--- a/metadata/cache/sys-devel/binutils-2.22-r1
+++ b/metadata/cache/sys-devel/binutils-2.22-r1
@@ -1,7 +1,7 @@
>=sys-devel/patch-2.6.1 sys-devel/gnuconfig >=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib ) test? ( dev-util/dejagnu ) nls? ( sys-devel/gettext ) sys-devel/flex virtual/yacc
>=sys-devel/patch-2.6.1 >=sys-devel/binutils-config-1.9 zlib? ( sys-libs/zlib )
0
-mirror://gnu/binutils/binutils-2.22.tar.bz2 mirror://gentoo/binutils-2.22-patches-1.1.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.22-patches-1.1.tar.bz2
+mirror://gnu/binutils/binutils-2.22.tar.bz2 mirror://gentoo/binutils-2.22-patches-1.2.tar.bz2 http://dev.gentoo.org/~vapier/dist/binutils-2.22-patches-1.2.tar.bz2
http://sources.redhat.com/binutils/
|| ( GPL-3 LGPL-3 )
diff --git a/metadata/cache/sys-devel/gnuconfig-20110814 b/metadata/cache/sys-devel/gnuconfig-20110814
index 711514b6fd79..02767a451d0a 100644
--- a/metadata/cache/sys-devel/gnuconfig-20110814
+++ b/metadata/cache/sys-devel/gnuconfig-20110814
@@ -6,7 +6,7 @@ mirror://gentoo/gnuconfig-20110814.tar.bz2
http://savannah.gnu.org/projects/config
GPL-2
Updated config.sub and config.guess file from GNU
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
eutils multilib toolchain-funcs user
diff --git a/metadata/cache/sys-devel/gnuconfig-20120116 b/metadata/cache/sys-devel/gnuconfig-20120116
new file mode 100644
index 000000000000..26b4bad7b948
--- /dev/null
+++ b/metadata/cache/sys-devel/gnuconfig-20120116
@@ -0,0 +1,22 @@
+
+
+0
+mirror://gentoo/gnuconfig-20120116.tar.bz2
+
+http://savannah.gnu.org/projects/config
+GPL-2
+Updated config.sub and config.guess file from GNU
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+eutils multilib toolchain-funcs user
+
+
+
+
+2
+
+compile install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/kerneloops-0.12-r1 b/metadata/cache/sys-kernel/kerneloops-0.12-r1
deleted file mode 100644
index a42e5c09771f..000000000000
--- a/metadata/cache/sys-kernel/kerneloops-0.12-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/dbus-glib-0.88 net-misc/curl x11-libs/gtk+:2 x11-libs/libnotify dev-util/desktop-file-utils dev-util/pkgconfig
->=dev-libs/dbus-glib-0.88 net-misc/curl x11-libs/gtk+:2 x11-libs/libnotify dev-util/desktop-file-utils
-0
-http://www.kerneloops.org/download/kerneloops-0.12.tar.gz
-
-http://www.kerneloops.org/
-GPL-2
-Tool to automatically collect and submit Linux kernel crash signatures
-~amd64 ~x86
-eutils multilib toolchain-funcs user
-
-
-
-
-2
-
-compile install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/www-apps/twiki-4.3.1 b/metadata/cache/www-apps/twiki-4.3.1
deleted file mode 100644
index eaa53745f8b7..000000000000
--- a/metadata/cache/www-apps/twiki-4.3.1
+++ /dev/null
@@ -1,22 +0,0 @@
-|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) >=app-admin/webapp-config-1.50.15
->=dev-vcs/rcs-5.7 sys-apps/diffutils >=dev-lang/perl-5.8 dev-perl/Algorithm-Diff dev-perl/CGI-Session dev-perl/Digest-SHA1 dev-perl/HTML-Parser dev-perl/locale-maketext-lexicon dev-perl/Text-Diff dev-perl/URI dev-perl/Unicode-String virtual/cron >=virtual/perl-CGI-3.20 virtual/perl-digest-base virtual/perl-File-Spec virtual/perl-libnet virtual/perl-Time-Local >=app-admin/webapp-config-1.50.15
-4.3.1
-mirror://sourceforge/twiki/TWiki-4.3.1.tgz
-fetch
-http://twiki.org/
-GPL-2
-A Web Based Collaboration Platform
-~amd64 ~ppc ~x86
-webapp
-
-
-
-
-
-
-install nofetch postinst prerm setup
-
-
-
-
-
diff --git a/metadata/cache/www-servers/gunicorn-0.12.2 b/metadata/cache/www-servers/gunicorn-0.12.2
deleted file mode 100644
index 77e07f254e49..000000000000
--- a/metadata/cache/www-servers/gunicorn-0.12.2
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-python/setuptools test? ( dev-python/nose ) >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-dev-python/setproctitle >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-mirror://pypi/g/gunicorn/gunicorn-0.12.2.tar.gz
-
-http://gunicorn.org http://pypi.python.org/pypi/gunicorn
-MIT
-A WSGI HTTP Server for UNIX, fast clients and nothing else
-amd64 x86
-distutils multilib python toolchain-funcs
-doc examples test
-
-
-
-3
-
-compile install postinst postrm prepare test
-
-
-
-
-
diff --git a/metadata/cache/www-servers/gunicorn-0.14.0 b/metadata/cache/www-servers/gunicorn-0.14.0
new file mode 100644
index 000000000000..3d22ecf22466
--- /dev/null
+++ b/metadata/cache/www-servers/gunicorn-0.14.0
@@ -0,0 +1,22 @@
+dev-python/setuptools >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) test? ( dev-python/nose )
+dev-python/setproctitle >=app-admin/eselect-python-20091230 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+0
+mirror://pypi/g/gunicorn/gunicorn-0.14.0.tar.gz
+
+http://gunicorn.org http://pypi.python.org/pypi/gunicorn
+MIT
+A WSGI HTTP Server for UNIX
+~amd64 ~x86
+distutils eutils multilib python toolchain-funcs user
+doc test test
+
+
+
+3
+
+compile install postinst postrm prepare test
+
+
+
+
+
diff --git a/metadata/cache/x11-libs/libGLw-1.0.0_pre120304 b/metadata/cache/x11-libs/libGLw-1.0.0_pre120304
new file mode 100644
index 000000000000..41b9042afe53
--- /dev/null
+++ b/metadata/cache/x11-libs/libGLw-1.0.0_pre120304
@@ -0,0 +1,22 @@
+!media-libs/mesa[motif] x11-libs/libX11 x11-libs/libXt x11-libs/openmotif virtual/opengl dev-util/pkgconfig || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!media-libs/mesa[motif] x11-libs/libX11 x11-libs/libXt x11-libs/openmotif virtual/opengl
+0
+http:/dev.gentoo.org/~jlec/distfiles/libGLw-1.0.0_pre120304.tar.xz
+
+http://mesa3d.sourceforge.net/
+MIT
+Mesa GLw library
+~amd64 ~x86 ~amd64-linux ~x86-linux
+autotools autotools-utils eutils libtool multilib toolchain-funcs user
++motif static-libs
+
+
+
+4
+
+compile configure install prepare test
+
+
+
+
+
diff --git a/metadata/cache/x11-libs/qwt-5.2.0 b/metadata/cache/x11-libs/qwt-5.2.0
deleted file mode 100644
index 03500827f747..000000000000
--- a/metadata/cache/x11-libs/qwt-5.2.0
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/qt-gui:4 doc? ( !=sys-devel/autoconf-2.68 sys-devel/libtool
-dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 gtk? ( x11-libs/gtk+:3 x11-themes/gnome-themes-standard x11-themes/gnome-icon-theme ) introspection? ( dev-libs/gobject-introspection ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 ) sys-apps/accountsservice
-0
-http://launchpad.net/lightdm/trunk/1.0.6/+download/lightdm-1.0.6.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2 gtk? ( http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch.tar.gz )
-
-http://www.freedesktop.org/wiki/Software/LightDM
-GPL-3 LGPL-3
-A lightweight display manager
-~amd64 ~x86
-autotools eutils flag-o-matic libtool multilib pam toolchain-funcs user
-branding +gtk +introspection qt4
-branding? ( gtk ) || ( gtk qt4 )
-
-
-4
-
-configure install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/x11-misc/lightdm-1.0.6-r3 b/metadata/cache/x11-misc/lightdm-1.0.6-r3
deleted file mode 100644
index fa80300eb665..000000000000
--- a/metadata/cache/x11-misc/lightdm-1.0.6-r3
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 gtk? ( x11-libs/gtk+:3 x11-themes/gnome-themes-standard x11-themes/gnome-icon-theme ) introspection? ( dev-libs/gobject-introspection ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 ) sys-apps/accountsservice dev-lang/vala:0.12 dev-util/intltool dev-util/pkgconfig gnome-base/gnome-common sys-devel/gettext || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 gtk? ( x11-libs/gtk+:3 x11-themes/gnome-themes-standard x11-themes/gnome-icon-theme ) introspection? ( dev-libs/gobject-introspection ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 ) sys-apps/accountsservice
-0
-http://launchpad.net/lightdm/trunk/1.0.6/+download/lightdm-1.0.6.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2 gtk? ( http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch.tar.gz )
-
-http://www.freedesktop.org/wiki/Software/LightDM
-GPL-3 LGPL-3
-A lightweight display manager
-~amd64 ~x86
-autotools eutils flag-o-matic libtool multilib pam toolchain-funcs user
-branding +gtk +introspection qt4
-branding? ( gtk ) || ( gtk qt4 )
-
-
-4
-
-configure install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/x11-plugins/purple-plugin_pack-2.7.0 b/metadata/cache/x11-plugins/purple-plugin_pack-2.7.0
new file mode 100644
index 000000000000..6f4f473dffbc
--- /dev/null
+++ b/metadata/cache/x11-plugins/purple-plugin_pack-2.7.0
@@ -0,0 +1,22 @@
+net-im/pidgin[gtk?,ncurses?] talkfilters? ( app-text/talkfilters ) spell? ( app-text/gtkspell:2 ) =dev-lang/python-2* >=app-admin/eselect-python-20091230
+net-im/pidgin[gtk?,ncurses?] talkfilters? ( app-text/talkfilters ) spell? ( app-text/gtkspell:2 ) >=app-admin/eselect-python-20091230
+0
+https://www.guifications.org/attachments/download/201/purple-plugin-pack-2.7.0.tar.bz2
+
+https://www.guifications.org/projects/purple-plugin-pack
+GPL-2
+A package with many different plugins for pidgin and libpurple
+~amd64 ~hppa ~ppc ~x86
+eutils multilib python toolchain-funcs user
+debug gtk ncurses spell talkfilters
+
+
+
+2
+
+configure install preinst prepare setup
+
+
+
+
+
diff --git a/metadata/cache/x11-wm/xmonad-0.10 b/metadata/cache/x11-wm/xmonad-0.10
index 8bb1bb97cf80..fe2b789dba86 100644
--- a/metadata/cache/x11-wm/xmonad-0.10
+++ b/metadata/cache/x11-wm/xmonad-0.10
@@ -6,7 +6,7 @@ http://hackage.haskell.org/packages/archive/xmonad/0.10/xmonad-0.10.tar.gz
http://xmonad.org
BSD
A tiling window manager
-~amd64 ~sparc ~x86
+~amd64 ~ppc64 ~sparc ~x86
eutils ghc-package haskell-cabal multilib toolchain-funcs user versionator
doc hscolour profile
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 96469f4e7dfb..3a9fb9652271 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Mar 2012 18:06:46 +0000
+Sun, 04 Mar 2012 11:06:46 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 96469f4e7dfb..3a9fb9652271 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Mar 2012 18:06:46 +0000
+Sun, 04 Mar 2012 11:06:46 +0000
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index bbb5e5ab0864..86ae126e27c4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Mar 2012 18:06:47 +0000
+Sun, 04 Mar 2012 11:06:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 758196512c4c..86f77be7503d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Mar 3 18:06:46 UTC 2012
+Sun Mar 4 11:06:46 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 0fd79c530b2d..a4c71596c7de 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Mar 2012 18:30:01 +0000
+Sun, 04 Mar 2012 11:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index eaf39e3a99b3..7a8cd41d4abb 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1330797901 Sat Mar 3 18:05:01 2012 UTC
+1330859101 Sun Mar 4 11:05:01 2012 UTC
diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index 07f5e188fc07..bb8620f32688 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -1,3 +1,2 @@
-DIST minicom-2.4.tar.gz 811414 RMD160 252a81c0c424c3009ff2942ecc46f9a9cf136622 SHA1 6b6d61ceae582a75f30f0cca841c52dd829f8918 SHA256 6b7af240b073ba847b091fd75aed4bf720eb94d30e188d23bb098d016bf40a48
DIST minicom-2.5.tar.gz 822499 RMD160 4131b9ef37d25cf8f77a70fc4b4de32e7896cc23 SHA1 442250314de63189b619f8744c0669445e2cdd1d SHA256 2aa43f98580d3c9c59b12895f15783695cde85472f6bfc7974bcc0935af0a8fd
DIST minicom-2.6.tar.gz 830255 RMD160 348ab9aea947ba8009f99a7f9b144d062e5f4ac6 SHA1 610802d4e0c276b8d2fa7ca30cce5eac33416ebd SHA256 ea5fe79c22dcb115cf5ed287b0e7a69e069bedd39889aa89b1a23f64f53fceb3
diff --git a/net-dialup/minicom/minicom-2.4.ebuild b/net-dialup/minicom/minicom-2.4.ebuild
deleted file mode 100644
index 1c04cf801af9..000000000000
--- a/net-dialup/minicom/minicom-2.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/minicom/minicom-2.4.ebuild,v 1.7 2010/05/23 18:35:59 armin76 Exp $
-
-EAPI="3"
-
-inherit eutils
-
-STUPID_NUM="3195"
-
-DESCRIPTION="Serial Communication Program"
-HOMEPAGE="http://alioth.debian.org/projects/minicom"
-SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="nls"
-
-COMMON_DEPEND="sys-libs/ncurses"
-DEPEND="${COMMON_DEPEND}
- nls? ( sys-devel/gettext )"
-RDEPEND="${COMMON_DEPEND}
- net-dialup/lrzsz"
-
-# Supported languages and translated documentation
-# Be sure all languages are prefixed with a single space!
-MY_AVAILABLE_LINGUAS=" cs da de es fi fr hu id ja nb pl pt_BR ro ru rw sv vi zh_TW"
-IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-2.3-gentoo-runscript.patch
-}
-
-src_configure() {
- econf --sysconfdir="${EPREFIX}"/etc/${PN} \
- $(use_enable nls) \
- || die "econf failed"
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die "einstall failed"
-
- dodoc AUTHORS ChangeLog NEWS README doc/minicom.FAQ
- insinto /etc/minicom
- doins "${FILESDIR}"/minirc.dfl
-}
-
-pkg_preinst() {
- [[ -s ${EROOT}/etc/minicom/minirc.dfl ]] \
- && rm -f "${ED}"/etc/minicom/minirc.dfl
-}
diff --git a/net-dns/idnkit/idnkit-1.0-r1.ebuild b/net-dns/idnkit/idnkit-1.0-r1.ebuild
deleted file mode 100644
index eaca64d68d11..000000000000
--- a/net-dns/idnkit/idnkit-1.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/idnkit/idnkit-1.0-r1.ebuild,v 1.7 2010/11/06 22:23:26 halcy0n Exp $
-
-EAPI="2"
-
-inherit autotools eutils fixheadtails
-
-DESCRIPTION="Toolkit for Internationalized Domain Names (IDN)"
-HOMEPAGE="http://www.nic.ad.jp/ja/idn/idnkit/download/"
-SRC_URI="http://www.nic.ad.jp/ja/idn/idnkit/download/sources/${P}-src.tar.gz"
-
-LICENSE="JNIC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-DEPEND="sys-libs/glibc"
-# non gnu systems need libiconv
-
-S=${WORKDIR}/${P}-src
-
-src_prepare() {
- ht_fix_all
- # Bug 263135, old broken libtool bundled
- rm -f aclocal.m4 || die "rm failed"
- epatch "${FILESDIR}/${P}-autotools.patch"
- eautoreconf
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc ChangeLog DISTFILES NEWS README README.ja
-}
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 86c2e9938ac7..a1177a9e48b6 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -1,3 +1,2 @@
-DIST libidn-1.22.tar.gz 3356444 RMD160 46773bd6192faaeef52c88b6aa8d2e3242f2cdd8 SHA1 8358e897c24d534438f6b5694c25e85889d860c3 SHA256 2f765e868795f5478900ec9f42cb0ecc6ca22e2a85a62763c0b13c7da2f588ed
DIST libidn-1.23.tar.gz 3477618 RMD160 22922f29abe5045f4cb1c30d3b3f75950e5b8b1c SHA1 98b00aeb8240a7a6e02f338edd6ef08adbc31a34 SHA256 25b42d75851ebae52e1c969353b74eefd3d6817f41c8d2a6db258f5ec60c5e6a
DIST libidn-1.24.tar.gz 3325775 RMD160 edccad6c09b181ebcd8360a2d3abdfd1283e5486 SHA1 4251c108966375ede4df15d76a1bd9a4440f44ee SHA256 da1708c6063ecb7951a0908e67df3eacdfe128b18edaa6cf6867d7b73b5f35ff
diff --git a/net-dns/libidn/libidn-1.22-r1.ebuild b/net-dns/libidn/libidn-1.22-r1.ebuild
deleted file mode 100644
index 2dbaf2c2e385..000000000000
--- a/net-dns/libidn/libidn-1.22-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.22-r1.ebuild,v 1.3 2011/11/28 07:54:37 jer Exp $
-
-EAPI="4"
-
-inherit java-pkg-opt-2 mono elisp-common
-
-DESCRIPTION="Internationalized Domain Names (IDN) implementation"
-HOMEPAGE="http://www.gnu.org/software/libidn/"
-SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc emacs java mono nls static-libs"
-
-COMMON_DEPEND="emacs? ( virtual/emacs )
- mono? ( >=dev-lang/mono-0.95 )"
-DEPEND="${COMMON_DEPEND}
- nls? ( >=sys-devel/gettext-0.17 )
- java? (
- >=virtual/jdk-1.4
- doc? ( dev-java/gjdoc )
- )"
-RDEPEND="${COMMON_DEPEND}
- nls? ( virtual/libintl )
- java? ( >=virtual/jre-1.4 )"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_prepare() {
- # bundled, with wrong bytecode
- rm "${S}/java/${P}.jar" || die
-}
-
-src_configure() {
- econf \
- $(use_enable nls) \
- $(use_enable java) \
- $(use_enable mono csharp mono) \
- $(use_enable static-libs static) \
- --disable-valgrind-tests \
- --with-lispdir="${SITELISP}/${PN}" \
- --with-packager="Gentoo" \
- --with-packager-version="r${PR}" \
- --with-packager-bug-reports="https://bugs.gentoo.org"
-}
-
-src_compile() {
- default
-
- if use emacs; then
- elisp-compile src/*.el || die
- fi
-}
-
-src_install() {
- default
- dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO
-
- if use emacs; then
- # *.el are installed by the build system
- elisp-install ${PN} src/*.elc || die
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- else
- rm -rf "${D}/usr/share/emacs"
- fi
-
- if use doc ; then
- dohtml -r doc/reference/html/*
- fi
-
- if use java ; then
- java-pkg_newjar java/${P}.jar ${PN}.jar || die
- rm -rf "${D}"/usr/share/java || die
-
- if use doc ; then
- java-pkg_dojavadoc doc/java
- fi
- fi
- if ! use static-libs; then
- rm -f "${D}"/usr/lib*/lib*.la
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/net-dns/libidn/libidn-1.22.ebuild b/net-dns/libidn/libidn-1.22.ebuild
deleted file mode 100644
index c9283475a041..000000000000
--- a/net-dns/libidn/libidn-1.22.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/libidn/libidn-1.22.ebuild,v 1.8 2011/07/18 00:51:11 halcy0n Exp $
-
-inherit java-pkg-opt-2 mono elisp-common
-
-DESCRIPTION="Internationalized Domain Names (IDN) implementation"
-HOMEPAGE="http://www.gnu.org/software/libidn/"
-SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="doc emacs java mono nls static-libs"
-
-COMMON_DEPEND="emacs? ( virtual/emacs )
- mono? ( >=dev-lang/mono-0.95 )"
-DEPEND="${COMMON_DEPEND}
- nls? ( >=sys-devel/gettext-0.17 )
- java? (
- >=virtual/jdk-1.4
- doc? ( dev-java/gjdoc )
- )"
-RDEPEND="${COMMON_DEPEND}
- nls? ( virtual/libintl )
- java? ( >=virtual/jre-1.4 )"
-
-SITEFILE=50${PN}-gentoo.el
-
-src_unpack() {
- unpack ${A}
- # bundled, with wrong bytecode
- rm "${S}/java/${P}.jar" || die
-}
-
-src_compile() {
- econf \
- $(use_enable nls) \
- $(use_enable java) \
- $(use_enable mono csharp mono) \
- $(use_enable static-libs static) \
- --disable-valgrind-tests \
- --with-lispdir="${SITELISP}/${PN}" \
- --with-packager="Gentoo" \
- --with-packager-version="r${PR}" \
- --with-packager-bug-reports="https://bugs.gentoo.org" \
- || die
-
- emake || die
-
- if use emacs; then
- elisp-compile src/*.el || die
- fi
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die
- dodoc AUTHORS ChangeLog FAQ NEWS README THANKS TODO || die
-
- if use emacs; then
- # *.el are installed by the build system
- elisp-install ${PN} src/*.elc || die
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
- else
- rm -rf "${D}/usr/share/emacs"
- fi
-
- if use doc ; then
- dohtml -r doc/reference/html/* || die
- fi
-
- if use java ; then
- java-pkg_newjar java/${P}.jar ${PN}.jar || die
- rm -rf "${D}"/usr/share/java || die
-
- if use doc ; then
- java-pkg_dojavadoc doc/java
- fi
- fi
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r1.ebuild b/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r1.ebuild
index 13177e70e62c..b146cd5f7359 100644
--- a/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r1.ebuild
+++ b/net-firewall/ipsec-tools/ipsec-tools-0.8.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-firewall/ipsec-tools/ipsec-tools-0.8.0-r1.ebuild,v 1.1 2012/02/28 22:55:18 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipsec-tools/ipsec-tools-0.8.0-r1.ebuild,v 1.2 2012/03/04 03:55:25 blueness Exp $
EAPI="4"
@@ -139,7 +139,7 @@ src_install() {
keepdir /var/lib/racoon
newconfd "${FILESDIR}"/racoon.conf.d racoon
newinitd "${FILESDIR}"/racoon.init.d racoon
- newpamd "${FILESDIR}"/racoon.pam.d racoon
+ use pam && newpamd "${FILESDIR}"/racoon.pam.d racoon
dodoc ChangeLog README NEWS
dodoc -r src/racoon/samples
diff --git a/net-ftp/pftpfxp/Manifest b/net-ftp/pftpfxp/Manifest
index 3f37df0772eb..2c15e93af6c5 100644
--- a/net-ftp/pftpfxp/Manifest
+++ b/net-ftp/pftpfxp/Manifest
@@ -1,2 +1 @@
-DIST pftp-shit.v.1.11.zip 154917 RMD160 174f7851d3d6d9b407c49292ce2aae10e3d79c26 SHA1 7820a9f2f1fa51a6746ea170d21ac9abde558d99 SHA256 08e6d278ffe663b6428d57eb66ca25034ccbbe5dc5e1c7c7117f26f448ff7968
-DIST pftpfxp-v0.11.4mew6.tgz 137093 RMD160 7d60f8cb2469d7bb95561631c05a5692dccde995 SHA1 b64483097be88218a9238a4050155e22342541d4 SHA256 c119435cd844eda76631dde77104e2d0daeef44923158776927d3b51dd5b1e9b
+DIST pftp-shit.v.1.12.zip 155058 RMD160 694ab76126739cc7f611a0b4e604c9f1f8408b21 SHA1 f7b9c65c25ca0763453be23a35bf904318664d18 SHA256 b3448093b9a967490a2f25c5921881e22403887dcf66e17cd86383e299f0c15c
diff --git a/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r3.ebuild b/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r3.ebuild
deleted file mode 100644
index 409eb750de4e..000000000000
--- a/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/pftpfxp-0.11.4.6-r3.ebuild,v 1.5 2009/03/08 03:00:36 dragonheart Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="The powerful curses-based ftp/fxp client, mew edition"
-HOMEPAGE="http://pftpmew.tanesha.net"
-SRC_URI="http://www.derijk.org/pftp/pftpfxp-v0.11.4mew6.tgz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="ssl"
-
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )"
-
-S="${WORKDIR}/pftpfxp-mew"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PV}-gcc3.4.fix || die "patch failed"
- epatch "${FILESDIR}"/pftpfxp-v0.11.4mew6-pret.patch || die "patch failed"
- epatch "${FILESDIR}"/${PV}-correct_config_fix.patch || die "patch failed"
- epatch "${FILESDIR}"/${PV}-correct_bookmark_path.patch || die "patch failed"
- sed -i -e "s/^CPP=.*/CPP=$(tc-getCXX)/" \
- -e "s:^CPPF=.*:CPPF=\"-Wall -D_REENTRANT -I../include ${CFLAGS}\":" \
- configure
-}
-
-src_compile() {
- #note: not a propper autoconf
- ./configure || die "configure failed"
- emake DO=true || die "emake failed"
-}
-
-src_install() {
- dobin pftp || die "dobin failed"
- dodoc .pftp/config .pftp/keymap README.MEW old/*
- cd "${WORKDIR}"
- mv irssi mIRC-mew pftpfxp-autoconnect "${D}"/usr/share/doc/${PF}
-}
-
-pkg_postinst() {
- elog "In order to use pftp-mew you need to create these files:"
- elog " ~/.pftp/config"
- elog " ~/.pftp/keymap"
- elog "Refer to the examples in /usr/share/doc/${PF} for more information."
-}
diff --git a/net-ftp/pftpfxp/pftpfxp-1.11.ebuild b/net-ftp/pftpfxp/pftpfxp-1.12.ebuild
similarity index 74%
rename from net-ftp/pftpfxp/pftpfxp-1.11.ebuild
rename to net-ftp/pftpfxp/pftpfxp-1.12.ebuild
index d96ea313e985..378e19a9b93a 100644
--- a/net-ftp/pftpfxp/pftpfxp-1.11.ebuild
+++ b/net-ftp/pftpfxp/pftpfxp-1.12.ebuild
@@ -1,19 +1,25 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/pftpfxp-1.11.ebuild,v 1.2 2009/04/03 15:17:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pftpfxp/pftpfxp-1.12.ebuild,v 1.1 2012/03/03 19:38:45 pacho Exp $
-EAPI=2
+EAPI=4
inherit eutils toolchain-funcs
MY_P=pftp-shit.v.${PV}
+
DESCRIPTION="The powerful curses-based ftp/fxp client, shit edition"
-HOMEPAGE="http://www.derijk.org/pftp/"
-SRC_URI="http://www.derijk.org/pftp/${MY_P}.zip"
+HOMEPAGE="http://www.geekspot.nl/?page_id=6"
+SRC_URI="http://www.geekspot.nl/wp-content/uploads/2011/03/${MY_P}.zip"
+
LICENSE="as-is"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
+
IUSE="ssl"
-DEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )"
+
+DEPEND="app-arch/unzip
+ ssl? ( >=dev-libs/openssl-0.9.6c )"
+
S=${WORKDIR}/${MY_P}
src_prepare() {
@@ -33,7 +39,7 @@ src_configure() {
src_compile() {
tc-export CXX
- emake || die
+ emake
}
src_install() {
diff --git a/net-im/msnlib/msnlib-3.8.ebuild b/net-im/msnlib/msnlib-3.8.ebuild
index 117f19d59cd7..bee3e5522eca 100644
--- a/net-im/msnlib/msnlib-3.8.ebuild
+++ b/net-im/msnlib/msnlib-3.8.ebuild
@@ -1,13 +1,13 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/msnlib/msnlib-3.8.ebuild,v 1.3 2012/02/25 02:27:52 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/msnlib/msnlib-3.8.ebuild,v 1.4 2012/03/04 05:04:27 mr_bones_ Exp $
EAPI="2"
PYTHON_DEPEND="2"
PYTHON_USE_WITH="tk"
PYTHON_USE_WITH_OPT="tk"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
+RESTRICT_PYTHON_ABIS="3.* *-jython 2.7-pypy-*"
inherit multilib distutils
diff --git a/net-misc/clockspeed/Manifest b/net-misc/clockspeed/Manifest
index fad28817619d..3e1b631b1e9e 100644
--- a/net-misc/clockspeed/Manifest
+++ b/net-misc/clockspeed/Manifest
@@ -1 +1,2 @@
DIST clockspeed-0.62.tar.gz 25797 RMD160 c1c863ddd91b77554f6924438979cff58b351377 SHA1 333ede8961622ed3504e3df3deb64297aa52b0cf SHA256 43539964c4b554794b2da760d138c5975cbc850f1c8ec2ee96f5dba66e0d9eed
+DIST leapsecs.dat.20081114 192 RMD160 094b98174dd30b1272b2c54e9f756d9eaa27dc3f SHA1 63b3451b2c624f5a5aab492610f6ef383f452168 SHA256 e1745c2571b5e3af38f60e1a6caf4cf02cdae103cfd52defa8dfa6d5b1fe0e22
diff --git a/net-misc/clockspeed/clockspeed-0.62-r6.ebuild b/net-misc/clockspeed/clockspeed-0.62-r6.ebuild
index e51306e381fd..4ed5ff298350 100644
--- a/net-misc/clockspeed/clockspeed-0.62-r6.ebuild
+++ b/net-misc/clockspeed/clockspeed-0.62-r6.ebuild
@@ -1,14 +1,18 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r6.ebuild,v 1.3 2011/04/26 16:31:56 darkside Exp $
-
-EAPI="2"
+# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r6.ebuild,v 1.4 2012/03/04 10:21:29 pacho Exp $
+EAPI=4
inherit eutils flag-o-matic
DESCRIPTION="A simple Network Time Protocol (NTP) client"
HOMEPAGE="http://cr.yp.to/clockspeed.html"
-SRC_URI="http://cr.yp.to/clockspeed/${P}.tar.gz"
+
+# this is the trailing part of the name for the latest leapseconds file.
+LEAPSECONDS_DATE="20081114"
+
+SRC_URI="http://cr.yp.to/clockspeed/${P}.tar.gz
+ http://dev.gentoo.org/~pacho/maintainer-needed/leapsecs.dat."$LEAPSECONDS_DATE""
LICENSE="as-is"
SLOT="0"
@@ -20,9 +24,6 @@ DEPEND="sys-apps/groff"
RDEPEND="selinux? ( sec-policy/selinux-clockspeed )
net-dns/djbdns"
-# this is the trailing part of the name for the latest leapseconds file.
-LEAPSECONDS_DATE="20081114"
-
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.patch
}
@@ -34,12 +35,12 @@ src_configure() {
}
src_install() {
- dobin clockspeed clockadd clockview sntpclock taiclock taiclockd || die "dobin"
- dosbin "${FILESDIR}"/ntpclockset || die "dosbin"
+ dobin clockspeed clockadd clockview sntpclock taiclock taiclockd
+ dosbin "${FILESDIR}"/ntpclockset
doman *.1
dodoc BLURB CHANGES INSTALL README THANKS TODO
insinto /var/lib/clockspeed
- newins "${FILESDIR}"/leapsecs.dat."$LEAPSECONDS_DATE" leapsecs.dat
+ newins "${DISTDIR}"/leapsecs.dat."$LEAPSECONDS_DATE" leapsecs.dat
}
diff --git a/net-misc/clockspeed/files/leapsecs.dat.20081114 b/net-misc/clockspeed/files/leapsecs.dat.20081114
deleted file mode 100644
index dbd649a0dec3..000000000000
Binary files a/net-misc/clockspeed/files/leapsecs.dat.20081114 and /dev/null differ
diff --git a/net-misc/dropbear/dropbear-2012.55.ebuild b/net-misc/dropbear/dropbear-2012.55.ebuild
index 3034f808e8b7..8ecbeb26f4c0 100644
--- a/net-misc/dropbear/dropbear-2012.55.ebuild
+++ b/net-misc/dropbear/dropbear-2012.55.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/dropbear/dropbear-2012.55.ebuild,v 1.8 2012/03/03 14:36:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dropbear/dropbear-2012.55.ebuild,v 1.9 2012/03/03 19:56:12 armin76 Exp $
EAPI="4"
@@ -13,7 +13,7 @@ SRC_URI="http://matt.ucc.asn.au/dropbear/releases/${P}.tar.bz2
LICENSE="MIT"
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="bsdpty minimal multicall pam static syslog zlib"
LIB_DEPEND="zlib? ( sys-libs/zlib[static-libs(+)] )"
diff --git a/net-misc/efax/efax-0.9a-r3.ebuild b/net-misc/efax/efax-0.9a-r3.ebuild
index 2fd783979627..c49add561a2b 100644
--- a/net-misc/efax/efax-0.9a-r3.ebuild
+++ b/net-misc/efax/efax-0.9a-r3.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/efax/efax-0.9a-r3.ebuild,v 1.1 2012/03/03 15:24:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/efax/efax-0.9a-r3.ebuild,v 1.2 2012/03/03 21:28:50 pacho Exp $
EAPI=4
@@ -20,7 +20,9 @@ LICENSE="GPL-2"
src_prepare () {
epatch "${WORKDIR}/${PN}_${PV}-19.diff"
- epatch "${FILESDIR}/${P}-segfault.patch"
+ rm -f "${S}"/${P}/debian/patches/series "${S}"/${P}/debian/patches/00list
+ EPATCH_FORCE="yes" epatch "${S}"/${P}/debian/patches/*
+
epatch "${FILESDIR}/${P}-fax-command.patch" #327737
# remove strip command as per bug #240932
diff --git a/net-misc/vtun/Manifest b/net-misc/vtun/Manifest
index b27d8d2ec328..7ea892a97be3 100644
--- a/net-misc/vtun/Manifest
+++ b/net-misc/vtun/Manifest
@@ -1,3 +1,2 @@
DIST vtun-2.6.tar.gz 95637 RMD160 9f666189740b78a88f6b0e2807add3267551198b SHA1 ba6474a551856a7bb55b4cc21d858b8275a2e610 SHA256 fc80dac6d622fdb2db16d772edc6ff7d0023ee6eb5f2acb79d894ee30197c2e5
-DIST vtun-3.0.1.tar.gz 124829 RMD160 49e55a084cea6048f14dbc1137f7dbcf012b6bbb SHA1 b2081ee7238109beef09c1a2aaaf73c331e667e3 SHA256 22507499a8f650ef97157977e62fa632d5b0034070629a2d0fd0512e304eaeeb
DIST vtun-3.0.2.tar.gz 125777 RMD160 6592251871f7e6b9a7e12b7e07ab0a700d816f57 SHA1 6e2da196c70475e5d3750903b2dad032a7b1e8ac SHA256 db26d4dbc35a2b3d65519f68b8ae55c80d7ec4e6569aeec7a432aa82f24c56d6
diff --git a/net-misc/vtun/vtun-3.0.1.ebuild b/net-misc/vtun/vtun-3.0.1.ebuild
deleted file mode 100644
index 24f73a9cbc1b..000000000000
--- a/net-misc/vtun/vtun-3.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.1.ebuild,v 1.4 2007/07/12 02:52:15 mr_bones_ Exp $
-
-DESCRIPTION="Create virtual tunnels over TCP/IP networks with traffic shaping, encryption, and compression."
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://vtun.sourceforge.net"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="lzo socks5 ssl zlib"
-
-RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
- lzo? ( >=dev-libs/lzo-2 )
- zlib? ( sys-libs/zlib )
- socks5? ( net-proxy/dante )"
-DEPEND="${RDEPEND}
- sys-devel/bison"
-
-src_compile() {
- econf $(use_enable ssl) \
- $(use_enable zlib) \
- $(use_enable lzo) \
- $(use_enable socks5 socks) \
- --enable-shaper
- emake || die "emake failed."
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
- dodoc ChangeLog Credits FAQ README README.Setup README.Shaper TODO
- newinitd "${FILESDIR}"/vtun.rc vtun
- insinto etc
- doins "${FILESDIR}"/vtund-start.conf
-}
-
-pkg_postinst() {
- elog "You will need the Universal TUN/TAP driver compiled into"
- elog "your kernel or as a module to use the associated tunnel"
- elog "modes in vtun."
- elog
- elog "Also note that vtun-3 is not compatible with vtun-2."
-}
diff --git a/net-misc/vtun/vtun-3.0.2-r1.ebuild b/net-misc/vtun/vtun-3.0.2-r1.ebuild
index 09f810b53bd1..b9c059f87724 100644
--- a/net-misc/vtun/vtun-3.0.2-r1.ebuild
+++ b/net-misc/vtun/vtun-3.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.2-r1.ebuild,v 1.1 2010/09/18 03:12:18 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vtun/vtun-3.0.2-r1.ebuild,v 1.2 2012/03/03 19:29:39 pacho Exp $
-EAPI=2
+EAPI=4
inherit eutils
@@ -38,8 +38,13 @@ src_configure() {
--enable-shaper
}
+src_compile() {
+ # Parallel make fails, bug 364923
+ emake -j1
+}
+
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed."
+ emake DESTDIR="${D}" install
dodoc ChangeLog Credits FAQ README README.Setup README.Shaper TODO
newinitd "${FILESDIR}"/vtun.rc vtun
insinto etc
diff --git a/net-p2p/tribler/Manifest b/net-p2p/tribler/Manifest
index e28e89265364..2bd23fa32f6b 100644
--- a/net-p2p/tribler/Manifest
+++ b/net-p2p/tribler/Manifest
@@ -1,3 +1,2 @@
-DIST tribler_5.5.10-1ubuntu1_all.deb 2296972 RMD160 89a91ae15a23331366c226140c12a24e334786a0 SHA1 f47287cd70b95040653edbaccb8d7a56d59f34a9 SHA256 b4a3cc0a118f7498cb749116d8fd77f20b228c30e9e897e4b807796e782fbd62
-DIST tribler_5.5.18-1ubuntu1_all.deb 2312322 RMD160 f303277d0585e8fd0b468c3c426e5c65ab837572 SHA1 e9eecd920932d581e3d774f06873bd0f9af32c5c SHA256 c29cce8f3ae71602d642779d1b4f89976abb289a30004150625ed0806cd746ed
DIST tribler_5.5.19-1ubuntu1_all.deb 2313838 RMD160 4b98e5e397efdeb79359c54e9401c294ec53a89a SHA1 cee22726654a52bfd0764d54b0405028cd9ff758 SHA256 27c568c7b45244f6f4cfbb3f73bd5b82a544f6c6492c853fa1111080d31715cf
+DIST tribler_5.5.20-1ubuntu1_all.deb 2315674 RMD160 ec4054e4a3cb87a42c8f6d6de176555c28da94a4 SHA1 ee9123dfc6cc231e0e587373021fda4eda24d4c4 SHA256 7519214feb56aa2d2eb0e31e454e1258e7a04506049a6a45dbaafedab0748b59
diff --git a/net-p2p/tribler/tribler-5.5.10-r1.ebuild b/net-p2p/tribler/tribler-5.5.10-r1.ebuild
deleted file mode 100644
index 4f62983fab8d..000000000000
--- a/net-p2p/tribler/tribler-5.5.10-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-5.5.10-r1.ebuild,v 1.1 2012/02/14 20:40:40 blueness Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python
-
-MY_PV="${PN}_${PV}-1ubuntu1_all"
-
-DESCRIPTION="Bittorrent client that does not require a website to discover content"
-HOMEPAGE="http://www.tribler.org/"
-SRC_URI="http://dl.tribler.org/${MY_PV}.deb"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="vlc"
-
-RDEPEND=">=dev-lang/python-2.5[sqlite]
- >=dev-python/m2crypto-0.16
- >=dev-python/wxpython-2.8
- >=dev-python/apsw-3.6
- >=dev-libs/openssl-0.9.8
- vlc? ( >=media-video/vlc-1.0.1 )"
-
-# Skipping for now:
-# xulrunner-sdk >= 1.9.1.5 < 1.9.2 (optional, to run SwarmTransport)
-# 7-Zip >= 4.6.5 (optional, to build SwarmTransport)
-
-DEPEND="${RDEPEND}
- app-arch/unzip"
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${A}
- unpack ./data.tar.gz
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-fix-global-declarations.patch"
- epatch "${FILESDIR}/${PN}-log2homedir.patch"
-}
-
-src_compile() { :; }
-
-src_install() {
- #Rename the doc dir properly
- mv usr/share/doc/${PN} usr/share/doc/${P}
-
- #Move the readme to the doc dir
- mv usr/share/${PN}/Tribler/readme.txt usr/share/doc/${P}
-
- #Remove the licenses scattered throughout
- rm usr/share/doc/${P}/copyright
- rm usr/share/${PN}/Tribler/*.txt
- rm usr/share/${PN}/Tribler/Core/DecentralizedTracking/pymdht/{LGPL-2.1.txt,LICENSE.txt}
-
- #Copy the rest over
- cp -pPR usr/ "${ED}"/
-}
-
-pkg_postinst() {
- python_mod_optimize "${ROOT}"usr/share/${PN}
-}
-
-pkg_postrm() {
- python_mod_cleanup "${ROOT}"usr/share/${PN}
-}
diff --git a/net-p2p/tribler/tribler-5.5.18.ebuild b/net-p2p/tribler/tribler-5.5.20.ebuild
similarity index 93%
rename from net-p2p/tribler/tribler-5.5.18.ebuild
rename to net-p2p/tribler/tribler-5.5.20.ebuild
index b70d1b08352a..7948bff50b89 100644
--- a/net-p2p/tribler/tribler-5.5.18.ebuild
+++ b/net-p2p/tribler/tribler-5.5.20.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-p2p/tribler/tribler-5.5.18.ebuild,v 1.1 2012/02/28 16:14:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/tribler/tribler-5.5.20.ebuild,v 1.1 2012/03/03 22:04:55 blueness Exp $
EAPI="4"
PYTHON_DEPEND="2:2.5"
diff --git a/profiles/package.mask b/profiles/package.mask
index 72a43f297be8..1352aac0a467 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13541 2012/03/03 16:25:23 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.13546 2012/03/04 09:33:03 hwoarang 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
@@ -31,6 +31,12 @@
#--- END OF EXAMPLES ---
+# Joerg Bornkessel (04 Mar 2012)
+# masked for testing, need feedback
+# bug #350211
+=media-video/em8300-libraries-0.18.0_p20120124
+=media-video/em8300-modules-0.18.0_p20120124
+
# ChÃ-Thanh Christopher Nguyá»…n (01 Jan 2012)
# Mask for breaking compile against glu.h, bug #406641
=media-libs/mesa-8.0.1-r1
@@ -69,10 +75,6 @@ www-client/arora
dev-php/PEAR-Image_Color
dev-php/PEAR-Image_Canvas
-# Doug Goldstein (20 Feb 2012)
-# Installs stuff over the top of nvidia-drivers
-=media-video/nvidia-settings-295.20
-
# Samuli Suominen (20 Feb 2012)
# Mask what will be the Xfce Desktop Environment 4.10 for testing
>=xfce-base/exo-0.7.0
@@ -225,21 +227,6 @@ app-emulation/lib765
# still beta software
>=sci-libs/fftw-3.3.1_beta1
-# Markos Chandras (04 Feb 2012)
-# Dead upstream
-# Bug #276412. Removal in 30 days
-sys-kernel/kerneloops
-
-# Markos Chandras (04 Feb 2012)
-# No maintainer. Functionality is now embedded in portage
-# Bug #398935. Removal in 30 days
-app-portage/autounmask
-
-# Markos Chandras (02 Feb 2012)
-# Multiple security bugs: 284356, 341085, 369137, 384243, 401993
-# No maintainer. Removal in 30 days
-www-apps/twiki
-
# Jeff Horelick (31 Jan 2011)
# Masking alpha release series.
>=dev-libs/libmowgli-2.0.0_alpha1
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 092c45b7e57f..8bd5b3941c92 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1024,10 +1024,17 @@ dev-games/crystalspace:ode - include support for Open Dynamics Engine
dev-games/guichan:allegro - Build the Allegro frontend
dev-games/ode:double-precision - more precise calculations at the expense of speed
dev-games/ode:gyroscopic - enable gyroscopic term (may cause instability)
+dev-games/ogre:boost - enable boost support
dev-games/ogre:cegui - build the CEGUI samples
dev-games/ogre:cg - NVIDIA toolkit plugin
dev-games/ogre:devil - image loading support with DevIL
dev-games/ogre:double-precision - more precise calculations at the expense of speed
+dev-games/ogre:freeimage - support images via freeimage
+dev-games/ogre:ois - pull in Object-oriented Input System library for samples
+dev-games/ogre:poco - when USE=threads, use poco for threading
+dev-games/ogre:tbb - when USE=threads, use tbb for threading
+dev-games/ogre:tools - build+install helper tools
+dev-games/ogre:zip - support zip archives
dev-games/openscenegraph:fox - Build examples using x11-libs/fox library
dev-games/openscenegraph:gdal - Enable support for sci-libs/gdal library
dev-games/openscenegraph:itk - Build dev-tcltk/itk plugin
diff --git a/sci-biology/arb/arb-5.1-r1.ebuild b/sci-biology/arb/arb-5.1-r1.ebuild
index 17520b091f9f..4365d2a4e7a6 100644
--- a/sci-biology/arb/arb-5.1-r1.ebuild
+++ b/sci-biology/arb/arb-5.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/arb-5.1-r1.ebuild,v 1.4 2011/06/20 07:34:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/arb-5.1-r1.ebuild,v 1.5 2012/03/04 09:55:06 jlec Exp $
EAPI=2
@@ -29,7 +29,9 @@ DEPEND="
opengl? (
media-libs/glew
media-libs/freeglut
- media-libs/mesa[motif] )"
+ || (
+ media-libs/mesa[motif]
+ ( media-libs/mesa x11-libs/libGLw ) ) )"
RDEPEND="${DEPEND}
sci-visualization/gnuplot"
# Recommended: libmotif3 gv xfig xterm treetool java
diff --git a/sci-biology/arb/arb-5.2.ebuild b/sci-biology/arb/arb-5.2.ebuild
index cded5698b7ee..55ea8e8a81e7 100644
--- a/sci-biology/arb/arb-5.2.ebuild
+++ b/sci-biology/arb/arb-5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/arb-5.2.ebuild,v 1.3 2011/08/11 21:36:06 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-biology/arb/arb-5.2.ebuild,v 1.4 2012/03/04 09:55:06 jlec Exp $
EAPI=4
@@ -27,7 +27,9 @@ CDEPEND="app-text/sablotron
opengl? (
media-libs/glew
media-libs/freeglut
- media-libs/mesa[motif] )"
+ || (
+ media-libs/mesa[motif]
+ ( media-libs/mesa x11-libs/libGLw ) ) )"
DEPEND="${CDEPEND}
sys-process/time"
RDEPEND="${CDEPEND}
diff --git a/sci-chemistry/ccpn/Manifest b/sci-chemistry/ccpn/Manifest
index 2a2d40a68c34..ea032d978718 100644
--- a/sci-chemistry/ccpn/Manifest
+++ b/sci-chemistry/ccpn/Manifest
@@ -6,7 +6,9 @@ DIST ccpn-update-2.1.5-111213.patch.xz 104892 RMD160 d2a83a0b809a91f8f8422a24c11
DIST ccpn-update-2.1.5-111220.patch.xz 105472 RMD160 f8c358e7bc7757a4f645a2f26fa38e0159e5bc2f SHA1 21721845d3f0df77c548a3e5774ed5a82f3d12df SHA256 a4d8d4982c8bf63031cd11cbe67121a598b97f1c490862c363555bf9c2f11140
DIST ccpn-update-2.1.5-111221.patch.xz 105424 RMD160 70f3b43b0ef4a827cb43f4673ca426deacff13d5 SHA1 6a240d2db8afe9166c8965207ac6701859089fba SHA256 fa9385c46b2aa535917b68de1c9ac0a0dcf0e4a3b2362ec75274fe8374289ca6
DIST ccpn-update-2.1.5-120109.patch.xz 105508 RMD160 a485389af341270598a134a37e061674b935b60b SHA1 b0b3159ab01eda8d93971172bf9b62a588604d30 SHA256 024d65a1e2d82815db891ef920c10442366413d9aeefe7dd6d0d17d7bdbb37ba
+DIST ccpn-update-2.1.5-120304.patch.xz 105824 RMD160 8130a7de0f67fd85b434ff7edfe1821f1c73d1db SHA1 9344d675f42611518e9538c733b3435c19d58bce SHA256 f86b36e05f07d7e8674b8642c6a4d230f85431f1a2d98a369660784e80b4a469
DIST ccpn-update-2.2.1-111213.patch.xz 81520 RMD160 55038a1272f8e01ce54fefdba081ee51ec5d4f36 SHA1 0bbd8c029a98b282002d8b5385a85355722de323 SHA256 807cef8e8b2822e178d50695c7e234ea8c243264a4711610f6a95e30e1b40d12
DIST ccpn-update-2.2.1-111220.patch.xz 82840 RMD160 c0fb328ad93d7f07e1f0d45215d7686204315f91 SHA1 7b2ef76c62e85fcb4c5c95be053a9e281bc3d59d SHA256 f8942568e4f859da71e5a38b279355222882de19328501a0297bcddefef75c9f
DIST ccpn-update-2.2.1-111221.patch.xz 82988 RMD160 e1ce373080f97411d9b00a269d8ed29ab8a4db0e SHA1 fe68eccce53bbbc7cfd69d398381cf3b28303c2d SHA256 6482ac0a90b34e4fbb6944a2f158d8743f6a23d7b28193b28fe7517044e27a76
DIST ccpn-update-2.2.1-120109.patch.xz 85304 RMD160 3f2662f16f8c52b8c3813a0a45ad12f26bb8ba3c SHA1 267686361c0ee730d132beede957591428cd7016 SHA256 2997ae03541267e75577f4df317c6a9b69a282723271a6689265a9c2309c5769
+DIST ccpn-update-2.2.1-120304.patch.xz 87980 RMD160 9d37afcd85557bb5385bb48dacb6f1f873a9ab0b SHA1 232365cc75aaa9d3114bf4b88968ad6af8fdbd6f SHA256 5fa751589394f709b0c65a965ac8f2a3bdab35a670c250bd4f2998acfac41153
diff --git a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild
index c81ae201d6a7..6c16fb6a5480 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild,v 1.4 2011/06/29 05:51:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.3.1_p100806.ebuild,v 1.5 2012/03/04 09:18:53 jlec Exp $
EAPI="3"
PYTHON_DEPEND="2:2.5"
@@ -14,7 +14,7 @@ MY_PN="${PN}mr"
MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
+SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${PATCHSET}.patch.bz2"
HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p120109.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p120109.ebuild
index af75b515c81e..b35f479c46d2 100644
--- a/sci-chemistry/ccpn/ccpn-2.1.5_p120109.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.1.5_p120109.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-chemistry/ccpn/ccpn-2.1.5_p120109.ebuild,v 1.1 2012/01/09 12:42:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p120109.ebuild,v 1.2 2012/03/04 09:18:53 jlec Exp $
EAPI="3"
@@ -16,7 +16,7 @@ MY_MAJOR="$(get_version_component_range 1-3)"
DESCRIPTION="The Collaborative Computing Project for NMR"
HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
+SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
SLOT="0"
diff --git a/sci-chemistry/ccpn/ccpn-2.1.5_p120304.ebuild b/sci-chemistry/ccpn/ccpn-2.1.5_p120304.ebuild
new file mode 100644
index 000000000000..bc83d5014b0e
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.1.5_p120304.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.1.5_p120304.ebuild,v 1.1 2012/03/04 09:18:53 jlec Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="ssl tk"
+
+inherit eutils portability python toolchain-funcs versionator
+
+PATCHSET="${PV##*_p}"
+MY_PN="${PN}mr"
+MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
+MY_MAJOR="$(get_version_component_range 1-3)"
+
+DESCRIPTION="The Collaborative Computing Project for NMR"
+HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
+SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
+ [[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
+
+SLOT="0"
+LICENSE="|| ( CCPN LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="extendnmr +opengl"
+
+RDEPEND="
+ dev-lang/tk[threads]
+ >=dev-python/numpy-1.4
+ >=dev-tcltk/tix-8.4.3
+ =sci-libs/ccpn-data-"${MY_MAJOR}"*
+ >=sci-libs/ccpn-data-2.1.5_p111011
+ sci-biology/psipred
+ x11-libs/libXext
+ x11-libs/libX11
+ opengl? (
+ media-libs/freeglut
+ dev-python/pyglet )"
+# We need to fix this
+# sci-chemistry/mdd
+DEPEND="${RDEPEND}"
+PDEPEND="
+ extendnmr? (
+ <=sci-chemistry/aria-2.3.2
+ sci-chemistry/prodecomp )"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
+
+pkg_setup() {
+ python_set_active_version 2
+}
+
+src_prepare() {
+ [[ -n ${PATCHSET} ]] && \
+ epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
+
+ epatch "${FILESDIR}"/${MY_PV}-parallel.patch
+
+ sed \
+ -e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
+ -e "s:weights_s:weights:g" \
+ -i python/ccpnmr/analysis/wrappers/Psipred.py || die
+
+ local tk_ver
+ local myconf
+
+ tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
+
+ if use opengl; then
+ GLUT_NEED_INIT="-DNEED_GLUT_INIT"
+ IGNORE_GL_FLAG=""
+ GL_FLAG="-DUSE_GL_TRUE"
+ GL_DIR="${EPREFIX}/usr"
+ GL_LIB="-lglut -lGLU -lGL"
+ GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
+ GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
+
+ else
+ IGNORE_GL_FLAG="-DIGNORE_GL"
+ GL_FLAG="-DUSE_GL_FALSE"
+ fi
+
+ GLUT_NOT_IN_GL=""
+ GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
+
+ rm -rf data model doc license || die
+
+ sed \
+ -e "s|/usr|${EPREFIX}/usr|g" \
+ -e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+ -e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
+ -e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
+ -e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
+ -e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
+ -e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
+ -e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
+ -e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
+ -e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
+ -e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
+ -e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
+ -e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+ -e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+ -e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+ -e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
+ -e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
+ c/environment_default.txt > c/environment.txt
+}
+
+src_compile() {
+ emake -C c all links || die
+}
+
+src_install() {
+ local libdir
+ local tkver
+ local _wrapper
+
+ find . -name "*.pyc" -type d -delete
+
+ libdir=$(get_libdir)
+ tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
+
+ _wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara"
+ use extendnmr && _wrapper="${_wrapper} extendNmr"
+ for wrapper in ${_wrapper}; do
+ sed \
+ -e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|g" \
+ -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
+ -e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
+ -e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
+ -e "s|gentoopython|${EPREFIX}/usr/bin/python|g" \
+ -e "s|gentoousr|${EPREFIX}/usr|g" \
+ -e "s|//|/|g" \
+ "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
+ dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
+ done
+
+ local in_path
+ local files
+ local pydocs
+
+ pydocs="$(find python -name doc -type d)"
+ rm -rf ${pydocs} || die
+
+ in_path=$(python_get_sitedir)/${PN}
+
+ for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
+ sed \
+ -e 's|#from __future__|from __future__|g' \
+ -i ${i} || die
+ done
+
+ insinto ${in_path}
+
+ dodir ${in_path}/c
+
+ ebegin "Installing main files"
+ doins -r python || die "main files installation failed"
+ eend
+
+ einfo "Adjusting permissions"
+
+ files="
+ cambridge/c/BayesPeakSeparator.so
+ ccp/c/StructUtil.so
+ ccp/c/StructStructure.so
+ ccp/c/StructBond.so
+ ccp/c/StructAtom.so
+ ccpnmr/c/DyAtomCoord.so
+ ccpnmr/c/DyDistConstraint.so
+ ccpnmr/c/DyDistForce.so
+ ccpnmr/c/AtomCoordList.so
+ ccpnmr/c/DyAtomCoordList.so
+ ccpnmr/c/ContourStyle.so
+ ccpnmr/c/ContourLevels.so
+ ccpnmr/c/SliceFile.so
+ ccpnmr/c/PeakCluster.so
+ ccpnmr/c/Dynamics.so
+ ccpnmr/c/Bacus.so
+ ccpnmr/c/Midge.so
+ ccpnmr/c/DyDistConstraintList.so
+ ccpnmr/c/WinPeakList.so
+ ccpnmr/c/PeakList.so
+ ccpnmr/c/DistConstraint.so
+ ccpnmr/c/CloudUtil.so
+ ccpnmr/c/DistForce.so
+ ccpnmr/c/DistConstraintList.so
+ ccpnmr/c/AtomCoord.so
+ ccpnmr/c/DyDynamics.so
+ ccpnmr/c/ContourFile.so
+ memops/c/ShapeFile.so
+ memops/c/BlockFile.so
+ memops/c/PdfHandler.so
+ memops/c/MemCache.so
+ memops/c/FitMethod.so
+ memops/c/PsHandler.so
+ memops/c/GlHandler.so
+ memops/c/StoreFile.so
+ memops/c/StoreHandler.so
+ memops/c/TkHandler.so"
+ for FILE in ${files}; do
+ fperms 755 ${in_path}/python/${FILE}
+ done
+}
+
+pkg_postinst() {
+ python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+ python_mod_cleanup ${PN}
+}
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p120109.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p120109.ebuild
index 840639d9880c..0eddec7b5aaf 100644
--- a/sci-chemistry/ccpn/ccpn-2.2.1_p120109.ebuild
+++ b/sci-chemistry/ccpn/ccpn-2.2.1_p120109.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-chemistry/ccpn/ccpn-2.2.1_p120109.ebuild,v 1.1 2012/01/09 12:42:11 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p120109.ebuild,v 1.2 2012/03/04 09:18:53 jlec Exp $
EAPI="3"
@@ -15,7 +15,7 @@ MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
MY_MAJOR="$(get_version_component_range 1-3)"
DESCRIPTION="The Collaborative Computing Project for NMR"
-SRC_URI="http://www.bio.cam.ac.uk/ccpn/download/${MY_PN}/analysis${MY_PV}.tar.gz"
+SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
[[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
diff --git a/sci-chemistry/ccpn/ccpn-2.2.1_p120304.ebuild b/sci-chemistry/ccpn/ccpn-2.2.1_p120304.ebuild
new file mode 100644
index 000000000000..a479d2064514
--- /dev/null
+++ b/sci-chemistry/ccpn/ccpn-2.2.1_p120304.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/ccpn/ccpn-2.2.1_p120304.ebuild,v 1.1 2012/03/04 09:18:53 jlec Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2:2.5"
+PYTHON_USE_WITH="ssl tk"
+
+inherit eutils portability python toolchain-funcs versionator
+
+PATCHSET="${PV##*_p}"
+MY_PN="${PN}mr"
+MY_PV="$(replace_version_separator 3 _ ${PV%%_p*})"
+MY_MAJOR="$(get_version_component_range 1-3)"
+
+DESCRIPTION="The Collaborative Computing Project for NMR"
+SRC_URI="http://www-old.ccpn.ac.uk/download/${MY_PN}/analysis${MY_PV}.tar.gz"
+ [[ -n ${PATCHSET} ]] && SRC_URI="${SRC_URI} http://dev.gentoo.org/~jlec/distfiles/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch.xz"
+HOMEPAGE="http://www.ccpn.ac.uk/ccpn"
+
+SLOT="0"
+LICENSE="|| ( CCPN LGPL-2.1 )"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="extendnmr +opengl"
+
+RDEPEND="
+ dev-lang/tk[threads]
+ >=dev-python/numpy-1.4
+ >=dev-tcltk/tix-8.4.3
+ =sci-libs/ccpn-data-"${MY_MAJOR}"*
+ >=sci-libs/ccpn-data-2.2.1_p111011
+ sci-biology/psipred
+ x11-libs/libXext
+ x11-libs/libX11
+ opengl? (
+ media-libs/freeglut
+ dev-python/pyglet )"
+# We need to fix this
+# sci-chemistry/mdd
+DEPEND="${RDEPEND}"
+PDEPEND="
+ extendnmr? (
+ >=sci-chemistry/aria-2.3.2-r1
+ sci-chemistry/prodecomp )"
+
+RESTRICT="mirror"
+
+S="${WORKDIR}"/${MY_PN}/${MY_PN}$(get_version_component_range 1-2 ${PV})
+
+pkg_setup() {
+ python_set_active_version 2
+}
+
+src_prepare() {
+ [[ -n ${PATCHSET} ]] && \
+ epatch "${WORKDIR}"/ccpn-update-${MY_MAJOR}-${PATCHSET}.patch
+
+ epatch "${FILESDIR}"/${MY_PV}-parallel.patch
+
+ sed \
+ -e "/PSIPRED_DIR/s:'data':'share/psipred/data':g" \
+ -e "s:weights_s:weights:g" \
+ -i python/ccpnmr/analysis/wrappers/Psipred.py || die
+
+ local tk_ver
+ local myconf
+
+ tk_ver="$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)"
+
+ if use opengl; then
+ GLUT_NEED_INIT="-DNEED_GLUT_INIT"
+ IGNORE_GL_FLAG=""
+ GL_FLAG="-DUSE_GL_TRUE"
+ GL_DIR="${EPREFIX}/usr"
+ GL_LIB="-lglut -lGLU -lGL"
+ GL_INCLUDE_FLAGS="-I\$(GL_DIR)/include"
+ GL_LIB_FLAGS="-L\$(GL_DIR)/$(get_libdir)"
+
+ else
+ IGNORE_GL_FLAG="-DIGNORE_GL"
+ GL_FLAG="-DUSE_GL_FALSE"
+ fi
+
+ GLUT_NOT_IN_GL=""
+ GLUT_FLAG="\$(GLUT_NEED_INIT) \$(GLUT_NOT_IN_GL)"
+
+ rm -rf data model doc license || die
+
+ sed \
+ -e "s|/usr|${EPREFIX}/usr|g" \
+ -e "s|^\(CC =\).*|\1 $(tc-getCC)|g" \
+ -e "s|^\(OPT_FLAG =\).*|\1 ${CFLAGS}|g" \
+ -e "s|^\(LINK_FLAGS =.*\)|\1 ${LDFLAGS}|g" \
+ -e "s|^\(IGNORE_GL_FLAG =\).*|\1 ${IGNORE_GL_FLAG}|g" \
+ -e "s|^\(GL_FLAG =\).*|\1 ${GL_FLAG}|g" \
+ -e "s|^\(GL_DIR =\).*|\1 ${GL_DIR}|g" \
+ -e "s|^\(GL_LIB =\).*|\1 ${GL_LIB}|g" \
+ -e "s|^\(GL_LIB_FLAGS =\).*|\1 ${GL_LIB_FLAGS}|g" \
+ -e "s|^\(GL_INCLUDE_FLAGS =\).*|\1 ${GL_INCLUDE_FLAGS}|g" \
+ -e "s|^\(GLUT_NEED_INIT =\).*|\1 ${GLUT_NEED_INIT}|g" \
+ -e "s|^\(GLUT_NOT_IN_GL =\).*|\1|g" \
+ -e "s|^\(X11_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+ -e "s|^\(TCL_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+ -e "s|^\(TK_LIB_FLAGS =\).*|\1 -L${EPREFIX}/usr/$(get_libdir)|g" \
+ -e "s|^\(PYTHON_INCLUDE_FLAGS =\).*|\1 -I${EPREFIX}/$(python_get_includedir)|g" \
+ -e "s|^\(PYTHON_LIB =\).*|\1 $(python_get_library -l)|g" \
+ c/environment_default.txt > c/environment.txt
+}
+
+src_compile() {
+ emake -C c all links || die
+}
+
+src_install() {
+ local libdir
+ local tkver
+ local _wrapper
+
+ find . -name "*.pyc" -type d -delete
+
+ libdir=$(get_libdir)
+ tkver=$(best_version dev-lang/tk | cut -d- -f3 | cut -d. -f1,2)
+
+ _wrapper="analysis dangle dataShifter depositionFileImporter eci formatConverter pipe2azara xeasy2azara"
+ use extendnmr && _wrapper="${_wrapper} extendNmr"
+ for wrapper in ${_wrapper}; do
+ sed \
+ -e "s|gentoo_sitedir|${EPREFIX}$(python_get_sitedir)|g" \
+ -e "s|gentoolibdir|${EPREFIX}/usr/${libdir}|g" \
+ -e "s|gentootk|${EPREFIX}/usr/${libdir}/tk${tkver}|g" \
+ -e "s|gentootcl|${EPREFIX}/usr/${libdir}/tclk${tkver}|g" \
+ -e "s|gentoopython|${EPREFIX}/usr/bin/python|g" \
+ -e "s|gentoousr|${EPREFIX}/usr|g" \
+ -e "s|//|/|g" \
+ "${FILESDIR}"/${wrapper} > "${T}"/${wrapper} || die "Fail fix ${wrapper}"
+ dobin "${T}"/${wrapper} || die "Failed to install ${wrapper}"
+ done
+
+ local in_path
+ local files
+ local pydocs
+
+ pydocs="$(find python -name doc -type d)"
+ rm -rf ${pydocs} || die
+
+ in_path=$(python_get_sitedir)/${PN}
+
+ for i in python/memops/format/compatibility/{Converters,part2/Converters2}.py; do
+ sed \
+ -e 's|#from __future__|from __future__|g' \
+ -i ${i} || die
+ done
+
+ insinto ${in_path}
+
+ dodir ${in_path}/c
+
+ ebegin "Installing main files"
+ doins -r python || die "main files installation failed"
+ eend
+
+ einfo "Adjusting permissions"
+
+ files="
+ cambridge/c/BayesPeakSeparator.so
+ ccp/c/StructUtil.so
+ ccp/c/StructStructure.so
+ ccp/c/StructBond.so
+ ccp/c/StructAtom.so
+ ccpnmr/c/DyAtomCoord.so
+ ccpnmr/c/DyDistConstraint.so
+ ccpnmr/c/DyDistForce.so
+ ccpnmr/c/AtomCoordList.so
+ ccpnmr/c/DyAtomCoordList.so
+ ccpnmr/c/ContourStyle.so
+ ccpnmr/c/ContourLevels.so
+ ccpnmr/c/SliceFile.so
+ ccpnmr/c/PeakCluster.so
+ ccpnmr/c/Dynamics.so
+ ccpnmr/c/Bacus.so
+ ccpnmr/c/Midge.so
+ ccpnmr/c/DyDistConstraintList.so
+ ccpnmr/c/WinPeakList.so
+ ccpnmr/c/PeakList.so
+ ccpnmr/c/DistConstraint.so
+ ccpnmr/c/CloudUtil.so
+ ccpnmr/c/DistForce.so
+ ccpnmr/c/DistConstraintList.so
+ ccpnmr/c/AtomCoord.so
+ ccpnmr/c/DyDynamics.so
+ ccpnmr/c/ContourFile.so
+ memops/c/ShapeFile.so
+ memops/c/BlockFile.so
+ memops/c/PdfHandler.so
+ memops/c/MemCache.so
+ memops/c/FitMethod.so
+ memops/c/PsHandler.so
+ memops/c/GlHandler.so
+ memops/c/StoreFile.so
+ memops/c/StoreHandler.so
+ memops/c/TkHandler.so"
+ for FILE in ${files}; do
+ fperms 755 ${in_path}/python/${FILE}
+ done
+}
+
+pkg_postinst() {
+ python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+ python_mod_cleanup ${PN}
+}
diff --git a/sci-chemistry/openbabel-perl/Manifest b/sci-chemistry/openbabel-perl/Manifest
index feb10e6ff7e0..5ef7ac8bcc6c 100644
--- a/sci-chemistry/openbabel-perl/Manifest
+++ b/sci-chemistry/openbabel-perl/Manifest
@@ -1 +1,2 @@
DIST openbabel-2.3.0.tar.gz 14321281 RMD160 96dafa3c2aca544f79e08b5617ab0da845c28a16 SHA1 408a4bddb7f052fd89c57ea51b4204b721856b16 SHA256 6dadcb256d83b1f2e616fa1853dd1afadb23550a20d1c118b406231a09f861fb
+DIST openbabel-2.3.1.tar.gz 20142960 RMD160 da4d240a92942dbf9dcf999187336d69d7ef8f5c SHA1 b2dd1638eaf7e6d350110b1561aeb23b03552846 SHA256 9e2e8bc9af585ee7e4a03720e3d7b82ef567aa17fdeeea48cc213a3035ced7a3
diff --git a/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.1-makefile.patch b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.1-makefile.patch
new file mode 100644
index 000000000000..88248b4432f1
--- /dev/null
+++ b/sci-chemistry/openbabel-perl/files/openbabel-perl-2.3.1-makefile.patch
@@ -0,0 +1,9 @@
+--- scripts/perl/Makefile.PL
++++ scripts/perl/Makefile.PL
+@@ -37,5 +37,6 @@ 'LDFROM' => $ldfrom,
+ 'CC' => $CC,
+ 'LD' => '$(CC)',
+ 'INC' => '-I../../include -I'.$cmakesrcdir.'/include',
++ 'DESTDIR' => @ENV{"D"},
+ 'OBJECT' => 'openbabel-perl.o'
+ );
diff --git a/sci-chemistry/openbabel-perl/metadata.xml b/sci-chemistry/openbabel-perl/metadata.xml
index 78a71057d3ed..500c61ee3c93 100644
--- a/sci-chemistry/openbabel-perl/metadata.xml
+++ b/sci-chemistry/openbabel-perl/metadata.xml
@@ -1,8 +1,8 @@
-sci-chemistry
-
+ sci-chemistry
+
OpenBabel is a chemical toolbox designed to speak the many languages of
chemical data. It's an open, collaborative project allowing anyone to
search, convert, analyze, or store data from molecular modeling, chemistry,
diff --git a/sci-chemistry/openbabel-perl/openbabel-perl-2.3.1.ebuild b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.1.ebuild
new file mode 100644
index 000000000000..b8ae965bc95d
--- /dev/null
+++ b/sci-chemistry/openbabel-perl/openbabel-perl-2.3.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-perl/openbabel-perl-2.3.1.ebuild,v 1.1 2012/03/04 10:30:40 jlec Exp $
+
+EAPI=4
+
+inherit cmake-utils eutils perl-module
+
+DESCRIPTION="Perl bindings for OpenBabel"
+HOMEPAGE="http://openbabel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openbabel/openbabel-${PV}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+RDEPEND="
+ dev-lang/perl
+ ~sci-chemistry/openbabel-${PV}"
+DEPEND="${RDEPEND}
+ >=dev-lang/swig-2
+ dev-util/cmake"
+
+S="${WORKDIR}/openbabel-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-makefile.patch"
+}
+
+src_configure() {
+ local mycmakeargs="-DPERL_BINDINGS=ON"
+ mycmakeargs="${mycmakeargs}
+ -DRUN_SWIG=ON"
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cd "${WORKDIR}/${P}_build/scripts"
+ perl-module_src_prep
+ perl-module_src_compile
+}
+
+src_test() {
+ cd "${WORKDIR}/${P}_build/scripts"
+ emake test
+}
+
+src_install() {
+ cd "${WORKDIR}/${P}_build/scripts/perl"
+ perl-module_src_install
+}
+
+pkg_preinst() {
+ perl-module_pkg_preinst
+}
+
+pkg_postinst() {
+ perl-module_pkg_postinst
+}
+
+pkg_prerm() {
+ perl-module_pkg_prerm
+}
+
+pkg_postrm() {
+ perl-module_pkg_postrm
+}
diff --git a/sci-chemistry/openbabel-python/Manifest b/sci-chemistry/openbabel-python/Manifest
index feb10e6ff7e0..5ef7ac8bcc6c 100644
--- a/sci-chemistry/openbabel-python/Manifest
+++ b/sci-chemistry/openbabel-python/Manifest
@@ -1 +1,2 @@
DIST openbabel-2.3.0.tar.gz 14321281 RMD160 96dafa3c2aca544f79e08b5617ab0da845c28a16 SHA1 408a4bddb7f052fd89c57ea51b4204b721856b16 SHA256 6dadcb256d83b1f2e616fa1853dd1afadb23550a20d1c118b406231a09f861fb
+DIST openbabel-2.3.1.tar.gz 20142960 RMD160 da4d240a92942dbf9dcf999187336d69d7ef8f5c SHA1 b2dd1638eaf7e6d350110b1561aeb23b03552846 SHA256 9e2e8bc9af585ee7e4a03720e3d7b82ef567aa17fdeeea48cc213a3035ced7a3
diff --git a/sci-chemistry/openbabel-python/files/openbabel-python-2.3.1-system_openbabel.patch b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.1-system_openbabel.patch
new file mode 100644
index 000000000000..6420bba11e8a
--- /dev/null
+++ b/sci-chemistry/openbabel-python/files/openbabel-python-2.3.1-system_openbabel.patch
@@ -0,0 +1,15 @@
+--- scripts/python/setup.py
++++ scripts/python/setup.py
+@@ -15,11 +15,7 @@
+
+ obExtension = Extension('_openbabel',
+ [os.path.join(srcdir, "openbabel-python.cpp")],
+- include_dirs=[os.path.join(srcdir, "..", "..", "include"),
+- os.path.join("..", "include")],
+- library_dirs=[os.path.join(srcdir, "..", "..", "lib"),
+- os.path.join(srcdir, "..", "..", "lib64"),
+- os.path.join("..", "lib")],
++ include_dirs=[os.path.join("/usr", "include", "openbabel-2.0")],
+ libraries=['openbabel']
+ )
+
diff --git a/sci-chemistry/openbabel-python/openbabel-python-2.3.0.ebuild b/sci-chemistry/openbabel-python/openbabel-python-2.3.0.ebuild
index 04d5a8390a13..3c5a927136cf 100644
--- a/sci-chemistry/openbabel-python/openbabel-python-2.3.0.ebuild
+++ b/sci-chemistry/openbabel-python/openbabel-python-2.3.0.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-python/openbabel-python-2.3.0.ebuild,v 1.7 2011/09/14 05:06:41 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-python/openbabel-python-2.3.0.ebuild,v 1.8 2012/03/04 10:29:38 jlec Exp $
EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
PYTHON_MODNAME="openbabel.py pybel.py"
inherit distutils eutils
diff --git a/sci-chemistry/openbabel-python/openbabel-python-2.3.1.ebuild b/sci-chemistry/openbabel-python/openbabel-python-2.3.1.ebuild
new file mode 100644
index 000000000000..099307fcebe3
--- /dev/null
+++ b/sci-chemistry/openbabel-python/openbabel-python-2.3.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel-python/openbabel-python-2.3.1.ebuild,v 1.1 2012/03/04 10:29:38 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython *-pypy-*"
+PYTHON_MODNAME="openbabel.py pybel.py"
+
+inherit distutils eutils flag-o-matic
+
+DESCRIPTION="Python bindings for OpenBabel (including Pybel)"
+HOMEPAGE="http://openbabel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openbabel/openbabel-${PV}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+RDEPEND="
+ dev-cpp/eigen:2
+ dev-libs/libxml2:2
+ !sci-chemistry/babel
+ ~sci-chemistry/openbabel-${PV}
+ sys-libs/zlib"
+DEPEND="${RDEPEND}
+ >=dev-lang/swig-2"
+
+S="${WORKDIR}"/openbabel-${PV}
+
+DISTUTILS_SETUP_FILES=("scripts|python/setup.py")
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-system_openbabel.patch
+
+ sed \
+ -e "s:/usr:${EPREFIX}/usr:g" \
+ -i ./scripts/python/setup.py || die
+
+ swig -python -c++ -small -O -templatereduce -naturalvar \
+ -I"${EPREFIX}/usr/include/openbabel-2.0" \
+ -o scripts/python/openbabel-python.cpp \
+ -DHAVE_EIGEN2 \
+ -outdir scripts/python \
+ scripts/openbabel-python.i \
+ || die "Regeneration of openbabel-python.cpp failed"
+
+ append-cxxflags "$(pkg-config --cflags-only-I eigen2)"
+}
diff --git a/sci-chemistry/openbabel/Manifest b/sci-chemistry/openbabel/Manifest
index d27cd154515f..4837cbfcd1d8 100644
--- a/sci-chemistry/openbabel/Manifest
+++ b/sci-chemistry/openbabel/Manifest
@@ -1,2 +1,3 @@
DIST openbabel-2.2.3.tar.gz 6624028 RMD160 4234baf9773aa6f918bb3fa5a25cab5f657f857e SHA1 e396b27551a106e001ca6c953181657a0a53f43f SHA256 eabc8bdbd68431f441b6b40adde0861b2e99750efd21bbb4870ee0a233feae46
DIST openbabel-2.3.0.tar.gz 14321281 RMD160 96dafa3c2aca544f79e08b5617ab0da845c28a16 SHA1 408a4bddb7f052fd89c57ea51b4204b721856b16 SHA256 6dadcb256d83b1f2e616fa1853dd1afadb23550a20d1c118b406231a09f861fb
+DIST openbabel-2.3.1.tar.gz 20142960 RMD160 da4d240a92942dbf9dcf999187336d69d7ef8f5c SHA1 b2dd1638eaf7e6d350110b1561aeb23b03552846 SHA256 9e2e8bc9af585ee7e4a03720e3d7b82ef567aa17fdeeea48cc213a3035ced7a3
diff --git a/sci-chemistry/openbabel/metadata.xml b/sci-chemistry/openbabel/metadata.xml
index dd056d677694..6d2bd5b58651 100644
--- a/sci-chemistry/openbabel/metadata.xml
+++ b/sci-chemistry/openbabel/metadata.xml
@@ -1,14 +1,14 @@
- sci-chemistry
-
+ sci-chemistry
+
Open Babel is a chemical toolbox designed to speak the many languages of
chemical data. It's an open, collaborative project allowing anyone to
search, convert, analyze, or store data from molecular modeling, chemistry,
solid-state materials, biochemistry, or related areas.
-
+
diff --git a/sci-chemistry/openbabel/openbabel-2.3.1.ebuild b/sci-chemistry/openbabel/openbabel-2.3.1.ebuild
new file mode 100644
index 000000000000..ca15889b5564
--- /dev/null
+++ b/sci-chemistry/openbabel/openbabel-2.3.1.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/sci-chemistry/openbabel/openbabel-2.3.1.ebuild,v 1.2 2012/03/04 10:32:17 jlec Exp $
+
+EAPI=4
+
+WX_GTK_VER="2.8"
+
+inherit cmake-utils eutils wxwidgets
+
+DESCRIPTION="Interconverts file formats used in molecular modeling"
+HOMEPAGE="http://openbabel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="doc perl python wxwidgets"
+
+RDEPEND="
+ dev-cpp/eigen:2
+ dev-libs/libxml2:2
+ !sci-chemistry/babel
+ sci-libs/inchi
+ sys-libs/zlib
+ wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
+DEPEND="${RDEPEND}
+ >=dev-util/cmake-2.4.8"
+PDEPEND="
+ perl? ( sci-chemistry/openbabel-perl )
+ python? ( sci-chemistry/openbabel-python )"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS doc/*.inc doc/README* doc/*.mol2"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.3.0-test_lib_path.patch )
+
+src_configure() {
+ local mycmakeargs=""
+ mycmakeargs="${mycmakeargs}
+ -DOPENBABEL_USE_SYSTEM_INCHI=ON
+ $(cmake-utils_use wxwidgets BUILD_GUI)"
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ dohtml doc/{*.html,*.png}
+ if use doc ; then
+ insinto /usr/share/doc/${PF}/API/html
+ doins doc/API/html/*
+ fi
+ cmake-utils_src_install
+}
+
+src_test() {
+ local mycmakeargs=""
+ mycmakeargs="${mycmakeargs}
+ -DOPENBABEL_USE_SYSTEM_INCHI=ON
+ -DPYTHON_EXECUTABLE=false
+ $(cmake-utils_use wxwidgets BUILD_GUI)
+ $(cmake-utils_use_enable test TESTS)"
+
+ cmake-utils_src_configure
+ cmake-utils_src_compile
+ cmake-utils_src_test
+}
diff --git a/sci-geosciences/grass/grass-6.4.1-r1.ebuild b/sci-geosciences/grass/grass-6.4.1-r1.ebuild
index 4582116acec9..4c3e593dfee8 100644
--- a/sci-geosciences/grass/grass-6.4.1-r1.ebuild
+++ b/sci-geosciences/grass/grass-6.4.1-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/sci-geosciences/grass/grass-6.4.1-r1.ebuild,v 1.1 2012/01/23 11:40:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.1-r1.ebuild,v 1.2 2012/03/04 09:50:16 jlec Exp $
EAPI=3
@@ -60,7 +60,10 @@ RDEPEND="
x11-libs/libXt
motif? (
>=x11-libs/openmotif-2.3:0
- opengl? ( media-libs/mesa[motif] )
+ opengl? (
+ || (
+ media-libs/mesa[motif]
+ ( media-libs/mesa x11-libs/libGLw ) ) )
)
opengl? (
virtual/opengl
diff --git a/sci-geosciences/grass/grass-6.4.1.ebuild b/sci-geosciences/grass/grass-6.4.1.ebuild
index 1ecf735c2274..cbb918caddf6 100644
--- a/sci-geosciences/grass/grass-6.4.1.ebuild
+++ b/sci-geosciences/grass/grass-6.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.1.ebuild,v 1.9 2011/11/15 04:05:27 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/grass/grass-6.4.1.ebuild,v 1.10 2012/03/04 09:50:16 jlec Exp $
EAPI=3
@@ -60,7 +60,10 @@ RDEPEND="
x11-libs/libXt
motif? (
>=x11-libs/openmotif-2.3:0
- opengl? ( media-libs/mesa[motif] )
+ opengl? (
+ || (
+ media-libs/mesa[motif]
+ ( media-libs/mesa x11-libs/libGLw ) ) )
)
opengl? (
virtual/opengl
diff --git a/sci-geosciences/grass/metadata.xml b/sci-geosciences/grass/metadata.xml
index e0cbe3e38441..a23b87957462 100644
--- a/sci-geosciences/grass/metadata.xml
+++ b/sci-geosciences/grass/metadata.xml
@@ -1,15 +1,15 @@
-sci-geosciences
-
- nerdboy@gentoo.org
- Steve Arnold
-
-The original GIS, yes the first one, developed by the US Army Corp of Engineers, now an active open source GIS.
+ sci-geosciences
+
+ nerdboy@gentoo.org
+ Steve Arnold
+
+ The original GIS, yes the first one, developed by the US Army Corp of Engineers, now an active open source GIS.
See the GRASS Documentation Project for more info http://grass.itc.it/gdp/index.php
-
+
diff --git a/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r4.ebuild b/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r4.ebuild
index 245407f72939..97b25e3c4179 100644
--- a/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r4.ebuild
+++ b/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r4.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-auth/pam_mysql/pam_mysql-0.7_rc1-r4.ebuild,v 1.4 2012/01/15 15:44:48 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_mysql/pam_mysql-0.7_rc1-r4.ebuild,v 1.5 2012/03/03 23:16:32 klausman Exp $
EAPI=2
inherit autotools libtool pam
@@ -13,7 +13,7 @@ DEPEND=">=sys-libs/pam-0.72 virtual/mysql"
RDEPEND="${DEPEND}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
+KEYWORDS="alpha amd64 ppc ~sparc x86"
IUSE="openssl"
S="${WORKDIR}/${P/_rc/RC}"
diff --git a/sys-auth/realtime-base/realtime-base-0.1.ebuild b/sys-auth/realtime-base/realtime-base-0.1.ebuild
index b8996947b250..dcac0992fcde 100644
--- a/sys-auth/realtime-base/realtime-base-0.1.ebuild
+++ b/sys-auth/realtime-base/realtime-base-0.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/sys-auth/realtime-base/realtime-base-0.1.ebuild,v 1.11 2012/03/03 14:42:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/realtime-base/realtime-base-0.1.ebuild,v 1.12 2012/03/03 20:34:43 klausman Exp $
EAPI=3
@@ -12,7 +12,7 @@ SRC_URI=""
LICENSE="as-is"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
IUSE=""
DEPEND=""
diff --git a/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch b/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch
new file mode 100644
index 000000000000..57f87a5d5225
--- /dev/null
+++ b/sys-block/partimage/files/partimage-0.6.9-zlib-1.2.5.2.patch
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/405323
+
+--- src/client/imagefile.cpp
++++ src/client/imagefile.cpp
+@@ -783,7 +783,7 @@
+ else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
+ {
+ showDebug(1, "open gzip\n");
+- m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "wb"); //"wb1h");
++ m_gzImageFile = gzdopen(m_nFdImage, "wb"); //"wb1h");
+ if (m_gzImageFile == NULL)
+ {
+ showDebug(1, "error:%d %s\n", errno, strerror(errno));
+@@ -1098,7 +1098,7 @@
+ }
+ else if (m_options.dwCompression == COMPRESS_GZIP) // Gzip compression
+ {
+- m_gzImageFile = (gzFile *) gzdopen(m_nFdImage, "rb");
++ m_gzImageFile = gzdopen(m_nFdImage, "rb");
+ if (m_gzImageFile == NULL)
+ THROW(ERR_ERRNO, errno);
+ else
+--- src/client/imagefile.h
++++ src/client/imagefile.h
+@@ -41,7 +41,7 @@
+ COptions m_options;
+
+ FILE *m_fImageFile;
+- gzFile *m_gzImageFile;
++ gzFile m_gzImageFile;
+ BZFILE *m_bzImageFile;
+
+ int m_nFdImage;
diff --git a/sys-block/partimage/partimage-0.6.9.ebuild b/sys-block/partimage/partimage-0.6.9.ebuild
index c818f31e8718..fa9f38150c77 100644
--- a/sys-block/partimage/partimage-0.6.9.ebuild
+++ b/sys-block/partimage/partimage-0.6.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.9.ebuild,v 1.1 2010/11/19 19:36:33 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/partimage/partimage-0.6.9.ebuild,v 1.2 2012/03/04 09:57:05 ssuominen Exp $
-EAPI=3
+EAPI=4
inherit eutils flag-o-matic pam
DESCRIPTION="Console-based application to efficiently save raw partition data to an image file"
@@ -31,6 +31,10 @@ pkg_setup() {
enewuser partimag 91 -1 /var/lib/partimage partimag
}
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-zlib-1.2.5.2.patch #405323
+}
+
src_configure() {
# XXX: Do we still need these?
filter-flags -fno-exceptions
@@ -48,7 +52,6 @@ src_configure() {
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
--sysconfdir="${EPREFIX}"/etc \
$(use_enable nls) \
- --disable-dependency-tracking \
$(use_enable ssl) \
--disable-pam \
$(use_enable static all-static) \
@@ -57,26 +60,25 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install || die
- dodoc BOOT-ROOT.txt FORMAT FUTURE THANKS
+ default
keepdir /var/lib/partimage
keepdir /var/log/partimage
- newinitd "${FILESDIR}"/partimaged.init.2 partimaged || die
- newconfd "${FILESDIR}"/partimaged.conf partimaged || die
+ newinitd "${FILESDIR}"/partimaged.init.2 partimaged
+ newconfd "${FILESDIR}"/partimaged.conf partimaged
if use ssl; then
insinto /etc/partimaged
- doins "${FILESDIR}"/servercert.cnf || die
+ doins "${FILESDIR}"/servercert.cnf
fi
if use pam; then
- newpamd "${FILESDIR}"/partimaged.pam.2 partimaged || die
+ newpamd "${FILESDIR}"/partimaged.pam.2 partimaged
fi
}
-confdir=${ROOT}etc/partimaged
+confdir=${EROOT}/etc/partimaged
privkey=${confdir}/partimaged.key
cnf=${confdir}/servercert.cnf
csr=${confdir}/partimaged.csr
@@ -89,24 +91,24 @@ pkg_config() {
read
if [ ! -f ${privkey} ]; then
einfo "Generating unencrypted private key: ${privkey}"
- openssl genrsa -out ${privkey} 1024 || die "Failed!"
+ openssl genrsa -out ${privkey} 1024 || die
else
einfo "Private key already exists: ${privkey}"
fi
if [ ! -f ${csr} ]; then
einfo "Generating certificate request: ${csr}"
- openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die "Failed!"
+ openssl req -new -x509 -outform PEM -out ${csr} -key ${privkey} -config ${cnf} || die
else
einfo "Certificate request already exists: ${csr}"
fi
if [ ! -f ${cert} ]; then
einfo "Generating self-signed certificate: ${cert}"
- openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die "Failed!"
+ openssl x509 -in ${csr} -out ${cert} -signkey ${privkey} || die
else
einfo "Self-signed certifcate already exists: ${cert}"
fi
einfo "Setting permissions"
- partimagesslperms || die "Failed!"
+ partimagesslperms || die
einfo "Done"
else
einfo "SSL is disabled, not building certificates"
@@ -133,5 +135,5 @@ pkg_postinst() {
partimagesslperms
return 0
fi
- chown partimag:0 "${ROOT}"etc/partimaged/partimagedusers || die
+ chown partimag:0 "${EROOT}"/etc/partimaged/partimagedusers || die
}
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 6e76dc49289d..1a2c88dac0d4 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -25,7 +25,7 @@ DIST binutils-2.21.53.0.2-patches-1.0.tar.bz2 7370 RMD160 7cc9612104439418aa9aa3
DIST binutils-2.21.53.0.2.tar.bz2 18208223 RMD160 f1f3aa85926e59c83d9219100bc7b96c66faa0a2 SHA1 857391414b1292d97a6275b65aabd246457cb10c SHA256 fa63d95e0295c0cd2ec8793fe7d578951f01f368d49fed9be986c1ef9e1f6294
DIST binutils-2.21.tar.bz2 18742991 RMD160 8d2ebab3287a6283267879074b808d20fe9112b0 SHA1 ef93235588eb443e4c4a77f229a8d131bccaecc6 SHA256 60abec5bf448eb930a5a15acb8712612377dc8bcfb13dfd5131228f70561d0c7
DIST binutils-2.22-patches-1.0.tar.bz2 15489 RMD160 15b244eba2feb122fa6adcedc859210d6b119809 SHA1 6dce833867bddeaf3ed21617619f855a35d6697e SHA256 f87b210c9b646e0315bc6e33cf1175e4ffd974462e7841c037be430320890686
-DIST binutils-2.22-patches-1.1.tar.bz2 18556 RMD160 468c7089059458d3357a84a88d73054b12bc9aa5 SHA1 2f60f8b5ddf49a6e49e64c45d87c1b81a6452e26 SHA256 952ac464a80636d5bf03e2a061e27b90644d9744eab381727d06087eb1a31865
+DIST binutils-2.22-patches-1.2.tar.bz2 19283 RMD160 04277e8aea813560fc693a6c1b7693aea6b5a623 SHA1 ff93193d9b68b85b36eabbcd839c66359617b0f2 SHA256 441a490f515fd2c9a8103114b16baba65f88eb02c754ad57ec0e86f3286729c1
DIST binutils-2.22.52.0.1-patches-1.0.tar.bz2 15962 RMD160 fbb3519851a3ead8104e0a465917d7d1b42923f7 SHA1 6fcad49f0773b2047ef391dabcd369fc6db6ba7f SHA256 1dd4401792a57f6d66a154e675e1bcf7005bd2dee27d6af8944167b223cf5982
DIST binutils-2.22.52.0.1.tar.bz2 18697766 RMD160 5b751f06ddc5c48bb7f9b9bfb4f53e2cc9f85686 SHA1 e602fef7fd2df79602b011626fa800092eaeaf2e SHA256 7c49d5dfdf0f225747caa31ab8080d233e9f13bc67f9e2e40064b71910e12273
DIST binutils-2.22.tar.bz2 19973532 RMD160 34cebe4cdca9480d5dc6f6b00b052c48c8ac30dc SHA1 65b304a0b9a53a686ce50a01173d1f40f8efe404 SHA256 6c7af8ed1c8cf9b4b9d6e6fe09a3e1d3d479fe63984ba8b9b26bf356b6313ca9
diff --git a/sys-devel/binutils/binutils-2.22-r1.ebuild b/sys-devel/binutils/binutils-2.22-r1.ebuild
index a2aa62f130bc..08fe5fd27771 100644
--- a/sys-devel/binutils/binutils-2.22-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.22-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.22-r1.ebuild,v 1.1 2011/12/11 21:03:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/binutils/binutils-2.22-r1.ebuild,v 1.2 2012/03/04 06:09:31 vapier Exp $
-PATCHVER="1.1"
+PATCHVER="1.2"
ELF2FLT_VER=""
inherit toolchain-binutils
diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index 17d6cdf77277..b10a98d217cf 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,3 +1,4 @@
DIST gnuconfig-20100924.tar.bz2 49896 RMD160 8ce9acdee05f5aec18316a4c031b251d8c23a911 SHA1 3d24dc57edef1ded7a66892fbcfcd186acc6d743 SHA256 faf08e694c997376ce3972a8b3ce503aeac955c7ebf9939a8755cb54a47f3d5b
DIST gnuconfig-20110202.tar.bz2 49987 RMD160 a8f08b0f621e66498ef98c5330b99fd9a176e255 SHA1 b434eb5baffba92952c1b7d5f6fdbc903f1da196 SHA256 8519d51905de01b56887a841e5325970b2ff052bf3ae6054b1046fb91155611b
DIST gnuconfig-20110814.tar.bz2 50397 RMD160 ea4c9b728a826bc5d6da32d5cdbfe09d5088770d SHA1 ef0b6a59fc6fbf4c1ec49ac44bdc44b842cd24fe SHA256 2b2292afb1f23dcc289bd2260e3dc5620d8d71f044590144772b31a21afd5013
+DIST gnuconfig-20120116.tar.bz2 51202 RMD160 7f09e3337b1b63301010d5a32bcbdd07e0d21fb2 SHA1 d8976035eaada124a0735a53a925f2482cb287cb SHA256 f6dd543c41a73a4f2099716f821bb0efb65860535868df0715074cd0bc07135d
diff --git a/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch b/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch
index c89ebf3990df..619ab0461138 100644
--- a/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch
+++ b/sys-devel/gnuconfig/files/99999999/0001-add-uClibc-guess-support.patch
@@ -1,17 +1,17 @@
-From 20680a2504cdd765b764a0e96e732c8350122f6b Mon Sep 17 00:00:00 2001
+From 2be577b2bbffeccec254d146f78e8a915c8bb989 Mon Sep 17 00:00:00 2001
From: Mike Frysinger
Date: Thu, 9 Oct 2008 15:51:09 -0400
Subject: [PATCH 1/2] add uClibc guess support
---
- config.guess | 91 +++++++++++++++++++++++++++++++++------------------------
- 1 files changed, 53 insertions(+), 38 deletions(-)
+ config.guess | 99 +++++++++++++++++++++++++++++++++------------------------
+ 1 files changed, 57 insertions(+), 42 deletions(-)
diff --git a/config.guess b/config.guess
-index b02565c..ec5fba2 100755
+index d622a44..a3b0d66 100755
--- a/config.guess
+++ b/config.guess
-@@ -140,6 +140,29 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+@@ -138,6 +138,29 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
@@ -41,7 +41,7 @@ index b02565c..ec5fba2 100755
# Note: order is significant - the case branches are not exclusive.
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -852,11 +875,11 @@ EOF
+@@ -852,21 +875,21 @@ EOF
exit ;;
*:GNU:*:*)
# the GNU system
@@ -55,7 +55,19 @@ index b02565c..ec5fba2 100755
exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
-@@ -872,56 +895,48 @@ EOF
+ exit ;;
+ aarch64:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ aarch64_be:Linux:*:*)
+ UNAME_MACHINE=aarch64_be
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -879,59 +902,51 @@ EOF
EV68*) UNAME_MACHINE=alphaev68 ;;
esac
objdump --private-headers /bin/sh | grep -q ld.so.1
@@ -88,16 +100,20 @@ index b02565c..ec5fba2 100755
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
cris:Linux:*:*)
-- echo cris-axis-linux-gnu
-+ echo cris-axis-linux-${LIBC}
+- echo ${UNAME_MACHINE}-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
crisv32:Linux:*:*)
-- echo crisv32-axis-linux-gnu
-+ echo crisv32-axis-linux-${LIBC}
+- echo ${UNAME_MACHINE}-axis-linux-gnu
++ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
exit ;;
frv:Linux:*:*)
-- echo frv-unknown-linux-gnu
-+ echo frv-unknown-linux-${LIBC}
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+ exit ;;
+ hexagon:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
i*86:Linux:*:*)
- LIBC=gnu
@@ -125,7 +141,7 @@ index b02565c..ec5fba2 100755
exit ;;
mips:Linux:*:* | mips64:Linux:*:*)
eval $set_cc_for_build
-@@ -940,54 +955,54 @@ EOF
+@@ -950,54 +965,54 @@ EOF
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
@@ -133,8 +149,8 @@ index b02565c..ec5fba2 100755
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
;;
or32:Linux:*:*)
-- echo or32-unknown-linux-gnu
-+ echo or32-unknown-linux-${LIBC}
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
padre:Linux:*:*)
- echo sparc-unknown-linux-gnu
@@ -179,15 +195,16 @@ index b02565c..ec5fba2 100755
+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
tile*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
vax:Linux:*:*)
- echo ${UNAME_MACHINE}-dec-linux-gnu
+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
exit ;;
x86_64:Linux:*:*)
-- echo x86_64-unknown-linux-gnu
-+ echo x86_64-unknown-linux-${LIBC}
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
exit ;;
xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -196,5 +213,5 @@ index b02565c..ec5fba2 100755
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
--
-1.7.6
+1.7.8.4
diff --git a/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch b/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch
index 1a94040aeeff..6de5412ecee1 100644
--- a/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch
+++ b/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch
@@ -1,4 +1,4 @@
-From d93a04f20ce34b0489cae2595b5074c8d0020e4d Mon Sep 17 00:00:00 2001
+From e7e57625c8b118ef851c9f46cbd3ff8d30d1b1fe Mon Sep 17 00:00:00 2001
From: Mike Frysinger
Date: Thu, 9 Oct 2008 15:51:35 -0400
Subject: [PATCH 2/2] add ps2 targets to config.sub
@@ -8,19 +8,19 @@ Subject: [PATCH 2/2] add ps2 targets to config.sub
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/config.sub b/config.sub
-index f9fcdc8..1441b55 100755
+index c894da4..42adc67 100755
--- a/config.sub
+++ b/config.sub
-@@ -253,7 +253,7 @@ case $basic_machine in
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+@@ -257,7 +257,7 @@ case $basic_machine in
+ | be32 | be64 \
| bfin \
| c4x | clipper \
- | d10v | d30v | dlx | dsp16xx \
+ | d10v | d30v | dlx | dsp16xx | dvp \
+ | epiphany \
| fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
-@@ -788,6 +788,24 @@ case $basic_machine in
+@@ -800,6 +800,24 @@ case $basic_machine in
basic_machine=m68k-atari
os=-mint
;;
@@ -45,7 +45,7 @@ index f9fcdc8..1441b55 100755
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
-@@ -1338,7 +1356,7 @@ case $os in
+@@ -1358,7 +1376,7 @@ case $os in
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -55,5 +55,5 @@ index f9fcdc8..1441b55 100755
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--
-1.7.6
+1.7.8.4
diff --git a/sys-devel/gnuconfig/gnuconfig-20110814.ebuild b/sys-devel/gnuconfig/gnuconfig-20110814.ebuild
index 7426ea64c0f2..a348f4ac0a4a 100644
--- a/sys-devel/gnuconfig/gnuconfig-20110814.ebuild
+++ b/sys-devel/gnuconfig/gnuconfig-20110814.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/gnuconfig-20110814.ebuild,v 1.1 2011/08/15 03:27:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/gnuconfig-20110814.ebuild,v 1.2 2012/03/03 22:23:19 vapier Exp $
EAPI="2"
@@ -10,7 +10,7 @@ if [[ ${PV} == "99999999" ]] ; then
inherit git
else
SRC_URI="mirror://gentoo/${P}.tar.bz2"
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~ia64-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 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi
DESCRIPTION="Updated config.sub and config.guess file from GNU"
diff --git a/sys-devel/gnuconfig/gnuconfig-20120116.ebuild b/sys-devel/gnuconfig/gnuconfig-20120116.ebuild
new file mode 100644
index 000000000000..5268eed4fb69
--- /dev/null
+++ b/sys-devel/gnuconfig/gnuconfig-20120116.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gnuconfig/gnuconfig-20120116.ebuild,v 1.1 2012/03/03 22:24:58 vapier Exp $
+
+EAPI="2"
+
+inherit eutils
+if [[ ${PV} == "99999999" ]] ; then
+ EGIT_REPO_URI="git://git.savannah.gnu.org/config.git
+ http://git.savannah.gnu.org/r/config.git"
+
+ inherit git-2
+else
+ SRC_URI="mirror://gentoo/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="Updated config.sub and config.guess file from GNU"
+HOMEPAGE="http://savannah.gnu.org/projects/config"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+S=${WORKDIR}
+
+maint_pkg_create() {
+ cd "${S}"
+
+ local ver=$(head -n 1 ChangeLog | awk '{print $1}' | sed -e 's:-::g')
+ [[ ${#ver} != 8 ]] && die "invalid version '${ver}'"
+
+ cp "${FILESDIR}"/${PV}/*.patch . || die
+
+ local tar="${T}/gnuconfig-${ver}.tar.bz2"
+ tar -jcf ${tar} . || die "creating tar failed"
+ einfo "Packaged tar now available:"
+ einfo "$(du -b ${tar})"
+}
+
+src_unpack() {
+ if [[ ${PV} == "99999999" ]] ; then
+ git-2_src_unpack
+ maint_pkg_create
+ else
+ unpack ${A}
+ fi
+}
+
+src_prepare() {
+ epatch "${WORKDIR}"/*.patch
+ use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
+}
+
+src_compile() { :;}
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins config.{sub,guess} || die
+ fperms +x /usr/share/${PN}/config.{sub,guess}
+ dodoc ChangeLog
+}
diff --git a/sys-kernel/kerneloops/Manifest b/sys-kernel/kerneloops/Manifest
deleted file mode 100644
index 73d66bf0c0b9..000000000000
--- a/sys-kernel/kerneloops/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kerneloops-0.12.tar.gz 64374 RMD160 d095d3b2d2680e4b6726f19a42d0eba853e74adb SHA1 0dc86cff83fe3e91068a2d069fe4282c02cbbe22 SHA256 69bd49a7d3a4822d0ba541ebf5a9a956f057f0d26668191cdadb9ea06e886627
diff --git a/sys-kernel/kerneloops/files/0.12-FLAGS.patch b/sys-kernel/kerneloops/files/0.12-FLAGS.patch
deleted file mode 100644
index 39852204b78f..000000000000
--- a/sys-kernel/kerneloops/files/0.12-FLAGS.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -10,16 +10,16 @@
- MANDIR=/usr/share/man/man8
- CC?=gcc
-
--CFLAGS := -O2 -g -fstack-protector -D_FORTIFY_SOURCE=2 -Wall -W -Wstrict-prototypes -Wundef -fno-common -Werror-implicit-function-declaration -Wdeclaration-after-statement
-+CFLAGS ?= -O2 -g -fstack-protector -D_FORTIFY_SOURCE=2 -Wall -W -Wstrict-prototypes -Wundef -fno-common -Werror-implicit-function-declaration -Wdeclaration-after-statement
-
--MY_CFLAGS := `pkg-config --cflags libnotify gtk+-2.0`
-+MY_CFLAGS := `pkg-config --cflags dbus-glib-1 libnotify gtk+-2.0`
- #
- # pkg-config tends to make programs pull in a ton of libraries, not all
- # are needed. -Wl,--as-needed tells the linker to just drop unused ones,
- # and that makes the applet load faster and use less memory.
- #
--LDF_A := -Wl,--as-needed `pkg-config --libs libnotify gtk+-2.0`
--LDF_D := -Wl,--as-needed `pkg-config --libs glib-2.0 dbus-glib-1` `curl-config --libs` -Wl,"-z relro" -Wl,"-z now"
-+LIBSA := `pkg-config --libs dbus-glib-1 libnotify gtk+-2.0`
-+LIBSD := `pkg-config --libs glib-2.0 dbus-glib-1` `curl-config --libs`
-
- all: kerneloops kerneloops-applet kerneloops.8.gz
-
-@@ -30,11 +30,11 @@
-
-
- kerneloops: kerneloops.o submit.o dmesg.o configfile.o kerneloops.h
-- gcc kerneloops.o submit.o dmesg.o configfile.o $(LDF_D) -o kerneloops
-+ $(CC) $(LDFLAGS) kerneloops.o submit.o dmesg.o configfile.o -o kerneloops $(LIBSD)
- @(cd po/ && $(MAKE))
-
- kerneloops-applet: kerneloops-applet.o
-- gcc kerneloops-applet.o $(LDF_A)-o kerneloops-applet
-+ $(CC) $(LDFLAGS) kerneloops-applet.o -o kerneloops-applet $(LIBSA)
-
- kerneloops.8.gz: kerneloops.8
- gzip -9 -c $< > $@
diff --git a/sys-kernel/kerneloops/files/0.12-libnotify-0.7.patch b/sys-kernel/kerneloops/files/0.12-libnotify-0.7.patch
deleted file mode 100644
index 7ccbb7939d42..000000000000
--- a/sys-kernel/kerneloops/files/0.12-libnotify-0.7.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- kerneloops-applet.c
-+++ kerneloops-applet.c
-@@ -240,8 +240,15 @@
- /* if there's a notification active already, close it first */
- close_notification();
-
-- notify = notify_notification_new(summary, message,
-- "/usr/share/kerneloops/icon.png", NULL);
-+#ifdef NOTIFY_CHECK_VERSION
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png");
-+#else
-+ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL);
-+#endif
-+#else
-+ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL);
-+#endif
-
- notify_notification_set_timeout(notify, 0);
- notify_notification_set_urgency(notify, NOTIFY_URGENCY_CRITICAL);
-@@ -306,8 +313,15 @@
-
- url_to_oops[0] = 0;
-
-- notify = notify_notification_new(summary, message,
-- "/usr/share/kerneloops/icon.png", NULL);
-+#ifdef NOTIFY_CHECK_VERSION
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png");
-+#else
-+ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL);
-+#endif
-+#else
-+ notify = notify_notification_new(summary, message, "/usr/share/kerneloops/icon.png", NULL);
-+#endif
-
- notify_notification_set_timeout(notify, 5000);
- notify_notification_set_urgency(notify, NOTIFY_URGENCY_LOW);
diff --git a/sys-kernel/kerneloops/files/kerneloops b/sys-kernel/kerneloops/files/kerneloops
deleted file mode 100755
index 9be16ea6d3be..000000000000
--- a/sys-kernel/kerneloops/files/kerneloops
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/files/kerneloops,v 1.2 2008/01/08 23:45:41 gregkh Exp $
-
-depend() {
- need net
-}
-
-exec="/usr/sbin/kerneloops"
-prog=$(basename $exec)
-conf="/etc/kerneloops.conf"
-pidfile="/var/run/${prog}.pid"
-
-checkconfig() {
- if [ ! -e $conf ] ; then
- eerror "You need an ${conf} file to run $prog"
- return 1
- fi
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting Kerneloops Monitor daemon"
- start-stop-daemon --start --quiet --background --pidfile ${pidfile} --make-pidfile --exec ${exec} -- --nodaemon
- eend $?
-}
-
-stop() {
- ebegin "Stopping Kerneloops Monitor daemon"
- start-stop-daemon --stop --quiet --pidfile ${pidfile} --name ${prog}
- eend $?
-}
diff --git a/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild b/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild
deleted file mode 100644
index a3866fce4901..000000000000
--- a/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/kerneloops/kerneloops-0.12-r1.ebuild,v 1.2 2011/01/30 09:29:45 ssuominen Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Tool to automatically collect and submit Linux kernel crash signatures"
-HOMEPAGE="http://www.kerneloops.org/"
-SRC_URI="http://www.kerneloops.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/dbus-glib-0.88
- net-misc/curl
- x11-libs/gtk+:2
- x11-libs/libnotify
- dev-util/desktop-file-utils"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PV}-FLAGS.patch \
- "${FILESDIR}"/${PV}-libnotify-0.7.patch
-}
-
-src_compile() {
- emake \
- CC="$(tc-getCC)" \
- kerneloops kerneloops-applet || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install-system || die
- emake DESTDIR="${D}" install-kerneloops || die
- emake DESTDIR="${D}" install-applet || die
-
- doinitd "${FILESDIR}"/kerneloops || die
-
- dosed 's:\(nodaemon\):\1 --file "${LOGFILE}":g' /etc/init.d/${PN}
-
- cat >> "${T}"/kerneloops <<- EOF
- # Change this according to your syslogger
- LOGFILE="/var/log/messages"
- EOF
-
- doconfd "${T}"/kerneloops
-}
-
-pkg_postinst() {
- ewarn "PRIVACY NOTE"
- ewarn "You must allow the kerneloops program to send the oops messages"
- ewarn "by either editing the /etc/kerneloops.conf file, or by running the"
- ewarn "kerneloops-applet program first."
- ewarn "Enabling this option will cause your system to submit certain kernel"
- ewarn "output to the kerneloops.org website, where it will be available via"
- ewarn "this website to developers and everyone else."
- ewarn "The submitted info are so-called \"oopses\", kernel crash signature."
- ewarn "However, due to the nature of oopses, it may happen that a few"
- ewarn "surrounding lines of the oops in the \"dmesg\" are being sent together"
- ewarn "with the oops."
-}
diff --git a/sys-kernel/kerneloops/metadata.xml b/sys-kernel/kerneloops/metadata.xml
deleted file mode 100644
index 280d17efe234..000000000000
--- a/sys-kernel/kerneloops/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
- gregkh@gentoo.org
- Greg Kroah-Hartman
-
-
- This package contains the tools to collect kernel crash signatures, and to
- submit them to the kerneloops website where the kernel crash signatures get
- collected and groups for presentation to the Linux kernel developers.
-
-
diff --git a/www-apps/twiki/Manifest b/www-apps/twiki/Manifest
deleted file mode 100644
index 1512bd73c148..000000000000
--- a/www-apps/twiki/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST TWiki-4.3.1.tgz 5888363 RMD160 b842cae0b3e30393dc15a178b3cbaaeb9761d751 SHA1 b211621d800e0f677d1303526fc3c9f035fa4138 SHA256 7fe70f7ec5a9235e085450ea8f57dfce8a6007507d6b4a9259b11bb79be46a4e
diff --git a/www-apps/twiki/files/postinstall-en.txt b/www-apps/twiki/files/postinstall-en.txt
deleted file mode 100644
index 13543ef0304d..000000000000
--- a/www-apps/twiki/files/postinstall-en.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-You are almost done!
-
-0. You will need to manually adjust permissions for the installation script to
- run:
-
- $ chown -R apache:apache ${MY_INSTALLDIR}
-
- When you're done with the installation, don't forget to make sure that only
- the data/ and pub/ directories are writeable by the webserver!!!
-
-1. Review ${MY_INSTALLDIR}/bin/LocalLib.cfg and make sure all paths are set correctly
-
-2. Take a look at twiki_httpd_conf.txt and modify your Apache configs as
- needed. Make sure your webserver can execute ${MY_INSTALLDIR}/bin/configure
- Pay attention to the ExecCGI option (see https://bugs.gentoo.org/134132).
-
-3. Visit http://${VHOST_HOSTNAME}/twiki/bin/configure
- Most values should have been automatically set for you.
-
-4. Read the install guide
- http://twiki.org/cgi-bin/view/TWiki/TWikiDocumentation
-
-=======================================================================
-
-If you are upgrading:
-
-Follow the manual upgrade procedure as described on
-http://twiki.org/cgi-bin/view/TWiki/TWikiUpgradeGuide
diff --git a/www-apps/twiki/files/postupgrade-en.txt b/www-apps/twiki/files/postupgrade-en.txt
deleted file mode 100644
index f088c8613e20..000000000000
--- a/www-apps/twiki/files/postupgrade-en.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Follow the manual upgrade procedure as described on
-http://twiki.org/cgi-bin/view/TWiki/TWikiUpgradeGuide
diff --git a/www-apps/twiki/files/reconfig b/www-apps/twiki/files/reconfig
deleted file mode 100644
index 06f08c2ab8a2..000000000000
--- a/www-apps/twiki/files/reconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-die() {
- echo "#####"
- echo $1
- echo "#####"
- exit 1
-}
-
-if [ $1 = "install" ]; then
- # fix lib location
- sed -e "s|/absolute/path/to/your/lib|${MY_INSTALLDIR}/lib|" -i ${MY_INSTALLDIR}/bin/LocalLib.cfg || die
-
- sed -e "s|/home/httpd/twiki/|${MY_INSTALLDIR}/|g" -i ${MY_INSTALLDIR}/twiki_httpd_conf.txt
-
- sed -e "s|http://your.domain.com|http://${VHOST_HOSTNAME}|g
- s|/home/httpd/twiki|${MY_INSTALLDIR}|g" -i ${MY_INSTALLDIR}/lib/LocalSite.cfg
-
- # fix file permissions to avoid warnings
- chmod 0755 ${MY_INSTALLDIR}/bin/*
-else
- echo $1
-fi
diff --git a/www-apps/twiki/twiki-4.3.1.ebuild b/www-apps/twiki/twiki-4.3.1.ebuild
deleted file mode 100644
index d0502aea3432..000000000000
--- a/www-apps/twiki/twiki-4.3.1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/twiki/twiki-4.3.1.ebuild,v 1.4 2012/02/12 18:26:15 armin76 Exp $
-
-WEBAPP_NO_AUTO_INSTALL="yes"
-
-inherit webapp
-
-MY_PN="TWiki"
-
-DESCRIPTION="A Web Based Collaboration Platform"
-HOMEPAGE="http://twiki.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-RESTRICT="fetch"
-IUSE=""
-
-S="${WORKDIR}"
-
-RDEPEND=">=dev-vcs/rcs-5.7
- sys-apps/diffutils
- >=dev-lang/perl-5.8
- dev-perl/Algorithm-Diff
- dev-perl/CGI-Session
- dev-perl/Digest-SHA1
- dev-perl/HTML-Parser
- dev-perl/locale-maketext-lexicon
- dev-perl/Text-Diff
- dev-perl/URI
- dev-perl/Unicode-String
- virtual/cron
- >=virtual/perl-CGI-3.20
- virtual/perl-digest-base
- virtual/perl-File-Spec
- virtual/perl-libnet
- virtual/perl-Time-Local"
-
-need_httpd_cgi
-
-pkg_nofetch() {
- einfo "Please download ${MY_PN}_${PV}.tgz from:"
- einfo "http://twiki.org/cgi-bin/view/Codev/DownloadTWiki"
- einfo "and move it to ${DISTDIR}"
-}
-
-src_install() {
- webapp_src_preinst
-
- dodoc AUTHORS COPYRIGHT readme.txt
- dohtml T*.html INSTALL.html
- rm -f readme.txt T*.html INSTALL.html
-
- mv bin/LocalLib.cfg{.txt,}
-
- insinto "${MY_HTDOCSDIR}"
- doins -r .
-
- for f in $(find data pub); do
- webapp_serverowned "${MY_HTDOCSDIR}"/${f}
- done
-
- for f in bin/setlib.cfg bin/LocalLib.cfg; do
- webapp_configfile "${MY_HTDOCSDIR}"/${f}
- done
-
- webapp_hook_script "${FILESDIR}"/reconfig
- webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
- webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
-
- webapp_src_install
-}
-
-pkg_postinst() {
- ewarn
- ewarn "If you are upgrading from an older version of TWiki, back up your"
- ewarn "data/ and pub/ directories and any local changes before upgrading!"
- ewarn
- ewarn "You are _strongly_ encouraged to to read the upgrade guide:"
- ewarn "http://twiki.org/cgi-bin/view/TWiki/TWikiDocumentation"
- ewarn
- webapp_pkg_postinst
-}
diff --git a/www-servers/gunicorn/Manifest b/www-servers/gunicorn/Manifest
index 332b0143947e..bc5c7af7477b 100644
--- a/www-servers/gunicorn/Manifest
+++ b/www-servers/gunicorn/Manifest
@@ -1,2 +1,2 @@
-DIST gunicorn-0.12.2.tar.gz 180741 RMD160 0591c8c9992f0897e52785c219b1b38a10545e2b SHA1 222c667758f389621a998887f10210892525c7fd SHA256 f79d95c2e245d61ea3e2c12f806546b446cf86284e58ecf115d835d1d191fd5e
DIST gunicorn-0.13.4.tar.gz 283003 RMD160 35842153208ac81cd7fa79a7dc7516170eaa9bb6 SHA1 269a6c3c59fc07cb1a6e0b561cc55358b3aa6cd1 SHA256 e653e90547506c58f293b00ab78caf42829812ff6884a88145e1e0b61eee7d11
+DIST gunicorn-0.14.0.tar.gz 1129081 RMD160 320a661c80a9494fe11edb2b16b66f0cc3f88cbd SHA1 28c898f7c309dbc0781dc62b5f8d6293457b9912 SHA256 3ad3475ab15f6a39ca11619cba6878c93e62522532b437af8e01a2603e127272
diff --git a/www-servers/gunicorn/files/gunicorn-0.14.0-noegg.patch b/www-servers/gunicorn/files/gunicorn-0.14.0-noegg.patch
new file mode 100644
index 000000000000..7be449f5c6c3
--- /dev/null
+++ b/www-servers/gunicorn/files/gunicorn-0.14.0-noegg.patch
@@ -0,0 +1,64 @@
+diff --git a/tests/003-test-config.py b/tests/003-test-config.py
+index 4d9ef92..218a8e4 100644
+--- a/tests/003-test-config.py
++++ b/tests/003-test-config.py
+@@ -24,12 +24,7 @@ def paster_ini():
+ return os.path.join(dirname, "..", "examples", "frameworks", "pylonstest", "nose.ini")
+
+ def PasterApp():
+- try:
+- from paste.deploy import loadapp, loadwsgi
+- except ImportError:
+- raise SkipTest()
+- from gunicorn.app.pasterapp import PasterApplication
+- return PasterApplication("no_usage")
++ raise SkipTest()
+
+ class AltArgs(object):
+ def __init__(self, args=None):
+@@ -59,43 +54,8 @@ def test_defaults():
+ t.eq(s.default, c.settings[s.name].get())
+
+ def test_property_access():
+- c = config.Config()
+- for s in config.KNOWN_SETTINGS:
+- getattr(c, s.name)
+-
+- # Class was loaded
+- t.eq(c.worker_class, SyncWorker)
+-
+- # Debug affects workers
+- t.eq(c.workers, 1)
+- c.set("workers", 3)
+- t.eq(c.workers, 3)
+-
+- # Address is parsed
+- t.eq(c.address, ("127.0.0.1", 8000))
+-
+- # User and group defaults
+- t.eq(os.geteuid(), c.uid)
+- t.eq(os.getegid(), c.gid)
+-
+- # Proc name
+- t.eq("gunicorn", c.proc_name)
+-
+- # Not a config property
+- t.raises(AttributeError, getattr, c, "foo")
+- # Force to be not an error
+- class Baz(object):
+- def get(self):
+- return 3.14
+- c.settings["foo"] = Baz()
+- t.eq(c.foo, 3.14)
+-
+- # Attempt to set a cfg not via c.set
+- t.raises(AttributeError, setattr, c, "proc_name", "baz")
+-
+- # No setting for name
+- t.raises(AttributeError, c.set, "baz", "bar")
+-
++ raise SkipTest()
++
+ def test_bool_validation():
+ c = config.Config()
+ t.eq(c.debug, False)
diff --git a/www-servers/gunicorn/gunicorn-0.12.2.ebuild b/www-servers/gunicorn/gunicorn-0.12.2.ebuild
deleted file mode 100644
index 4a2039b9fc73..000000000000
--- a/www-servers/gunicorn/gunicorn-0.12.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/gunicorn/gunicorn-0.12.2.ebuild,v 1.3 2011/08/07 03:17:49 phajdan.jr Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
-
-inherit distutils
-
-DESCRIPTION="A WSGI HTTP Server for UNIX, fast clients and nothing else"
-HOMEPAGE="http://gunicorn.org http://pypi.python.org/pypi/gunicorn"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc examples test"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/setproctitle"
-DEPEND="dev-python/setuptools
- test? ( dev-python/nose )"
-
-DOCS="README.rst"
-
-src_install() {
- distutils_src_install
- use doc && dohtml -r doc/htdocs/*
- insinto "/usr/share/doc/${PF}"
- use examples && doins -r examples
-}
-
-src_test() {
- # distutils_src_test doesn't works if gunicorn isn't installed yet
- testing() {
- PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" setup.py test
- }
- python_execute_function testing
-}
diff --git a/www-servers/gunicorn/gunicorn-0.14.0.ebuild b/www-servers/gunicorn/gunicorn-0.14.0.ebuild
new file mode 100644
index 000000000000..c1dcd4f503a3
--- /dev/null
+++ b/www-servers/gunicorn/gunicorn-0.14.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gunicorn/gunicorn-0.14.0.ebuild,v 1.1 2012/03/04 01:25:15 rafaelmartins Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.4 3.* *-jython"
+DISTUTILS_SRC_TEST="nosetests"
+
+inherit distutils eutils
+
+DESCRIPTION="A WSGI HTTP Server for UNIX"
+HOMEPAGE="http://gunicorn.org http://pypi.python.org/pypi/gunicorn"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc test"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/setproctitle"
+DEPEND="dev-python/setuptools"
+
+DOCS="README.rst"
+
+src_prepare() {
+ epatch "${FILESDIR}/${P}-"noegg.patch || die
+}
+
+src_install() {
+ distutils_src_install
+ use doc && dohtml -r doc/htdocs/*
+}
diff --git a/www-servers/gunicorn/metadata.xml b/www-servers/gunicorn/metadata.xml
index 765488dd0991..b3d72d581e0e 100644
--- a/www-servers/gunicorn/metadata.xml
+++ b/www-servers/gunicorn/metadata.xml
@@ -5,6 +5,11 @@
rafaelmartins@gentoo.org
Rafael G. Martins
+
+ bugs@bergstroem.nu
+ Johan Bergström
+ Co-maintainer, CC on bugs.
+
Gunicorn 'Green Unicorn' is a Python WSGI HTTP Server for UNIX. It's a
pre-fork worker model ported from Ruby's Unicorn project. The Gunicorn
diff --git a/x11-libs/libGLw/Manifest b/x11-libs/libGLw/Manifest
new file mode 100644
index 000000000000..81de388cf525
--- /dev/null
+++ b/x11-libs/libGLw/Manifest
@@ -0,0 +1 @@
+DIST libGLw-1.0.0_pre120304.tar.xz 10260 RMD160 2ace6b927112bf6222112245921ad422469de771 SHA1 04d4e8702bb0f48ab7b506a48e965df7bc4e7605 SHA256 998e2be9e3b417d9a5c7a713980491826ec8187eba1229c7cedb15b64ba8d815
diff --git a/x11-libs/libGLw/libGLw-1.0.0_pre120304.ebuild b/x11-libs/libGLw/libGLw-1.0.0_pre120304.ebuild
new file mode 100644
index 000000000000..d682f52d9d0a
--- /dev/null
+++ b/x11-libs/libGLw/libGLw-1.0.0_pre120304.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libGLw/libGLw-1.0.0_pre120304.ebuild,v 1.1 2012/03/04 09:43:12 jlec Exp $
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Mesa GLw library"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+SRC_URI="http:/dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+motif static-libs"
+
+RDEPEND="
+ !media-libs/mesa[motif]
+ x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/openmotif
+ virtual/opengl"
+DEPEND="${RDEPEND}
+ dev-util/pkgconfig"
+
+src_configure() {
+ local myeconfargs=(
+ --enable-motif
+ )
+ autotools-utils_src_configure
+}
diff --git a/www-apps/twiki/metadata.xml b/x11-libs/libGLw/metadata.xml
similarity index 63%
rename from www-apps/twiki/metadata.xml
rename to x11-libs/libGLw/metadata.xml
index 6632069b5aff..3bfcbea22f7e 100644
--- a/www-apps/twiki/metadata.xml
+++ b/x11-libs/libGLw/metadata.xml
@@ -1,5 +1,8 @@
- web-apps
+ x11
+
+ jlec@gentoo.org
+
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index d84ecd57efe8..5cb85bf6bd82 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -1,4 +1,3 @@
-DIST qwt-5.2.0.tar.bz2 1371877 RMD160 061319c7b4821c366fd05b68bbc3e134351f9110 SHA1 8830498b87d99d4b7e95ee643f1f7ff178204ba9 SHA256 2b431a6e04cb939f71cdc03a343975162bd6f94bfc11b85227bdb44e9576f5ba
DIST qwt-5.2.1.tar.bz2 1926453 RMD160 28e07ea12323a5217118a38e1a7d730a8ce50fee SHA1 89de7a90b7eddad2989470627baa19d59e348df1 SHA256 e2b8bb755404cb3dc99e61f3e2d7262152193488f5fbe88524eb698e11ac569f
DIST qwt-6.0.0.tar.bz2 2723203 RMD160 c0e3c31fcc39e6f9a33b23e91d5f8c8125fb4f69 SHA1 306957fc06c90f2049aec57e13a971f54c3cb21a SHA256 d041d63029ea5f6a64d06be9bfe788e5d8bed8bac1fa129d82466aa09ab4092e
DIST qwt-6.0.1.tar.bz2 2437570 RMD160 54b815d131fd7e7c8bfd1a49fbf3bc7c0ccc9c7a SHA1 301cca0c49c7efc14363b42e082b09056178973e SHA256 3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index 6c1ad7a9b725..8ce04e6e2158 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -1,8 +1,8 @@
-sci
-
+ sci
+
The Qwt library contains GUI Components and utility classes which are
primarily useful for programs with a technical background.
Besides a 2D plot widget it provides scales, sliders, dials,
diff --git a/x11-libs/qwt/qwt-5.2.0.ebuild b/x11-libs/qwt/qwt-5.2.0.ebuild
deleted file mode 100644
index 318e970986ed..000000000000
--- a/x11-libs/qwt/qwt-5.2.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-5.2.0.ebuild,v 1.11 2011/06/15 06:15:49 jlec Exp $
-
-EAPI=2
-inherit eutils qt4
-
-DESCRIPTION="2D plotting library for Qt4"
-HOMEPAGE="http://qwt.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="qwt"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-SLOT="5"
-IUSE="doc examples svg"
-
-DEPEND="x11-libs/qt-gui:4
- doc? ( ! qwtconfig.pri <<-EOF
- target.path = /usr/$(get_libdir)
- headers.path = /usr/include/qwt5
- doc.path = /usr/share/doc/${PF}
- CONFIG += qt warn_on thread release
- CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner
- VERSION = ${PV}
- EOF
- # don't build examples - fix the qt files to build once installed
- cat > examples/examples.pri <<-EOF
- include( qwtconfig.pri )
- TEMPLATE = app
- MOC_DIR = moc
- INCLUDEPATH += /usr/include/qwt5
- DEPENDPATH += /usr/include/qwt5
- LIBS += -lqwt
- EOF
- sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
- sed -i -e 's/headers doc/headers/' src/src.pro || die
- qt4_src_prepare
-}
-
-src_configure() {
- use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem"
- cp qwtconfig.pri examples/qwtconfig.pri
- eqmake4
-}
-src_compile() {
- # split compilation to allow parallel building
- emake sub-src || die "emake library failed"
- emake || die "emake failed"
-}
-
-src_install () {
- emake INSTALL_ROOT="${D}" install || die "emake install failed"
- dodoc CHANGES README
- insinto /usr/share/doc/${PF}
- if use doc; then
- rm doc/man/*/*license*
- doman doc/man/*/* || die
- doins -r doc/html || die
- fi
- if use examples; then
- doins -r examples || die
- fi
-}
diff --git a/x11-misc/dragbox/dragbox-0.4.0.ebuild b/x11-misc/dragbox/dragbox-0.4.0.ebuild
index 608b34fcd7e2..4a49847b3eb7 100644
--- a/x11-misc/dragbox/dragbox-0.4.0.ebuild
+++ b/x11-misc/dragbox/dragbox-0.4.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dragbox/dragbox-0.4.0.ebuild,v 1.2 2011/03/28 17:15:55 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dragbox/dragbox-0.4.0.ebuild,v 1.3 2012/03/04 09:26:19 pacho Exp $
-EAPI="2"
+EAPI=4
PYTHON_DEPEND="2"
inherit python
@@ -24,15 +24,25 @@ DEPEND="dev-python/pygtk:2
x11-libs/gtk+:2"
RDEPEND="${DEPEND}"
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ python_clean_py-compile_files
+ python_convert_shebangs 2 dragbox
+}
+
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+ emake DESTDIR="${D}" install
+ dodoc AUTHORS ChangeLog NEWS README TODO
}
pkg_postinst() {
- python_mod_optimize $(python_get_sitedir)/Dragbox
+ python_mod_optimize Dragbox
}
pkg_postrm() {
- python_mod_cleanup $(python_get_sitedir)/Dragbox
+ python_mod_cleanup Dragbox
}
diff --git a/x11-misc/lightdm/lightdm-1.0.6-r2.ebuild b/x11-misc/lightdm/lightdm-1.0.6-r2.ebuild
deleted file mode 100644
index 04c8a7c7248e..000000000000
--- a/x11-misc/lightdm/lightdm-1.0.6-r2.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.0.6-r2.ebuild,v 1.1 2011/11/05 23:51:20 hwoarang Exp $
-
-EAPI=4
-inherit autotools eutils pam
-
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz
- mirror://gentoo/introspection-20110205.m4.tar.bz2
- gtk? ( http://dev.gentoo.org/~hwoarang/distfiles/${PN}-gentoo-patch.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="branding +gtk +introspection qt4"
-
-RDEPEND="dev-libs/glib:2
- virtual/pam
- x11-libs/libxklavier
- x11-libs/libX11
- dev-libs/libxml2
- gtk? ( x11-libs/gtk+:3
- x11-themes/gnome-themes-standard
- x11-themes/gnome-icon-theme )
- introspection? ( dev-libs/gobject-introspection )
- qt4? ( x11-libs/qt-core:4
- x11-libs/qt-dbus:4 )
- sys-apps/accountsservice"
-DEPEND="${RDEPEND}
- dev-lang/vala:0.12
- dev-util/intltool
- dev-util/pkgconfig
- gnome-base/gnome-common
- sys-devel/gettext"
-
-REQUIRED_USE="branding? ( gtk ) || ( gtk qt4 )"
-DOCS=( NEWS )
-
-src_prepare() {
- sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die
- sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die
- epatch "${FILESDIR}"/session-wrapper-${PN}.patch
-
- if has_version dev-libs/gobject-introspection; then
- eautoreconf
- else
- AT_M4DIR=${WORKDIR} eautoreconf
- fi
-}
-
-src_configure() {
- # Maybe in the future, we can support some automatic session and user
- # recognition. Until then, use default values
- local default=gnome greeter= user=root
-
- # gtk has higher priority because Qt4 interface sucks :)
- use qt4 && greeter=lightdm-qt-greeter
- use gtk && greeter=lightdm-gtk-greeter
-
- # Let user know how lightdm is configured
- einfo "Gentoo configuration"
- einfo "Default greeter: ${greeter}"
- einfo "Default session: ${default}"
- einfo "Greeter user: ${user}"
-
- # do the actual configuration
- econf --localstatedir=/var \
- --disable-static \
- $(use_enable introspection) \
- $(use_enable qt4 liblightdm-qt) \
- $(use_enable qt4 qt-greeter) \
- $(use_enable gtk gtk-greeter) \
- --with-user-session=${default} \
- --with-greeter-session=${greeter} \
- --with-greeter-user=${user} \
- --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
- default
-
- # Install missing files
- insinto /etc/${PN}/
- doins "${S}"/data/{users,keys}.conf
- doins "${FILESDIR}"/Xsession
- fperms +x /etc/${PN}/Xsession
- # remove .la files
- find "${ED}" -name "*.la" -exec rm -rf {} +
- rm -Rf "${ED}"/etc/init || die
-
- if use gtk; then
- insinto /etc/${PN}/
- doins "${WORKDIR}"/${PN}-gtk-greeter.conf
- if use branding; then
- insinto /usr/share/${PN}/backgrounds/
- doins "${WORKDIR}"/gentoo1024x768.png
- sed -i -e "/background/s:=.*:=/usr/share/${PN}/backgrounds/gentoo1024x768.png:" \
- "${D}"/etc/${PN}/${PN}-gtk-greeter.conf || die
- fi
- fi
-
- dopamd "${FILESDIR}"/${PN}
-}
-
-pkg_postinst() {
- elog
- elog "Even though the default /etc/${PN}/${PN}.conf will work for"
- elog "most users, make sure you configure it to suit your needs"
- elog "before using ${PN} for the first time."
- elog "You can test the configuration file using the following"
- elog "command: ${PN} --test-mode -c /etc/${PN}/${PN}.conf. This"
- elog "requires xorg-server to be built with the 'kdrive' useflag."
- elog
-}
diff --git a/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild b/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild
deleted file mode 100644
index 46a46b55b5e5..000000000000
--- a/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lightdm/lightdm-1.0.6-r3.ebuild,v 1.2 2012/01/13 23:23:48 hwoarang Exp $
-
-EAPI=4
-inherit autotools eutils pam
-
-DESCRIPTION="A lightweight display manager"
-HOMEPAGE="http://www.freedesktop.org/wiki/Software/LightDM"
-SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz
- mirror://gentoo/introspection-20110205.m4.tar.bz2
- gtk? ( http://dev.gentoo.org/~hwoarang/distfiles/${PN}-gentoo-patch.tar.gz )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="branding +gtk +introspection qt4"
-
-RDEPEND="dev-libs/glib:2
- virtual/pam
- x11-libs/libxklavier
- x11-libs/libX11
- dev-libs/libxml2
- gtk? ( x11-libs/gtk+:3
- x11-themes/gnome-themes-standard
- x11-themes/gnome-icon-theme )
- introspection? ( dev-libs/gobject-introspection )
- qt4? ( x11-libs/qt-core:4
- x11-libs/qt-dbus:4 )
- sys-apps/accountsservice"
-DEPEND="${RDEPEND}
- dev-lang/vala:0.12
- dev-util/intltool
- dev-util/pkgconfig
- gnome-base/gnome-common
- sys-devel/gettext"
-
-REQUIRED_USE="branding? ( gtk ) || ( gtk qt4 )"
-DOCS=( NEWS )
-
-src_prepare() {
- sed -i -e "/minimum-uid/s:500:1000:" data/users.conf || die
- sed -i -e "s:gtk+-3.0:gtk+-2.0:" configure.ac || die
- epatch "${FILESDIR}"/session-wrapper-${PN}.patch
- epatch "${FILESDIR}"/${P}-pkglibexec.patch
- if has_version dev-libs/gobject-introspection; then
- eautoreconf
- else
- AT_M4DIR=${WORKDIR} eautoreconf
- fi
-}
-
-src_configure() {
- # Maybe in the future, we can support some automatic session and user
- # recognition. Until then, use default values
- local default=gnome greeter= user=root
-
- # gtk has higher priority because Qt4 interface sucks :)
- use qt4 && greeter=lightdm-qt-greeter
- use gtk && greeter=lightdm-gtk-greeter
-
- # Let user know how lightdm is configured
- einfo "Gentoo configuration"
- einfo "Default greeter: ${greeter}"
- einfo "Default session: ${default}"
- einfo "Greeter user: ${user}"
-
- # do the actual configuration
- econf --localstatedir=/var \
- --disable-static \
- $(use_enable introspection) \
- $(use_enable qt4 liblightdm-qt) \
- $(use_enable qt4 qt-greeter) \
- $(use_enable gtk gtk-greeter) \
- --with-user-session=${default} \
- --with-greeter-session=${greeter} \
- --with-greeter-user=${user} \
- --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
-
-src_install() {
- default
-
- # Install missing files
- insinto /etc/${PN}/
- doins "${S}"/data/{users,keys}.conf
- doins "${FILESDIR}"/Xsession
- fperms +x /etc/${PN}/Xsession
- # remove .la files
- find "${ED}" -name "*.la" -exec rm -rf {} +
- rm -Rf "${ED}"/etc/init || die
-
- if use gtk; then
- insinto /etc/${PN}/
- doins "${WORKDIR}"/${PN}-gtk-greeter.conf
- if use branding; then
- insinto /usr/share/${PN}/backgrounds/
- doins "${WORKDIR}"/gentoo1024x768.png
- sed -i -e "/background/s:=.*:=/usr/share/${PN}/backgrounds/gentoo1024x768.png:" \
- "${D}"/etc/${PN}/${PN}-gtk-greeter.conf || die
- fi
- fi
-
- dopamd "${FILESDIR}"/${PN}
- dopamd "${FILESDIR}"/${PN}-autologin
-}
-
-pkg_postinst() {
- elog
- elog "Even though the default /etc/${PN}/${PN}.conf will work for"
- elog "most users, make sure you configure it to suit your needs"
- elog "before using ${PN} for the first time."
- elog "You can test the configuration file using the following"
- elog "command: ${PN} --test-mode -c /etc/${PN}/${PN}.conf. This"
- elog "requires xorg-server to be built with the 'kdrive' useflag."
- elog
-}
diff --git a/x11-plugins/purple-plugin_pack/Manifest b/x11-plugins/purple-plugin_pack/Manifest
index 8b384f96df46..e3e8aa8dd158 100644
--- a/x11-plugins/purple-plugin_pack/Manifest
+++ b/x11-plugins/purple-plugin_pack/Manifest
@@ -1,3 +1,4 @@
+DIST purple-plugin-pack-2.7.0.tar.bz2 761618 RMD160 97db4d8fb487f753fdde4d62e8765d04e1ac7081 SHA1 862617e73360a9b447649c526cf54cc4dfe05a82 SHA256 2bbcf5e778a33968ba7f2864d2a6cb526a8984be3e4151642a583eee8eafb03c
DIST purple-plugin_pack-2.5.1.tar.bz2 634377 RMD160 5301a0fc0698d76ff849c7591670b7437ec22705 SHA1 d8dd41dd7d4a79ea25ac46b0a3de76f2375e06ff SHA256 83b83a6915337f72ec21dc661078350fd292dbbcd2132232a247b0bcd3dc57f9
DIST purple-plugin_pack-2.6.2.tar.bz2 688806 RMD160 53487d3be8754fe81a3ce8fe67c1afa84c21f9b1 SHA1 5216eb47cb764719ac1e9666ae8fda665ffaa4fd SHA256 62af96202aec6040835c8d419224e8f830d0bcfce20edebe32ba5cf348db23cf
DIST purple-plugin_pack-2.6.3.tar.bz2 689569 RMD160 17fc13111e71f253e0386c6f81b7bd00e0b958ad SHA1 59e47dcf310e78758b2bed765445504fcec275e3 SHA256 5c96f6795b8c77399de8efcc3e6d11810d963cd2e613b6fccca25180e16bf9ac
diff --git a/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.7.0.ebuild b/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.7.0.ebuild
new file mode 100644
index 000000000000..d45566e86865
--- /dev/null
+++ b/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.7.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/purple-plugin_pack/purple-plugin_pack-2.7.0.ebuild,v 1.1 2012/03/03 18:58:18 nelchael Exp $
+
+EAPI="2"
+
+inherit eutils python
+
+DESCRIPTION="A package with many different plugins for pidgin and libpurple"
+HOMEPAGE="https://www.guifications.org/projects/purple-plugin-pack"
+# The ID in URL changes with each release :(
+SRC_URI="https://www.guifications.org/attachments/download/201/purple-plugin-pack-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="debug gtk ncurses spell talkfilters"
+
+RDEPEND="net-im/pidgin[gtk?,ncurses?]
+ talkfilters? ( app-text/talkfilters )
+ spell? ( app-text/gtkspell:2 )"
+DEPEND="${RDEPEND}
+ =dev-lang/python-2*"
+
+S="${WORKDIR}/purple-plugin-pack-${PV}"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ sed -e '/CFLAGS=/{s| -g3||}' -i configure || die
+}
+
+list_plugins_dep() {
+ local dependency=${1}
+ grep -EH "depends.*$dependency" */plugins.cfg | sed 's:/.*::'
+}
+
+src_configure() {
+ local plugins=""
+
+ # list all plugins, then pull DISABLED_PLUGINS with the ones we don't need
+ plugins="$($(PYTHON) plugin_pack.py -d dist_dirs)"
+ einfo "List of all possible plugins:"
+ einfo "${plugins}"
+
+ eval DISABLED_PLUGINS="\$${PN//[^a-z]/_}_DISABLED_PLUGINS"
+ # disable known broken plugins
+ DISABLED_PLUGINS+=" schedule findip"
+ use gtk || DISABLED_PLUGINS+=" $(list_plugins_dep pidgin)"
+ use ncurses || DISABLED_PLUGINS+=" $(list_plugins_dep finch)"
+ use spell || DISABLED_PLUGINS+=" $(list_plugins_dep gtkspell)"
+ use talkfilters || DISABLED_PLUGINS+=" $(list_plugins_dep talkfiltersbin)"
+
+ for plug in ${DISABLED_PLUGINS}; do
+ plugins="${plugins//${plug}}"
+ done
+
+ plugins="$(echo ${plugins} | sed 's:[ \t]\+:,:g;s:,$::;s:^,::')"
+
+ econf \
+ --with-plugins="${plugins}" \
+ $(use_enable debug)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc AUTHORS ChangeLog NEWS README VERSION || die
+}
+
+pkg_preinst() {
+ elog "Note: if you want to disable some plugins in pack, define"
+ elog "${PN//[^a-z]/_}_DISABLED_PLUGINS with a list of plugins to"
+ elog "skip during install (for list see einfo in build output)."
+}
diff --git a/x11-wm/xmonad/xmonad-0.10.ebuild b/x11-wm/xmonad/xmonad-0.10.ebuild
index d9c602de72c4..ab5c755e8306 100644
--- a/x11-wm/xmonad/xmonad-0.10.ebuild
+++ b/x11-wm/xmonad/xmonad-0.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/xmonad-0.10.ebuild,v 1.1 2011/11/22 18:05:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xmonad/xmonad-0.10.ebuild,v 1.2 2012/03/04 05:04:16 gienah Exp $
# ebuild generated by hackport 0.2.13
@@ -15,7 +15,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
IUSE=""
RDEPEND="dev-haskell/mtl[profile?]