diff --git a/app-admin/eselect-pinentry/metadata.xml b/app-admin/eselect-pinentry/metadata.xml
index c2d865517c00..3fdb54c53b7a 100644
--- a/app-admin/eselect-pinentry/metadata.xml
+++ b/app-admin/eselect-pinentry/metadata.xml
@@ -1,8 +1,8 @@
-
- ssuominen@gentoo.org
- Samuli Suominen
-
+
+ swegener@gentoo.org
+ Primary Maintainer
+
diff --git a/app-admin/eselect/eselect-1.3.2.ebuild b/app-admin/eselect/eselect-1.3.2-r1.ebuild
similarity index 92%
rename from app-admin/eselect/eselect-1.3.2.ebuild
rename to app-admin/eselect/eselect-1.3.2-r1.ebuild
index 3bb334a94213..84f37080ca4c 100644
--- a/app-admin/eselect/eselect-1.3.2.ebuild
+++ b/app-admin/eselect/eselect-1.3.2-r1.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.2.ebuild,v 1.1 2012/09/13 17:11:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect/eselect-1.3.2-r1.ebuild,v 1.1 2012/09/14 21:22:34 ulm Exp $
EAPI=3
-inherit bash-completion-r1
+inherit eutils bash-completion-r1
DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
HOMEPAGE="http://www.gentoo.org/proj/en/eselect/"
@@ -33,6 +33,10 @@ RDEPEND="!app-admin/eselect-news
#PDEPEND="emacs? ( app-emacs/gentoo-syntax )
# vim-syntax? ( app-vim/eselect-syntax )"
+src_prepare() {
+ epatch "${FILESDIR}/${P}-eroot.patch"
+}
+
src_compile() {
emake || die
diff --git a/app-admin/eselect/files/eselect-1.3.2-eroot.patch b/app-admin/eselect/files/eselect-1.3.2-eroot.patch
new file mode 100644
index 000000000000..81e5bb65e8a8
--- /dev/null
+++ b/app-admin/eselect/files/eselect-1.3.2-eroot.patch
@@ -0,0 +1,11 @@
+--- a/bin/eselect.in
++++ b/bin/eselect.in
+@@ -43,7 +43,7 @@
+
+ # Support variables for Gentoo Prefix
+ EPREFIX="@EPREFIX@"
+-EROOT="${ROOT%/}${EPREFIX}"
++EROOT="${ROOT%${EPREFIX:+/}}${EPREFIX}"
+
+ # Remove all alias definitions. Unset functions and variables that are
+ # known to cause trouble.
diff --git a/app-arch/fastjar/fastjar-0.98.ebuild b/app-arch/fastjar/fastjar-0.98-r2.ebuild
similarity index 59%
rename from app-arch/fastjar/fastjar-0.98.ebuild
rename to app-arch/fastjar/fastjar-0.98-r2.ebuild
index 33379106bc56..b5d93a9a2136 100644
--- a/app-arch/fastjar/fastjar-0.98.ebuild
+++ b/app-arch/fastjar/fastjar-0.98-r2.ebuild
@@ -1,6 +1,10 @@
-# 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/app-arch/fastjar/fastjar-0.98.ebuild,v 1.5 2010/05/26 18:45:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/fastjar/fastjar-0.98-r2.ebuild,v 1.1 2012/09/14 08:14:41 sera Exp $
+
+EAPI=4
+
+inherit eutils
DESCRIPTION="A jar program written in C"
HOMEPAGE="https://savannah.nongnu.org/projects/fastjar"
@@ -8,15 +12,14 @@ SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
IUSE=""
# bug #188542
RDEPEND="!<=dev-java/kaffe-1.1.7-r5"
-DEPEND=""
-src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
- dodoc AUTHORS ChangeLog NEWS README TODO || die
+src_prepare() {
+ # bug #325557
+ epatch "${FILESDIR}/0.98-traversal.patch"
}
diff --git a/app-cdr/pburn/metadata.xml b/app-cdr/pburn/metadata.xml
index 8e754846eca2..3ca6ae763b34 100644
--- a/app-cdr/pburn/metadata.xml
+++ b/app-cdr/pburn/metadata.xml
@@ -1,9 +1,5 @@
- media-optical
-
- ssuominen@gentoo.org
- Samuli Suominen
-
+media-optical
diff --git a/app-emulation/virtualbox-modules/Manifest b/app-emulation/virtualbox-modules/Manifest
index ef7002c59c4a..c0bd43cb31f8 100644
--- a/app-emulation/virtualbox-modules/Manifest
+++ b/app-emulation/virtualbox-modules/Manifest
@@ -1,4 +1,4 @@
DIST vbox-kernel-module-src-4.1.12.tar.xz 459148 SHA256 70707451b9dab6128005410f515f0c2c5d8c295b319243d9e623ae68c5acff1f SHA512 a90a74ced4893b7e017a96c0bbd1c4023a5b7aef263baaca38006753c559359a473f291c947f738ea68357c4a83ec0cef2282900ca0c886b291a94376089bc7b WHIRLPOOL 0c42dbca42b86b604a59273dd1eeeb401942db1a5e2c990d9b2f5920fc7b353f53a997787ed08eae41d9a5e513e70d5c526a5ea4c11ecb65f25fb36500fe92bb
DIST vbox-kernel-module-src-4.1.18.tar.xz 459308 SHA256 e5fe22add223af149dba2061343573326f0aaf37d1b2959c24097005ff4037ef SHA512 f7676013a2a77d03d6c9b29e4444655f76c148819d204e792a29e14458a32d3c9b4474160502f830d7704b4733e44e46051adf279e8e8f04e863c3ff4bc24247 WHIRLPOOL 3751a03d8d556622dddf8bddef7e9f2ff12b9a518c93bfbd8493455c7de20447771e5559e51aae3af113c41fcc46cdf8c4555ff941484424fea5884c690eaad5
DIST vbox-kernel-module-src-4.1.22.tar.xz 459980 SHA256 8d37d4c4497fd1de9511af2eb1aea4959045b47ad623f04e76958dfabd0848e3 SHA512 3ac0e55b794468b7b4b204500334d86763c523a2dfac84d830153b3ca324883fdce996eeaa35fa0e36606b46c126c0ab77374d1d3d7df8b65cf1058335ece214 WHIRLPOOL 19b2bfa3be78a845af962c80a5dd1defc7bbba2d30f0641ff02d069d5d2e3fab53eb4ce42a450ff16d5ea40f2ec3b5b88af8f341a481a93c6fe2aad03eca09ce
-DIST vbox-kernel-module-src-4.2.0.tar.xz 459752 SHA256 d259fd8023f1418c7e025d3bc795b4edacddb913135ef02c36249d498788b241 SHA512 a784d76756abea86c35ac1146c290926ccc93434b1b6850efa1338bc95dade291521a080e0c43f7858ff589da62559ed60a882015ed8140941d5eb0c9b54416c WHIRLPOOL 60e5b83cf57d80472af91a07e8608ea36b18ffccccfdcffe8bcc4750932b8117f33a3d40fd2a8dbc2bade22f2fcfdbb9a896bce017dbd919cfa951b57e485fb8
+DIST vbox-kernel-module-src-4.2.0.tar.xz 493424 SHA256 f8fc3df8360acda833c881b5eeba90eb86551541573a1a0d410996de044f1b37 SHA512 02bf75adcb5f8413d560b17b96a711538fff9b7a3ff6fd833b2d2f597888b5c5ed255d08b511482ebfd5230b05d3a4f0a4ac7a10b9e870474228803dd45243cd WHIRLPOOL b7813f4ff79757dee2978dfb8c8c1727ea6fe75ef5760759d5bdb285cec6c7844b9af09b5aa6b11721f9c86d3c805ecb0df7f1ebd926c7395a6b55d151d41f9f
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-4.2.0.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-4.2.0-r1.ebuild
similarity index 94%
rename from app-emulation/virtualbox-modules/virtualbox-modules-4.2.0.ebuild
rename to app-emulation/virtualbox-modules/virtualbox-modules-4.2.0-r1.ebuild
index 17f9930dc382..d872bcb1f10f 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-4.2.0.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-4.2.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/app-emulation/virtualbox-modules/virtualbox-modules-4.2.0.ebuild,v 1.1 2012/09/13 19:37:11 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-modules/virtualbox-modules-4.2.0-r1.ebuild,v 1.1 2012/09/14 06:09:18 polynomial-c Exp $
# XXX: the tarball here is just the kernel modules split out of the binary
# package that comes from virtualbox-bin
diff --git a/app-emulation/virtualbox/virtualbox-4.1.22.ebuild b/app-emulation/virtualbox/virtualbox-4.1.22.ebuild
index bfe77b09f95c..37194432306b 100644
--- a/app-emulation/virtualbox/virtualbox-4.1.22.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.22.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/virtualbox/virtualbox-4.1.22.ebuild,v 1.1 2012/09/09 15:23:01 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.22.ebuild,v 1.2 2012/09/14 10:47:27 polynomial-c Exp $
EAPI=4
@@ -138,7 +138,7 @@ src_prepare() {
rm -rf kBuild/bin tools
# Disable things unused or split into separate ebuilds
- sed -e "s/MY_LIBDIR/$(get_libdir)/" \
+ sed -e "s@MY_LIBDIR@$(get_libdir)@" \
"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
# unset useless/problematic checks in configure
@@ -150,7 +150,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
# Respect LDFLAGS
- sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
+ sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
# We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
@@ -162,14 +162,14 @@ src_prepare() {
# Use PAM only when pam USE flag is enbaled (bug #376531)
if ! use pam ; then
elog "Disabling PAM removes the possibility to use the VRDP features."
- sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
- sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
+ sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+ sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
src/VBox/HostServices/Makefile.kmk || die
fi
# add correct java path
if use java ; then
- sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
+ sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-i "${S}"/Config.kmk || die
java-pkg-opt-2_src_prepare
fi
@@ -232,7 +232,7 @@ src_install() {
# Set the right libdir
sed -i \
- -e "s/MY_LIBDIR/$(get_libdir)/" \
+ -e "s@MY_LIBDIR@$(get_libdir)@" \
"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
# Symlink binaries to the shipped wrapper
diff --git a/app-emulation/virtualbox/virtualbox-4.2.0.ebuild b/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild
similarity index 96%
rename from app-emulation/virtualbox/virtualbox-4.2.0.ebuild
rename to app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild
index 281e8ea4e7d3..6184a75452cc 100644
--- a/app-emulation/virtualbox/virtualbox-4.2.0.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.2.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/app-emulation/virtualbox/virtualbox-4.2.0.ebuild,v 1.2 2012/09/14 04:16:41 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.2.0-r1.ebuild,v 1.2 2012/09/14 10:47:27 polynomial-c Exp $
EAPI=4
@@ -140,7 +140,7 @@ src_prepare() {
rm -rf kBuild/bin tools
# Disable things unused or split into separate ebuilds
- sed -e "s/MY_LIBDIR/$(get_libdir)/" \
+ sed -e "s@MY_LIBDIR@$(get_libdir)@" \
"${FILESDIR}"/${PN}-4-localconfig > LocalConfig.kmk || die
# unset useless/problematic checks in configure
@@ -152,7 +152,7 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-4.1.4-asneeded.patch"
# Respect LDFLAGS
- sed -e "s/_LDFLAGS\.${ARCH}*.*=/& ${LDFLAGS}/g" \
+ sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \
-i Config.kmk src/libs/xpcom18a4/Config.kmk || die
# We still want to use ${HOME}/.VirtualBox/Machines as machines dir.
@@ -164,14 +164,14 @@ src_prepare() {
# Use PAM only when pam USE flag is enbaled (bug #376531)
if ! use pam ; then
elog "Disabling PAM removes the possibility to use the VRDP features."
- sed -i 's/^.*VBOX_WITH_PAM/#VBOX_WITH_PAM/' Config.kmk || die
- sed -i 's;\(.*/auth/Makefile.kmk.*\);#\1;' \
+ sed -i 's@^.*VBOX_WITH_PAM@#VBOX_WITH_PAM@' Config.kmk || die
+ sed -i 's@\(.*/auth/Makefile.kmk.*\)@#\1@' \
src/VBox/HostServices/Makefile.kmk || die
fi
# add correct java path
if use java ; then
- sed "s:/usr/lib/jvm/java-6-sun:$(java-config -O):" \
+ sed "s@/usr/lib/jvm/java-6-sun@$(java-config -O)@" \
-i "${S}"/Config.kmk || die
java-pkg-opt-2_src_prepare
fi
@@ -234,7 +234,7 @@ src_install() {
# Set the right libdir
sed -i \
- -e "s/MY_LIBDIR/$(get_libdir)/" \
+ -e "s@MY_LIBDIR@$(get_libdir)@" \
"${D}"/etc/vbox/vbox.cfg || die "vbox.cfg sed failed"
# Symlink binaries to the shipped wrapper
@@ -274,6 +274,9 @@ src_install() {
fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetAdpCtl
fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP
+ # VBoxSVC needs to be pax-marked (bug #403453)
+ pax-mark -m "${D}"/usr/$(get_libdir)/${PN}/VBoxSVC || die
+
if ! use headless ; then
for each in VBox{SDL,Headless} ; do
doins $each || die
diff --git a/app-emulation/wine/Manifest b/app-emulation/wine/Manifest
index 2f59bb9d3291..14b5e001b7df 100644
--- a/app-emulation/wine/Manifest
+++ b/app-emulation/wine/Manifest
@@ -7,6 +7,7 @@ DIST wine-1.5.1.tar.bz2 20078739 SHA256 6dc578f9afb3c9a0f2b773bbe09af20578ac6fa5
DIST wine-1.5.10.tar.bz2 20510011 SHA256 f35e7a52faab23647fd15ab9b54ea7a390fc96159d4e9a17e22b118c186f9e13 SHA512 b740dafe11ad64e66f6527cb6c5fdfa33071df762ce69ad79c978486e69560ac54961d751ca92531cc667791468fd136f266fc225d04c28615ceb80850b2efaf WHIRLPOOL a9973a83ea00efeef74e1f50af46980ccf68f56bc3d079a7995422c6fb93e48db2c631ac757529f911e62c0e17f36122a44be857d13650a1b8b68dc531c39ef4
DIST wine-1.5.11.tar.bz2 20651401 SHA256 2854c853546ded26e9c15ba43c29ceace72b7815f25dfd048dd69dc321521488 SHA512 67d1ed430484f89e1d0d52e1452f965f0f558f09803f0ea001a46de73a573acd489898f0475a423c78d148a56fbfcf499169e12422213ba666f06178a4e08e21 WHIRLPOOL 0550476b3fba7558130a82a52d7cabcf85a2b9776703027ca3a811a15b0e12e31a7a2b4a4da0b06ac718ae23680009f684eda24d277097fb5012c1e5614a9409
DIST wine-1.5.12.tar.bz2 20652437 SHA256 ba987a0e3b1d5c0ba2d42fecdcff1c4e910d7c9949d9baca796b8b5c1318662c SHA512 c16ca8a6343a40f5a287fa123c9d03d6bc60b1e9bd9642cfa94fc473e2acd8bed56d442a149ac590b00292494795aa3b23e3c021990c3ca444641a4899d9a947 WHIRLPOOL 834b79863c158113a3cc71507371110c269aea8edb00bcb9cacadcf5d69a6389bf1836a19d3c9ad6e9b1593aaf02c8f1f90d9cea3149b42a3089983addfcd233
+DIST wine-1.5.13.tar.bz2 20669180 SHA256 c05dd12ecc5256219d09cc1daad6f2153368d69ef15c68400a2a404b79b079d1 SHA512 51aede2c4600193bedb6a392ede1ddce1ec9f92d32f7aba03f3d4e46361c8377969a75a6fac4a0179da8fa0905fe8e719bdde9b23187692b6ab6b0c28b444890 WHIRLPOOL 215ba06603ce8a2d6c03931cd9f5a66da092349a09cf1eaf8e7fd8fbf596eb8d7147f8c54b6eae333b9446dd0a314507d7b2e2c1dc6521d5ff7064db77f148fa
DIST wine-1.5.2.tar.bz2 20104652 SHA256 8ee6fdaf716b5a1c7ccf9be9dc6d9b7546944e79351c4806b2fa596da418342f SHA512 da949f1943a1af1f4f9d75d41d35b5a968b4bb792f25c5d3202de5be944a04deac7116261d70b5b90f233e9fb526ae8d073e2cdd03304ac0f736926108fec7d7 WHIRLPOOL 947bff2ccda47e548e6eec4a1b7cc738b943fbbdf000e5686aa440c9d45962b5dee47e7060e93895cc398c2c82d7dce06c370091859bd46a6d09864c191d357c
DIST wine-1.5.3.tar.bz2 20171697 SHA256 d3e8e484cbc2c4888bc880d0b0c8b52299d36a5cecc96d9367b59142345a1206 SHA512 947c20100d02ec6d393f9bdc1899ddeda21be7fa75869f91953e0eec30f2083b2a7fd31ad92c44765b417e3023914db9cc9945fd241207d8189f20ae92da100a WHIRLPOOL a2e2752731feae4d2a44dd0db1edabadd8c7530abd6e988e5c8f862ba70e234874e1a21ad8a25f4dc68e965d4b5122431278b3ed7674145f7fa935e0c78dcca5
DIST wine-1.5.4.tar.bz2 20187597 SHA256 90b10450b1afb4d54dfd20529e040daa4ee901c52b2f3bc452a86c2e06b4b759 SHA512 cb58358a2af9e15d7ebff21f9f834d521736eeaa44ce0c36d88400f3d3667c5432711bea64322e77c166e024d2ea03d47f64a4fd648d0a802bc44da80e1eb2fe WHIRLPOOL e007bc572181745c585bf24c6aa6a87830df17b57384d180e932b229f89b55d38f2b673243e8b5a5243afb303a18c52092bfbe61f0b49473c7c85edb0056a068
diff --git a/app-emulation/wine/wine-1.5.13.ebuild b/app-emulation/wine/wine-1.5.13.ebuild
new file mode 100644
index 000000000000..97b8f0716d9f
--- /dev/null
+++ b/app-emulation/wine/wine-1.5.13.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.5.13.ebuild,v 1.1 2012/09/14 20:24:37 tetromino Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic multilib pax-utils
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
+ inherit git-2
+ SRC_URI=""
+ #KEYWORDS=""
+else
+ MY_P="${PN}-${PV/_/-}"
+ SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
+ KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
+ S=${WORKDIR}/${MY_P}
+fi
+
+GV="1.7"
+MV="0.0.4"
+PULSE_PATCH="winepulse-2012.06.15.patch"
+DESCRIPTION="free implementation of Windows(tm) on Unix"
+HOMEPAGE="http://www.winehq.org/"
+SRC_URI="${SRC_URI}
+ gecko? (
+ mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi
+ win64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
+ )
+ mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
+ http://source.winehq.org/patches/data/87234 -> ${PULSE_PATCH}"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="alsa capi cups custom-cflags elibc_glibc fontconfig +gecko gnutls gphoto2 gsm gstreamer hardened jpeg lcms ldap +mono mp3 ncurses nls odbc openal opencl +opengl osmesa +oss +perl png pulseaudio samba scanner selinux ssl test +threads +truetype udisks v4l +win32 +win64 +X xcomposite xinerama xml"
+REQUIRED_USE="elibc_glibc? ( threads )
+ mono? ( || ( win32 !win64 ) )
+ osmesa? ( opengl )" #286560
+RESTRICT="test" #72375
+
+MLIB_DEPS="amd64? (
+ truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 )
+ X? (
+ >=app-emulation/emul-linux-x86-xlibs-2.1
+ >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio(+)?]
+ )
+ mp3? ( app-emulation/emul-linux-x86-soundlibs )
+ odbc? ( app-emulation/emul-linux-x86-db )
+ openal? ( app-emulation/emul-linux-x86-sdl )
+ opengl? ( app-emulation/emul-linux-x86-opengl )
+ scanner? ( app-emulation/emul-linux-x86-medialibs )
+ v4l? ( app-emulation/emul-linux-x86-medialibs )
+ app-emulation/emul-linux-x86-baselibs
+ >=sys-kernel/linux-headers-2.6
+ )"
+RDEPEND="truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts )
+ perl? ( dev-lang/perl dev-perl/XML-Simple )
+ capi? ( net-dialup/capi4k-utils )
+ ncurses? ( >=sys-libs/ncurses-5.2 )
+ fontconfig? ( media-libs/fontconfig )
+ gphoto2? ( media-libs/libgphoto2 )
+ openal? ( media-libs/openal )
+ udisks? (
+ sys-apps/dbus
+ sys-fs/udisks:2
+ )
+ gnutls? ( net-libs/gnutls )
+ gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
+ X? (
+ x11-libs/libXcursor
+ x11-libs/libXrandr
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXxf86vm
+ )
+ xinerama? ( x11-libs/libXinerama )
+ alsa? ( media-libs/alsa-lib )
+ cups? ( net-print/cups )
+ opencl? ( virtual/opencl )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ gsm? ( media-sound/gsm )
+ jpeg? ( virtual/jpeg )
+ ldap? ( net-nds/openldap )
+ lcms? ( =media-libs/lcms-1* )
+ mp3? ( >=media-sound/mpg123-1.5.0 )
+ nls? ( sys-devel/gettext )
+ odbc? ( dev-db/unixODBC )
+ osmesa? ( media-libs/mesa[osmesa] )
+ pulseaudio? ( media-sound/pulseaudio )
+ samba? ( >=net-fs/samba-3.0.25 )
+ selinux? ( sec-policy/selinux-wine )
+ xml? ( dev-libs/libxml2 dev-libs/libxslt )
+ scanner? ( media-gfx/sane-backends )
+ ssl? ( dev-libs/openssl )
+ png? ( media-libs/libpng )
+ v4l? ( media-libs/libv4l )
+ !win64? ( ${MLIB_DEPS} )
+ win32? ( ${MLIB_DEPS} )
+ xcomposite? ( x11-libs/libXcomposite )"
+DEPEND="${RDEPEND}
+ X? (
+ x11-proto/inputproto
+ x11-proto/xextproto
+ x11-proto/xf86vidmodeproto
+ )
+ xinerama? ( x11-proto/xineramaproto )
+ !hardened? ( sys-devel/prelink )
+ virtual/pkgconfig
+ virtual/yacc
+ sys-devel/flex"
+
+src_unpack() {
+ if use win64 ; then
+ [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]] \
+ && die "you need gcc-4.4+ to build 64bit wine"
+ fi
+
+ if use win32 && use opencl; then
+ [[ x$(eselect opencl show) = "xintel" ]] &&
+ die "Cannot build wine[opencl,win32]: intel-ocl-sdk is 64-bit only" # 403947
+ fi
+
+ if [[ ${PV} == "9999" ]] ; then
+ git-2_src_unpack
+ else
+ unpack ${MY_P}.tar.bz2
+ fi
+}
+
+src_prepare() {
+ local md5="$(md5sum server/protocol.def)"
+ epatch "${FILESDIR}"/${PN}-1.1.15-winegcc.patch #260726
+ epatch "${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
+ epatch "${FILESDIR}"/${PN}-1.5.11-osmesa-check.patch #429386
+ epatch "${DISTDIR}/${PULSE_PATCH}" #421365
+ epatch_user #282735
+ if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
+ einfo "server/protocol.def was patched; running tools/make_requests"
+ tools/make_requests || die #432348
+ fi
+ eautoreconf
+ sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
+ sed -i '/^MimeType/d' tools/wine.desktop || die #117785
+}
+
+do_configure() {
+ local builddir="${WORKDIR}/wine$1"
+ mkdir -p "${builddir}"
+ pushd "${builddir}" >/dev/null
+
+ with_osmesa=$(use_with osmesa)
+ if use osmesa && use amd64 && [[ $1 = 32 ]]; then #430268
+ elog "win32 osmesa support is disabled for now, see bug #430268"
+ with_osmesa=--without-osmesa
+ fi
+
+ ECONF_SOURCE=${S} \
+ econf \
+ --sysconfdir=/etc/wine \
+ $(use_with alsa) \
+ $(use_with capi) \
+ $(use_with lcms cms) \
+ $(use_with cups) \
+ $(use_with ncurses curses) \
+ $(use_with udisks dbus) \
+ $(use_with fontconfig) \
+ $(use_with gnutls) \
+ $(use_with gphoto2 gphoto) \
+ $(use_with gsm) \
+ $(use_with gstreamer) \
+ --without-hal \
+ $(use_with jpeg) \
+ $(use_with ldap) \
+ $(use_with mp3 mpg123) \
+ $(use_with nls gettext) \
+ $(use_with openal) \
+ $(use_with opencl) \
+ $(use_with opengl) \
+ $(use_with ssl openssl) \
+ ${with_osmesa} \
+ $(use_with oss) \
+ $(use_with png) \
+ $(use_with threads pthread) \
+ $(use_with pulseaudio pulse) \
+ $(use_with scanner sane) \
+ $(use_enable test tests) \
+ $(use_with truetype freetype) \
+ $(use_with v4l) \
+ $(use_with X x) \
+ $(use_with xcomposite) \
+ $(use_with xinerama) \
+ $(use_with xml) \
+ $(use_with xml xslt) \
+ $2
+
+ emake -j1 depend
+
+ popd >/dev/null
+}
+
+src_configure() {
+ export LDCONFIG=/bin/true
+ use custom-cflags || strip-flags
+
+ if use win64 ; then
+ do_configure 64 --enable-win64
+ use win32 && ABI=x86 do_configure 32 --with-wine64=../wine64
+ else
+ ABI=x86 do_configure 32 --disable-win64
+ fi
+}
+
+src_compile() {
+ local b
+ for b in 64 32 ; do
+ local builddir="${WORKDIR}/wine${b}"
+ [[ -d ${builddir} ]] || continue
+ emake -C "${builddir}" all
+ done
+}
+
+src_install() {
+ local b
+ for b in 64 32 ; do
+ local builddir="${WORKDIR}/wine${b}"
+ [[ -d ${builddir} ]] || continue
+ emake -C "${builddir}" install DESTDIR="${D}"
+ done
+ dodoc ANNOUNCE AUTHORS README
+ if use gecko ; then
+ insinto /usr/share/wine/gecko
+ doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
+ use win64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
+ fi
+ if use mono ; then
+ insinto /usr/share/wine/mono
+ doins "${DISTDIR}"/wine-mono-${MV}.msi
+ fi
+ if ! use perl ; then
+ rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
+ fi
+
+ if use win32 || ! use win64; then
+ pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
+ fi
+ use win64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
+
+ if use win64 && ! use win32; then
+ dosym /usr/bin/wine{64,} # 404331
+ dosym /usr/bin/wine{64,}-preloader
+ fi
+}
diff --git a/app-emulation/winetricks/Manifest b/app-emulation/winetricks/Manifest
index 7c2b9e49e02e..2d557752abf5 100644
--- a/app-emulation/winetricks/Manifest
+++ b/app-emulation/winetricks/Manifest
@@ -1,4 +1,4 @@
-DIST winetricks-886 615880 SHA256 b20f86a66e7ebe09e4351c18e3cde220319fed98408d0702acc62cc152ef5249 SHA512 9fded1a1f18ae27abcc01fc807763b1a1303c685d103902556d5513f695e6def6498e828cba3c09e0c5040823d64f2abe5af8a2643c7a173e2865c0e12e3ba6c WHIRLPOOL e7b6b73058187142d87c3ccab085e28d4632ab19245a7e15bbda8b1c0db65a1348e8cb134b87e113d101e718c0faefb611d97eb5363d79654a797f404cd7349f
-DIST winetricks-886.1 3469 SHA256 f522f4c991194cbed1044182ca6fbbb7645cd4b98d9557ab7d073ace1af4738d SHA512 2c832a9cc4286f641aeed7a5a47131773b48dd0cf123798f753ffb24799dabca29986b2b740698fbe9efb8034ac874a18147c6bd645bea8e69fdb42f1437fdf2 WHIRLPOOL 0ccb982022189b4d2e134756cadbca3628c33e57be6879b07e84f99182ed5a201379413a32af5d689744b4d7527f6abf56aae7113f34401c4cbe62b902462424
DIST winetricks-909 613770 SHA256 037151c3681d7fff55a5069f607804741c6e97da625d37ffba03e003c35af4d7 SHA512 9eab8cd07fc301cbee0f50418b1aedd698b0733efd667de4f88811651aba5b54afd02e8e65dabaf00f6f9eedd0f4e1150c8828554e889920b9f99c95fd1d33ed WHIRLPOOL 9d45a143850b4e422d1ecc317a068b2a3f272af4ae860daa2f8c0b5b4a7c53f4562c18ac274b17185604802ff6a4b65132f6c326e5140273d4c0b800336f9b83
DIST winetricks-909.1 3469 SHA256 f522f4c991194cbed1044182ca6fbbb7645cd4b98d9557ab7d073ace1af4738d SHA512 2c832a9cc4286f641aeed7a5a47131773b48dd0cf123798f753ffb24799dabca29986b2b740698fbe9efb8034ac874a18147c6bd645bea8e69fdb42f1437fdf2 WHIRLPOOL 0ccb982022189b4d2e134756cadbca3628c33e57be6879b07e84f99182ed5a201379413a32af5d689744b4d7527f6abf56aae7113f34401c4cbe62b902462424
+DIST winetricks-913 613886 SHA256 b7b9a53ca507cec75efbd263c5dad1aaa80f8751469a62d9e68ed44e58050d3c SHA512 a97cd8e79b1491170336964e73aed079d2a8f6ea7238eace1ca270c0dd531727f1f887fe1207f68f753d30b0a9ae727f26f918d327f851f0fa221e545cb952e8 WHIRLPOOL cd5c47f11040da2ee7d1e255a6162b60c45fef6fc4dd42ba434f3833a1b3f5e29158635f19e664e3c71925cfdcbd38ff818826ff5f74a1e17d7aed2579ebceba
+DIST winetricks-913.1 3469 SHA256 f522f4c991194cbed1044182ca6fbbb7645cd4b98d9557ab7d073ace1af4738d SHA512 2c832a9cc4286f641aeed7a5a47131773b48dd0cf123798f753ffb24799dabca29986b2b740698fbe9efb8034ac874a18147c6bd645bea8e69fdb42f1437fdf2 WHIRLPOOL 0ccb982022189b4d2e134756cadbca3628c33e57be6879b07e84f99182ed5a201379413a32af5d689744b4d7527f6abf56aae7113f34401c4cbe62b902462424
diff --git a/app-emulation/winetricks/winetricks-886.ebuild b/app-emulation/winetricks/winetricks-913.ebuild
similarity index 94%
rename from app-emulation/winetricks/winetricks-886.ebuild
rename to app-emulation/winetricks/winetricks-913.ebuild
index 41a5cd6d4483..00410a317dc8 100644
--- a/app-emulation/winetricks/winetricks-886.ebuild
+++ b/app-emulation/winetricks/winetricks-913.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/winetricks/winetricks-886.ebuild,v 1.1 2012/08/17 23:17:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-913.ebuild,v 1.1 2012/09/14 20:24:24 tetromino Exp $
EAPI=4
diff --git a/app-misc/dateutils/Manifest b/app-misc/dateutils/Manifest
index 9e79d149d466..9c5bea76a7a9 100644
--- a/app-misc/dateutils/Manifest
+++ b/app-misc/dateutils/Manifest
@@ -1,2 +1,2 @@
-DIST dateutils-0.2.1.tar.xz 281196 SHA256 72f9aa98e502d6bf38f0cd11ab2b7517476c5d210668a700de73ae8f0b363ee2 SHA512 91cef4eef9f8280f20a61618dfd492e91dd0bc244a07df602e0b5db485c5a3f180dbe95f7e51b3bfc9b06bbc8a7913922927666fd43d265013526954fa6e85c0 WHIRLPOOL 3b30dc37b684bbee23cf2dd03194432330aa29bdc13556dd596ccfa366fa93388e311db58d740fc2eb2d10a6959487fdffb2a96dbe7f281d80aff1ed159e980d
DIST dateutils-0.2.2.tar.xz 296024 SHA256 9ad956c7345da2c0aef76b2b9a8b513418407b5cc780237e8caf8bf7601a47d2 SHA512 507aaf67f15824efdf76fe9cd6259badd9f341b92b0631a5434dc7dc8400407894089de8160a956354b99965b1424e1cfcb98ebf5bc8f4b768d5c99942981bcd WHIRLPOOL 4e0e84a72a892adf9707ff90d26a3be375c827beeafa1abd99c325e7b25425e1b04c175bd7c2416252cbbbb614fefe319b95038ac3eead40a51ceba451f693fd
+DIST dateutils-0.2.3.tar.xz 317220 SHA256 5404956c86e28a15efc211eaab2759699314915d1c2ac2226a380ab2d6c194d7 SHA512 6793b2ff8519b862b737585f497a000626d13ed9e6f9fcc35a0d86fce35ca30f41d22b1673df5f4b92dab44a2e7d4a1dd23fc4be89b426e2761c27bb7897b497 WHIRLPOOL 183084cba5524ac1f03c9dd41e08883abbe18de6327fb41671c376358053577558474f2b31f78259885e1ac128a6be30cde17a871a3b96aae0590c7bcf01a3a4
diff --git a/app-misc/dateutils/dateutils-0.2.1.ebuild b/app-misc/dateutils/dateutils-0.2.3.ebuild
similarity index 80%
rename from app-misc/dateutils/dateutils-0.2.1.ebuild
rename to app-misc/dateutils/dateutils-0.2.3.ebuild
index cc2bd02748ca..17872a16abb3 100644
--- a/app-misc/dateutils/dateutils-0.2.1.ebuild
+++ b/app-misc/dateutils/dateutils-0.2.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-misc/dateutils/dateutils-0.2.1.ebuild,v 1.1 2012/06/19 01:44:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/dateutils/dateutils-0.2.3.ebuild,v 1.1 2012/09/15 03:44:09 radhermit Exp $
EAPI="4"
@@ -13,7 +13,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="app-arch/xz-utils"
+DEPEND="app-arch/xz-utils
+ sys-libs/timezone-data"
src_compile() {
emake CFLAGS="${CFLAGS}"
diff --git a/app-misc/lirc/lirc-0.9.0-r2.ebuild b/app-misc/lirc/lirc-0.9.0-r2.ebuild
index a74c091a2d33..6ad4c1210947 100644
--- a/app-misc/lirc/lirc-0.9.0-r2.ebuild
+++ b/app-misc/lirc/lirc-0.9.0-r2.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r2.ebuild,v 1.1 2012/07/19 19:52:18 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r2.ebuild,v 1.2 2012/09/14 17:35:15 axs Exp $
EAPI=4
-inherit eutils linux-mod linux-info flag-o-matic autotools
+inherit eutils linux-mod linux-info toolchain-funcs flag-o-matic autotools
DESCRIPTION="decode and send infra-red signals of many commonly used remote controls"
HOMEPAGE="http://www.lirc.org/"
@@ -20,7 +20,7 @@ fi
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug doc X hardware-carrier transmitter"
+IUSE="debug doc hardware-carrier transmitter static-libs X"
S="${WORKDIR}/${MY_P}"
@@ -279,7 +279,7 @@ pkg_setup() {
filter-flags -Wl,-O1
- # force non-parallel make, Bug 196134
+ # force non-parallel make, Bug 196134 (confirmed valid for 0.9.0-r2)
MAKEOPTS="${MAKEOPTS} -j1"
}
@@ -332,6 +332,7 @@ src_configure() {
--with-kerneldir="${KV_DIR}" \
--with-moduledir="/lib/modules/${KV_FULL}/misc" \
$(use_enable debug) \
+ $(use_enable static-libs static) \
$(use_with X x) \
${MY_OPTS} \
ABI="${KERNEL_ABI}" \
@@ -373,6 +374,8 @@ src_install() {
if [[ -e "${D}"/etc/lirc/lircd.conf ]]; then
newdoc "${D}"/etc/lirc/lircd.conf lircd.conf.example
fi
+
+ use static-libs || rm "${D}/usr/$(get_libdir)/liblirc_client.la"
}
pkg_preinst() {
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index e2fad249e769..8cdb370e7d81 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -1,2 +1,3 @@
DIST trash-cli-0.12.4.tar.gz 66344 SHA256 935bd7f63b45ed1c353711286279bea8b33f52b3358de1f16bf4019fe6665875 SHA512 963a578784bd817b0d19ded9675fabd4419e22b314927ca427e53bd2edda97ec69fee56783931734bc21f5ac3a5ba0587686a207de0abb5fbf9ef97fa43e075d WHIRLPOOL 501b1b273e4a39dd67ed6eb3453d7613dac3488500705115ff61df30656b770dea12871df19ae0e7a566ccd2b31e82ff451ecd724f964797b75b1c0422727015
DIST trash-cli-0.12.7.tar.gz 58423 SHA256 4d5a5dd50c142ca84f8588f0ddcd7038aa985f7420d27e1c89737733bbe5bc67 SHA512 04364a06b2fe4b1697c1ea8c77be7789df46928c550c715541c7c0c13c88a10646f8d363051dfa96c6d4cc8c62109cf712b077686cc8147c929ad460a75fccc4 WHIRLPOOL ca1fe123cc530c33bb7c0abdea9d3cd716502896aeca68d42d43c1e4e01988f802ad3e9e84d47286bb089e2c109c8ba59edc45e4dcfd0e13d6e48b5c5961cc3f
+DIST trash-cli-0.12.9.14.tar.gz 62090 SHA256 e0371b28324188d4936cbeea7c74f85a28306588c1ad15b5d3af33372bd5eb11 SHA512 3846ec4e2e491b09ad93134313a875fb3e072abe3e895956b62a3e4f350c1f10dd1ded3fea0caec3fa8a6bd39f2d0a63ac6a3a070a6204fd2f27f1e447f5ba6c WHIRLPOOL ee9bb75ca3b3b9f141777a581862b57dd12db38490761dc2cd429ec60eca972292b207063615d8a2c233dd613772fb65a7c6faaadd925410ce9f964b10a8e445
diff --git a/app-misc/trash-cli/trash-cli-0.12.9.14.ebuild b/app-misc/trash-cli/trash-cli-0.12.9.14.ebuild
new file mode 100644
index 000000000000..1af1c399001a
--- /dev/null
+++ b/app-misc/trash-cli/trash-cli-0.12.9.14.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/app-misc/trash-cli/trash-cli-0.12.9.14.ebuild,v 1.1 2012/09/14 21:36:11 hasufell Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5 3.*"
+
+inherit distutils vcs-snapshot
+
+DESCRIPTION="Python scripts to manipulate trash cans via the command line"
+HOMEPAGE="https://github.com/andreafrancia/trash-cli"
+SRC_URI="http://github.com/andreafrancia/${PN}/tarball/${PV} ->
+ ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools"
diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
index d1fb26f0a7fc..06544847fbef 100644
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ b/app-portage/emerge-delta-webrsync/Manifest
@@ -1,2 +1,2 @@
DIST emerge-delta-webrsync-3.5.1 13289 SHA256 663ce5e800dec988ba5e1bb283ca243205d1ebdc27e3d0c269e5c0bb198f7d4a SHA512 a19a39d21b2065d0d31f54cf983066a80b7ce24cbcceb51f9bfeeb83c4e31027048082f10f900144b67392bacc365de17e6c0a599fe1d6aff6ffde3970a1c72c WHIRLPOOL 05343ffa87aad99d59b6894d770c26f0afcca5313a67ccf667a82623a2f73edfe1f439a8c2cc043f625dfc5dabe30eaf3298a51cc28832e4f41ed0856d8ebd4d
-DIST emerge-delta-webrsync-3.6 16695 SHA256 2d6ad6920c90c133a0099e555fd61df8f74c1dd2715005da40c84f4eedaf69e9 SHA512 46c89c030410b9eee90d7d9a9c55bc67b69f46f6d4c3bd2eb4732d79bab324cf78aeae80a4d300f067c6f0dd8acb1f2b8c955650990147a92cbb5071f9e18748 WHIRLPOOL c4c940ccb4528deebaa6d023ad786fe78044ba189cdf409cf51ee1e2d6380ae3da979694281922cc67fdac0998be1e245d81437cdbb97722d304181b0c4fcefa
+DIST emerge-delta-webrsync-3.6.1 16817 SHA256 e57863cf59cca37765d6aa92e09374fb57450cdcb0240d2245e346b1aee405cb SHA512 e3917b2ee69fe15a052dbceb0e3b3cb2a969d866378f0ac63a3a4be5b1777f2ba8a9043236524b822bfed9891f9a6c1fce26dccbe2540aa89ca914795cbbe048 WHIRLPOOL a30a5516123bae521075bda2676bbf18c042f27559df94c47bd687f1cd2c181ef21231f65bc6feb7d28c1fa662261c0eb43bca34be70922351726c81a7b2e496
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.1.ebuild
similarity index 85%
rename from app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.ebuild
rename to app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.1.ebuild
index 7b5097e78c41..968562430def 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.ebuild,v 1.1 2012/08/19 06:15:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.6.1.ebuild,v 1.1 2012/09/14 07:54:53 zmedico Exp $
EAPI=4
DESCRIPTION="emerge-webrsync using patches to minimize bandwidth"
HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-SRC_URI="http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=blob_plain;f=misc/emerge-delta-webrsync;hb=604eb9bd43ec035c4e26197ab21cba33b4faa8f9 -> ${P}"
+SRC_URI="http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=blob_plain;f=misc/emerge-delta-webrsync;hb=bb9186cd81d707593ea386d17321bd594d847126 -> ${P}"
LICENSE="GPL-2"
SLOT="0"
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 12f755829b67..aaae009c57a5 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,3 +1,4 @@
+DIST asciidoc-8.2.6.tar.gz 739790 SHA256 5e9c966cfcb9d08487da625b41ed5e007eedb2d1abbb996dd6f78f2c5bde08dc SHA512 5b7cf5ec91af2fdc092f6121b30a748428bdfc6c69b4f2dfbca80b61fe136596a7cfd42e52dcb73dbbf62f632be39aed83dcde725e7410964469a8a9e09369dd WHIRLPOOL 172cf894d0962d68d64f28dea5e50e729b91023fca090bc0deb6592eba1628791dbf826ad725a328df902f21155724368d255b34ccc6d93cac8332820412edaa
DIST asciidoc-8.6.5.tar.gz 867402 SHA256 f9da38afaf04186145739c10551341a448b3bf50a37a10392fbe584e9fb2a85f SHA512 bece29540d36a9e071a0746b08ef21a0ecf68a40ae3d593d98dd33d0ab5fcfa85b7895b545b9e5a8e33f78c7ecb142758697decf45e9c2ce26b068ca77c1f2e6 WHIRLPOOL 0c6a85fe848205cbe1b13a8717718b2c6fd6613ded252da13ead4145fdaed5ab763fb5c3c80997e69f39897c3cdd48309e9ef832f36027af75af3381255f22e8
DIST asciidoc-8.6.7.tar.gz 889107 SHA256 48d3cc0367d05a8118058ee6cfb8b66592cd6dc58053186f8a6c54bb5229798f SHA512 16243bab9a9eb2f3e696e6d8e4ad64f5a3e6313f95a7d1c47f9ca080366b23b45bbc5bf63ff75ae58085bbed035e4ccd94b9304e67d1c2b0ebfa4f7ba72bc261 WHIRLPOOL d277ca53cb8499f9faeb1db6a06b2c33e15dfb0490497fb39cb34e615ed888d410fc7f0e556ee3d9758efd5ee77964969993f203acc2af5196ff03df4ff2fe15
DIST asciidoc-8.6.8.tar.gz 900422 SHA256 ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4 SHA512 74c5444124f138862a92a1884b8afe8f968c9a2bbe5a8bbaa9413b0fa4f29fb1ab2eab3c59a68e6c6ddd518866f504e34f43c81406a77c1b2033fbff79df7373 WHIRLPOOL 64a8e20b9718368da7a409cd93ad1906975a09594490982d915146ab721c9b969d714a86318c65e6a328716fbe151d3d2effb012e86a3207fd7717fdbd88ee2c
diff --git a/app-text/asciidoc/asciidoc-8.2.6.ebuild b/app-text/asciidoc/asciidoc-8.2.6.ebuild
new file mode 100644
index 000000000000..a83de675febc
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.2.6.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/app-text/asciidoc/asciidoc-8.2.6.ebuild,v 1.11 2012/09/15 04:31:54 floppym Exp $
+
+DESCRIPTION="A text document format for writing short documents, articles, books and UNIX man pages"
+HOMEPAGE="http://www.methods.co.nz/asciidoc/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="examples vim-syntax"
+
+DEPEND=">=dev-lang/python-2.3
+ dev-libs/libxslt"
+
+src_unpack() {
+ unpack ${A}
+
+ sed -i \
+ -e "s:^BINDIR=.*:BINDIR=${D}usr/bin:" \
+ -e "s:^MANDIR=.*:MANDIR=${D}usr/share/man:" \
+ -e "s:^CONFDIR=.*:CONFDIR=${D}etc/asciidoc:" \
+ -e "s:^VIM_CONFDIR=.*:VIM_CONFDIR=${D}usr/share/vim/vimfiles:" \
+ "${S}/install.sh"
+}
+
+src_install() {
+ dodir /usr/bin
+
+ use vim-syntax && dodir /usr/share/vim/vimfiles
+
+ "${S}"/install.sh
+
+ if use examples; then
+ # This is a symlink to a directory
+ rm -f examples/website/images
+ cp -Rf images examples/website
+
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+
+ # HTML pages (with their sources)
+ dohtml -r doc/*
+ insinto /usr/share/doc/${PF}/html
+ doins doc/*.txt
+
+ # Misc. documentation
+ dodoc BUGS CHANGELOG COPYRIGHT README
+ dodoc docbook-xsl/asciidoc-docbook-xsl.txt
+}
+
+pkg_preinst() {
+ # Clean any symlinks in /etc possibly installed by previous versions
+ if [ -d "${ROOT}etc/asciidoc" ]; then
+ einfo "Cleaning old symlinks under /etc/asciidoc"
+ for entry in $(find "${ROOT}etc/asciidoc" -type l); do
+ rm -f $entry
+ done
+ fi
+}
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 43126ffa18f1..791179da166e 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,3 +1,3 @@
DIST calibre-0.8.62.tar.xz 25090932 SHA256 5da54282959e86f288dbb3e275ab403db5a66c74c7ab384adeeb24c459612159 SHA512 2d129b49b3b6daa2a5c85c02a57e70c8ac1ca8b102bca6f708c9094b9f04fb97abed62b4b00e2876473e887492cffbda3247be6021dfb6fe869f878b335c213d WHIRLPOOL c2b90f76b21dda70902dfcdda7fc698f1dcdb5397724f409745530be3f891e556806aab10a3d9328ad695455a6e0ad04084182f63af55fb4328ba60fab228cfc
-DIST calibre-0.8.67.tar.xz 26569752 SHA256 de1f332bf5bf9368d3000dbb0b06af92ebf550eeef6678f7418ebbcb7265b84c SHA512 1b0baed4179f62f635f393a34891e3c36a4254c2e5e4450925136a7b254388387dbab08fca1a6900dfb3450e3512089c056bdc6f27e5525d2de52079a0b6141d WHIRLPOOL 1f806d1457ad2b97c6acd11e3bad4fd18976fabea13f8457cfb34d44fbf7df347240d80caad5443dc259a7930cc8a74132ee80986d034b25eaae567a1bc420e3
DIST calibre-0.8.68.tar.xz 26852296 SHA256 dd5f6ce36d0a013e3043abf543a86f8eac0f842e8c97d702960e1ff9e0bf4b04 SHA512 7afd99fddfe86e76e174c1139e1b495282af0314d5241d9278fe3ad56f8681d97ef942536c831ce4bcb55eb68202cc3040412d63a58b67b700cd0b9126ace5ab WHIRLPOOL 612495b65b60293455886029ce2113ec9ed2e0e02d40dcb966c3cda4225dd40f6df6af6078f37837910c5313572bc3c5f1a3ee4536535457cec9e152457e4292
+DIST calibre-0.8.69.tar.xz 26886920 SHA256 cb74248f4c6cbaf151a3e94aca04827ee65f5ea1f7a8051ad75942b7f10d7232 SHA512 0e53344ee4a68b18f9ef1786488560a43f269ad55225e0457cf4f073a276eb83d24cc1979a5c33521f570c60db24d5667b9f037e9272bfc37106b3b23287f0f4 WHIRLPOOL 1070c12c2897820ce4b3b26cba21d3a795e8e95ddedc7c91fdf9e9efcf4bb77be4a802630ac4cad9818d95880a6e4f2125e44d450494ead6b60d373ead09341c
diff --git a/app-text/calibre/calibre-0.8.67.ebuild b/app-text/calibre/calibre-0.8.69.ebuild
similarity index 99%
rename from app-text/calibre/calibre-0.8.67.ebuild
rename to app-text/calibre/calibre-0.8.69.ebuild
index 9fdc5594bd62..9206ecc4e273 100644
--- a/app-text/calibre/calibre-0.8.67.ebuild
+++ b/app-text/calibre/calibre-0.8.69.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.67.ebuild,v 1.3 2012/09/09 17:30:17 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-0.8.69.ebuild,v 1.1 2012/09/14 16:48:51 zmedico Exp $
EAPI=4
PYTHON_DEPEND=2:2.7
diff --git a/app-text/gtranslator/gtranslator-1.9.13.ebuild b/app-text/gtranslator/gtranslator-1.9.13.ebuild
index d8ea2175b350..12c2b2f40707 100644
--- a/app-text/gtranslator/gtranslator-1.9.13.ebuild
+++ b/app-text/gtranslator/gtranslator-1.9.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-1.9.13.ebuild,v 1.11 2012/05/04 03:33:11 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-1.9.13.ebuild,v 1.12 2012/09/15 03:38:18 tetromino Exp $
EAPI="3"
GCONF_DEBUG="no"
@@ -26,8 +26,8 @@ RDEPEND="
>=x11-libs/gtksourceview-2.4:2.0
gnome? (
- gnome-extra/gnome-utils
- >=gnome-extra/gucharmap-2 )
+ =gnome-extra/gnome-utils-2*
+ >=gnome-extra/gucharmap-2:0 )
http? ( >=dev-libs/json-glib-0.7.6 )
spell? ( >=app-text/gtkspell-2.0.2:2 )"
DEPEND="${RDEPEND}
diff --git a/app-text/gtranslator/gtranslator-2.90.8.ebuild b/app-text/gtranslator/gtranslator-2.90.8.ebuild
index 042ae9190489..95e62a8d2006 100644
--- a/app-text/gtranslator/gtranslator-2.90.8.ebuild
+++ b/app-text/gtranslator/gtranslator-2.90.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.90.8.ebuild,v 1.3 2012/08/13 18:43:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.90.8.ebuild,v 1.4 2012/09/15 03:38:18 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -31,7 +31,7 @@ COMMON_DEPEND="
gnome-base/gsettings-desktop-schemas
gnome? (
- gnome-extra/gnome-utils
+ || ( app-dicts/gnome-dictionary =gnome-extra/gnome-utils-3.2* )
x11-libs/gtk+:3[introspection] )
spell? ( app-text/gtkspell:3 )"
RDEPEND="${COMMON_DEPEND}
diff --git a/app-text/gtranslator/gtranslator-2.91.4.ebuild b/app-text/gtranslator/gtranslator-2.91.4.ebuild
index 4657f2d92733..3801d2526a26 100644
--- a/app-text/gtranslator/gtranslator-2.91.4.ebuild
+++ b/app-text/gtranslator/gtranslator-2.91.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.91.4.ebuild,v 1.2 2012/08/13 18:43:17 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/gtranslator/gtranslator-2.91.4.ebuild,v 1.3 2012/09/15 03:38:18 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -31,7 +31,7 @@ COMMON_DEPEND="
gnome-base/gsettings-desktop-schemas
gnome? (
- gnome-extra/gnome-utils
+ || ( app-dicts/gnome-dictionary =gnome-extra/gnome-utils-3.2* )
x11-libs/gtk+:3[introspection] )
spell? ( app-text/gtkspell:3 )"
RDEPEND="${COMMON_DEPEND}
diff --git a/app-text/wdiff/wdiff-1.1.2.ebuild b/app-text/wdiff/wdiff-1.1.2.ebuild
index d795f878d824..8eb69bbae453 100644
--- a/app-text/wdiff/wdiff-1.1.2.ebuild
+++ b/app-text/wdiff/wdiff-1.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-1.1.2.ebuild,v 1.2 2012/09/13 11:27:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wdiff/wdiff-1.1.2.ebuild,v 1.3 2012/09/14 18:36:25 maekke Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
IUSE="experimental test"
RDEPEND="sys-apps/diffutils
diff --git a/dev-cpp/libassa/libassa-3.5.1-r1.ebuild b/dev-cpp/libassa/libassa-3.5.1-r1.ebuild
index 83b25b491d3d..3e70d0c97e2e 100644
--- a/dev-cpp/libassa/libassa-3.5.1-r1.ebuild
+++ b/dev-cpp/libassa/libassa-3.5.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/dev-cpp/libassa/libassa-3.5.1-r1.ebuild,v 1.1 2012/07/13 11:08:03 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libassa/libassa-3.5.1-r1.ebuild,v 1.2 2012/09/14 14:19:31 ago Exp $
EAPI=4
inherit eutils
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc static-libs"
RDEPEND="net-libs/libtirpc"
diff --git a/dev-haskell/arrows/Manifest b/dev-haskell/arrows/Manifest
index fc5a40fc6ccc..b391d88e45a3 100644
--- a/dev-haskell/arrows/Manifest
+++ b/dev-haskell/arrows/Manifest
@@ -1,3 +1,4 @@
DIST arrows-0.4.2.0.tar.gz 12211 SHA256 9c8508a08af50f7e449883390a2670c7b180ad13c5623a1e7ad4cf59cd58a69f SHA512 2a440def80684a60282113933e22dfc47b0c9a71c1b1d960ce1ee95f440ef6f6841a213eb042a7c720a811b2b6843e925198aaeb3b7384d9b42a3f336aca6e9c WHIRLPOOL fed4227b0368723b9b9f58c056d0d67a36d1956f9021f2e666364b553b5cef41e0d948e4e3af1dfdfa05c20482b1a7f76cea21ea1754f6640eb8d41fba2b8045
DIST arrows-0.4.4.0.tar.gz 12393 SHA256 4999ba909061f5bede09e6116e2cac1cf89f04d3429a4a2be6ef79a677d89bb5 SHA512 5042ef79e9ee03d4a6f303b0d943f5f8f2733b084a00257e4c93b7792b365115322b118f6620093b2a55b6804b1c3e5ddb9118bd356f46a6621243d21970d557 WHIRLPOOL ecb9ce9df89df4f9c226e0165a434a594aa8797e1f1ac701854128a58f615d972a749175fca9dc810b445f665c882fdac838d136f1582df874c26ea2a2b7628b
+DIST arrows-0.4.4.1.tar.gz 12261 SHA256 5b104bd8f8fac5ad0fd194088819423302e52c2a796cc99f6d32bbc134bfebe2 SHA512 642bc893ba5a01d139498fdd8d97531daf76c583eee3317ee7b0cb15bdd5304022a0c7d9280d1eef58bba40de9782cea01325c8fed45232c15261c49b060d352 WHIRLPOOL 69b8caad113fb2e14236fa66e99dee8a2d9e11a2b19e8f875fd9d776a4894d4a6dcccefe1de928c4ceae302021b61d1d01fa785498000720451d606b30ce0b37
DIST ghc-6.6.1-src-extralibs.tar.bz2 1928527 SHA256 d162a82fc388fdd48c327b09bb6d778f2313d12d5282f3b120ac08a5d4e78902 SHA512 bf65422b845f77d3c426bb27e4086242fc20a458e93937d476d4f7ba535bc79fce2cb4a489ea91ad529fcd33696aa77a90dd6fa26ba095c8ecbf4c4c54f72203 WHIRLPOOL 6be78bde0950f025735920dcca5abb1f473f493492da72b62ee939963d07fce2d8c70e5fe8402fbbdf49e8f6710adee455f39deefbab13e0e3a3053215ef467a
diff --git a/dev-haskell/arrows/arrows-0.4.4.1.ebuild b/dev-haskell/arrows/arrows-0.4.4.1.ebuild
new file mode 100644
index 000000000000..010eb8300c7a
--- /dev/null
+++ b/dev-haskell/arrows/arrows-0.4.4.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/arrows/arrows-0.4.4.1.ebuild,v 1.1 2012/09/14 10:41:47 gienah Exp $
+
+EAPI=4
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Arrow classes and transformers"
+HOMEPAGE="http://www.haskell.org/arrows/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/stream[profile?]
+ >=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+ dev-haskell/cabal"
diff --git a/dev-haskell/deepseq/Manifest b/dev-haskell/deepseq/Manifest
index f79989045329..7e49b0062ac8 100644
--- a/dev-haskell/deepseq/Manifest
+++ b/dev-haskell/deepseq/Manifest
@@ -1,2 +1,3 @@
DIST deepseq-1.1.0.2.tar.gz 3619 SHA256 6504d3bcd61e89c2ca6b957e45418028fcb8943727339a6468595825184513c7 SHA512 5231548aee357cf08f0aa43fb6afb036d900adaed542ce3f1b03f864159838df0ad429e96a15934471eb0fd46cf71938f36d62cef4ef57e7acef597d79701710 WHIRLPOOL cce83fac17defdf4b0d73b3c074b6836f23d3143ccc7604e9b9f78c1f26c03e65d279670b1f6d07a907a8a1195f1b18ea5d4f6ef4e196f6329c79eadf5445978
DIST deepseq-1.3.0.0.tar.gz 3901 SHA256 fee10dbfceda33220fb9869652530c32ab2888694ee628cc86d51ea35a0e537c SHA512 f845b483e7cfd37e63e0a4d8515a54c130a38e219dfe7f3f1a9af2ba0420603097d90985b992f5ff9af3bcbc6ae106f315b821be561c669374115597938cc9fb WHIRLPOOL 16b90220a23d8a1f820d6c41ec9c26c31acedeb331001436c3779a63afdfdbdb61122d38206f937a0be481c27ece452a2c0ea12a6ce51acbd4d095405aa10a0b
+DIST deepseq-1.3.0.1.tar.gz 3900 SHA256 9792d2aff7c65c1e3a9d720ba7fe109eb6aea50a51477ffafd2b5f9e8d9a1f19 SHA512 e04593845d9d1ec427a3448b9e5175e1c0842d55037cd05abd0cb7c3dbc5a5470a824f10c4e8f1fa8b6feae853ba9bdb0fe614e4c419c34298baf86c1f90b8d6 WHIRLPOOL 642336d1ba103a488746ca64871f49dda0602907b1c2b81d1c5dd8c15d01040160cc6fc7e9184a9cffe58065a199333a4d620b711594d981ce03c546e267e562
diff --git a/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild b/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild
new file mode 100644
index 000000000000..ab6168a883a3
--- /dev/null
+++ b/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild
@@ -0,0 +1,27 @@
+# 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.1.ebuild,v 1.1 2012/09/14 10:52:08 gienah Exp $
+
+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="mirror://hackage/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-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+CABAL_CORE_LIB_GHC_PV="7.6.* 7.7.*"
diff --git a/dev-haskell/haddock/haddock-2.10.0-r1.ebuild b/dev-haskell/haddock/haddock-2.10.0-r1.ebuild
index a71584dc40f2..91bbc29ca024 100644
--- a/dev-haskell/haddock/haddock-2.10.0-r1.ebuild
+++ b/dev-haskell/haddock/haddock-2.10.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/dev-haskell/haddock/haddock-2.10.0-r1.ebuild,v 1.2 2012/08/20 02:06:01 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0-r1.ebuild,v 1.3 2012/09/14 07:03:20 qnikst Exp $
EAPI="4"
@@ -9,7 +9,7 @@ inherit eutils haskell-cabal pax-utils
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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-haskell/haddock/haddock-2.10.0.ebuild b/dev-haskell/haddock/haddock-2.10.0.ebuild
index 3b186138d788..1c640a524501 100644
--- a/dev-haskell/haddock/haddock-2.10.0.ebuild
+++ b/dev-haskell/haddock/haddock-2.10.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/haddock/haddock-2.10.0.ebuild,v 1.2 2012/03/25 14:25:09 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.10.0.ebuild,v 1.3 2012/09/14 07:03:20 qnikst Exp $
EAPI="4"
@@ -9,7 +9,7 @@ inherit eutils haskell-cabal pax-utils
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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-haskell/haddock/haddock-2.4.2.ebuild b/dev-haskell/haddock/haddock-2.4.2.ebuild
index f7fdb27c101c..eafd64f17c03 100644
--- a/dev-haskell/haddock/haddock-2.4.2.ebuild
+++ b/dev-haskell/haddock/haddock-2.4.2.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-haskell/haddock/haddock-2.4.2.ebuild,v 1.10 2010/09/19 17:01:23 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.4.2.ebuild,v 1.11 2012/09/14 07:03:20 qnikst Exp $
CABAL_FEATURES="bin lib"
# don't enable profiling as the 'ghc' package is not built with profiling
@@ -12,8 +12,8 @@ GHCPATHS_P="${GHCPATHS_PN}-${GHCPATHS_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
- http://hackage.haskell.org/packages/archive/${GHCPATHS_PN}/${GHCPATHS_PV}/${GHCPATHS_P}.tar.gz"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz
+ mirror://hackage/packages/archive/${GHCPATHS_PN}/${GHCPATHS_PV}/${GHCPATHS_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-haskell/haddock/haddock-2.6.1.ebuild b/dev-haskell/haddock/haddock-2.6.1.ebuild
index 2c509e86079c..00c1dd109e7e 100644
--- a/dev-haskell/haddock/haddock-2.6.1.ebuild
+++ b/dev-haskell/haddock/haddock-2.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.14 2012/03/09 21:55:22 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.6.1.ebuild,v 1.15 2012/09/14 07:03:20 qnikst Exp $
CABAL_FEATURES="bin lib"
# don't enable profiling as the 'ghc' package is not built with profiling
@@ -8,7 +8,7 @@ inherit eutils haskell-cabal autotools pax-utils
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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-haskell/haddock/haddock-2.9.2.ebuild b/dev-haskell/haddock/haddock-2.9.2.ebuild
index accf9a5fceed..bef3be88c8f8 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-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.3 2012/03/18 19:42:44 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-2.9.2.ebuild,v 1.4 2012/09/14 07:03:20 qnikst Exp $
# ebuild generated by hackport 0.2.9
@@ -14,7 +14,7 @@ inherit haskell-cabal pax-utils
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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-haskell/happy/files/happy-1.18.9-ghc-7.5.patch b/dev-haskell/happy/files/happy-1.18.9-ghc-7.5.patch
new file mode 100644
index 000000000000..7c71048b3627
--- /dev/null
+++ b/dev-haskell/happy/files/happy-1.18.9-ghc-7.5.patch
@@ -0,0 +1,20 @@
+--- happy-1.18.9-orig/Setup.lhs 2012-02-06 20:49:56.000000000 +1100
++++ happy-1.18.9/Setup.lhs 2012-06-25 08:55:56.283147498 +1000
+@@ -10,7 +10,7 @@
+ import Distribution.Simple.Program
+
+ import System.FilePath (())
+-import System.IO.Error ( try )
++import System.IO.Error ( tryIOError )
+ import System.Directory (removeFile)
+
+ main :: IO ()
+@@ -50,7 +50,7 @@
+ [ cpp_template "GLR_Base.hs" dst opts | (dst,opts) <- glr_base_templates ] ++
+ [ cpp_template "GLR_Lib.hs" dst opts | (dst,opts) <- glr_templates ])
+
+-myPostClean _ _ _ _ = mapM_ (try . removeFile) all_template_files
++myPostClean _ _ _ _ = mapM_ (tryIOError . removeFile) all_template_files
+
+ myInstall pkg_descr lbi hooks flags =
+ instHook defaultUserHooks pkg_descr' lbi hooks flags
diff --git a/dev-haskell/happy/happy-1.18.2.ebuild b/dev-haskell/happy/happy-1.18.2.ebuild
index 7d85e959e180..2863e59046bf 100644
--- a/dev-haskell/happy/happy-1.18.2.ebuild
+++ b/dev-haskell/happy/happy-1.18.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/happy/happy-1.18.2.ebuild,v 1.7 2011/02/25 12:45:43 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.18.2.ebuild,v 1.8 2012/09/14 07:06:28 qnikst Exp $
CABAL_FEATURES="bin"
CABAL_MIN_VERSION=1.2
@@ -8,7 +8,7 @@ inherit haskell-cabal autotools
DESCRIPTION="A yacc-like parser generator for Haskell"
HOMEPAGE="http://haskell.org/happy/"
-SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-haskell/happy/happy-1.18.4.ebuild b/dev-haskell/happy/happy-1.18.4.ebuild
index 53f713f626bc..718dcad5f912 100644
--- a/dev-haskell/happy/happy-1.18.4.ebuild
+++ b/dev-haskell/happy/happy-1.18.4.ebuild
@@ -1,6 +1,6 @@
-# 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/dev-haskell/happy/happy-1.18.4.ebuild,v 1.5 2010/11/14 18:38:14 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.18.4.ebuild,v 1.6 2012/09/14 07:06:28 qnikst Exp $
CABAL_FEATURES="bin"
inherit haskell-cabal autotools
@@ -13,8 +13,8 @@ MTL_P="${MTL_PN}-${MTL_PV}"
DESCRIPTION="Happy is a parser generator for Haskell"
HOMEPAGE="http://www.haskell.org/happy/"
-SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz
- http://hackage.haskell.org/packages/archive/${MTL_PN}/${MTL_PV}/${MTL_P}.tar.gz"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz
+ mirror://hackage/packages/archive/${MTL_PN}/${MTL_PV}/${MTL_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-haskell/happy/happy-1.18.6.ebuild b/dev-haskell/happy/happy-1.18.6.ebuild
index 57344ee13780..5dbc77a91c02 100644
--- a/dev-haskell/happy/happy-1.18.6.ebuild
+++ b/dev-haskell/happy/happy-1.18.6.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/happy/happy-1.18.6.ebuild,v 1.2 2011/08/05 10:53:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.18.6.ebuild,v 1.3 2012/09/14 07:06:28 qnikst Exp $
# ebuild generated by hackport 0.2.9
@@ -11,7 +11,7 @@ inherit base haskell-cabal autotools
DESCRIPTION="Happy is a parser generator for Haskell"
HOMEPAGE="http://www.haskell.org/happy/"
-SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
diff --git a/dev-haskell/happy/happy-1.18.9.ebuild b/dev-haskell/happy/happy-1.18.9.ebuild
index ef5348bcef69..289ad7a70502 100644
--- a/dev-haskell/happy/happy-1.18.9.ebuild
+++ b/dev-haskell/happy/happy-1.18.9.ebuild
@@ -1,17 +1,17 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.18.9.ebuild,v 1.6 2012/08/09 15:33:51 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.18.9.ebuild,v 1.8 2012/09/14 13:00:49 gienah Exp $
# ebuild generated by hackport 0.2.9
EAPI="4"
CABAL_FEATURES="bin"
-inherit base haskell-cabal autotools
+inherit base eutils haskell-cabal autotools
DESCRIPTION="Happy is a parser generator for Haskell"
HOMEPAGE="http://www.haskell.org/happy/"
-SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
@@ -32,6 +32,14 @@ PATCHES=("${FILESDIR}/${PN}-1.18.6-man.patch"
src_prepare() {
base_src_prepare
+ # ghc 7.5 removed System.IO.try and Control.OldException.
+ # Conditional patch is required, as it is to the file Setup.lhs, so can not
+ # use LANGUAGE: CPP, and ghc 6.10.4 and 6.12.3 do not have
+ # System.IO.Error.tryIOError.
+ if has_version ">=dev-lang/ghc-7.5"; then
+ epatch "${FILESDIR}/${PN}-1.18.9-ghc-7.5.patch"
+ fi
+
use doc && cd doc && eautoconf
}
diff --git a/dev-haskell/hunit/Manifest b/dev-haskell/hunit/Manifest
index 61306b66ee80..f3071cf23dde 100644
--- a/dev-haskell/hunit/Manifest
+++ b/dev-haskell/hunit/Manifest
@@ -3,3 +3,4 @@ DIST HUnit-1.2.2.1.tar.gz 22386 SHA256 47235503b666658588181795540d29212283059b2
DIST HUnit-1.2.2.3.tar.gz 22665 SHA256 bf6bb9b7ec3415c6279af5629fd0f40dd2f67110edea4fdd2a70791280361195 SHA512 a06b3b2b19b3ba0d6b165c20a42ca649a190817ee2d21bf4c114feb197984dbd6af51c224fc01207d34d2b8bfa4347fa1b1cb5d75de93410c144fa38858fd682 WHIRLPOOL 2a87575660bd8b9e6d77fd37d0f323ffb3316198731fd4d77ee9985a4e5b10905e501adf3d6c2b090f38ad9835a51c0a98673db9c254d73802f0a746a1549ca8
DIST HUnit-1.2.4.2.tar.gz 23558 SHA256 fdbcbc28196d616b449bf3e46c30dcd5577dc92f290458e2dbdbfc5a65de327a SHA512 cce6062e7471746d23d9755b60d39cb189f27a513eb6a50c2c67619ea265658c3a03263143e15ebaa65c5cbece8ca8c6df9a5a8eb7cce0f43e164d8ee41e1829 WHIRLPOOL f81b18610aaa1d253a57b45a030237355f6bc79830a43195c5be0fdf0853f9a02d57b59e01880511c1b9ccc0a761c874a6cd14527342d196f9a817679cecf1bb
DIST HUnit-1.2.4.3.tar.gz 23976 SHA256 797deeb5dec7109bf6dcbfc87d0149fd93903227323f1d2d319e72241ed0626a SHA512 2e7232af915fa24b6c36fd8eae4e249269a8ca7d388272b97ea37cc9d49a6dd06a4ad4b4e8ca1e416b413bca4e2c3f609cf2efdf4f11121f63767be814bf79ef WHIRLPOOL 68836f4a96a8bf3e10f5a9c5cd8e554c3e94bab21d5b18e32634f8d7607c6eba7915cf02c2aadc82b3b49a176be510cd6218610ba826bb55933308cd5aa5e4ee
+DIST HUnit-1.2.5.1.tar.gz 24221 SHA256 bc0c15d20ee7cedf35fadcaf9cc15b5c2b4ce2df9d80e61bfcdd65ef1ef64471 SHA512 951a2b1703985ef4a84da0d25239c47c7a37bf0140df52746237d32313484f177207d4b0dbb7548dafc12640b8f04b52be97825a4b08010b5120aac142549565 WHIRLPOOL 0d348438092ea8f6be411f0c2c4b448f6cf23930fa90cb3ee69dcefd18543bd481f5b9a3bf48f8a2c7e3340b6e219a5e199cb6e91f61e50cc92723db084412e5
diff --git a/dev-haskell/hunit/hunit-1.2.5.1.ebuild b/dev-haskell/hunit/hunit-1.2.5.1.ebuild
new file mode 100644
index 000000000000..a4666dd0943f
--- /dev/null
+++ b/dev-haskell/hunit/hunit-1.2.5.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hunit/hunit-1.2.5.1.ebuild,v 1.1 2012/09/14 12:31:57 gienah Exp $
+
+EAPI=4
+
+# ebuild generated by hackport 0.2.18.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+MY_PN="HUnit"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A unit testing framework for Haskell"
+HOMEPAGE="http://hunit.sourceforge.net/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE=""
+
+RDEPEND="dev-haskell/deepseq[profile?]
+ >=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install () {
+ cabal_src_install
+ if use doc; then
+ dohtml -r "${S}/doc/"*
+ fi
+}
+
+src_install() {
+ cabal_src_install
+
+ # remove hunit self-tests, we don't want to install them
+ rm -rf "${ED}/usr/bin"
+}
diff --git a/dev-haskell/mtl/Manifest b/dev-haskell/mtl/Manifest
index bfdd6608b297..00cf3e141caa 100644
--- a/dev-haskell/mtl/Manifest
+++ b/dev-haskell/mtl/Manifest
@@ -2,3 +2,4 @@ DIST mtl-1.1.0.2.tar.gz 18901 SHA256 a225aaf2b1e337f40c31e5c42f95eec9a4608322b0e
DIST mtl-1.1.1.1.tar.gz 18078 SHA256 a61326db190f098a95a60f1317b567d68f02999aad106cc5c98982975f5eef94 SHA512 bb1f236edb5c4fb7335d6936b6a0a9b4cb5f32378f14826df47534a9199c68d71d6c6aa99819ac3e0c7e6849fd1e6ddae28a8d3bad5991abc4e35bbdd841be67 WHIRLPOOL 9f1cbc193d113f9ab1ab50657645390bf17fc522ab69d6797cd4d57af49cf566e805de27fe1cb71c1e752fe208f8380fcc5e283c56e56a00d010c2799ab93c60
DIST mtl-2.0.1.0.tar.gz 14124 SHA256 f36be461a0952905b60e750322b20105273f28e3fd99669f8db92240fdbfd2f0 SHA512 8fd6e6f3a3c51f618b78c21234e64f0646e9078f76cebf4c5109e87ec28f00039daf3c79df8e7533239c6ce1ad3f810fc2391f30a7a59397d26d6c57c7fea028 WHIRLPOOL 19495aae1ca9c43f5a56a8834a145b6d1177117d23903b00422eadcbb13790fc905e1d9098d1d0ca2b3afd36850be7f6643c324402e763e2762b575a846b9d7d
DIST mtl-2.1.1.tar.gz 13651 SHA256 9250831796b1678380d915d2953ce94fa466af8d5c92d0c569963f0f0b037a90 SHA512 2bd1d935f1f1ff0967c6b7f6d9f127b7173736a48a7684cfeb03d61c4299d8191636f963b749422d73e2b6fb5e5389d8ac712bda6860162a62282dd33fc4cbe4 WHIRLPOOL fb578e834c8a6d3b33b389a3466c9f2edecd59a70a080f35ee381d492573cb29fd548b3cbeac11ca64e4eb7556c2237adc7f582d70777154729c6802240ff6e6
+DIST mtl-2.1.2.tar.gz 13723 SHA256 8c775764333420a4391823f9cb9b640306a262552280ea9bbdd2ca11194a8bef SHA512 ef8043adeb2746c770bebd4683c95c399bdc047c278b619d89230f342d13c33f0a9275c6be399e6da329f385ff209ff537e002b82d5075684202e8703fc5e29d WHIRLPOOL 99ba4725242d9baa0970e3594e041d4b092a56c846ce9c8d38a094dedc9586b444f27b427723fd047b9dbc8cad2fd2506bdc954ff8246c3a4888d688e5ea2478
diff --git a/dev-haskell/mtl/mtl-2.1.2.ebuild b/dev-haskell/mtl/mtl-2.1.2.ebuild
new file mode 100644
index 000000000000..218bf6a6f93d
--- /dev/null
+++ b/dev-haskell/mtl/mtl-2.1.2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/mtl/mtl-2.1.2.ebuild,v 1.1 2012/09/14 10:46:25 gienah Exp $
+
+EAPI="4"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Monad classes, using functional dependencies"
+HOMEPAGE="http://github.com/ekmett/mtl"
+SRC_URI="mirror://hackage/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 ~x86-solaris"
+IUSE=""
+
+RDEPEND="=dev-haskell/transformers-0.3*[profile?]
+ >=dev-lang/ghc-6.8.2"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.6"
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index 9f7cfab2a371..a6922cca477e 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -4,3 +4,4 @@ DIST text-0.11.1.13.tar.gz 120181 SHA256 4e6cf947f2ab474d4bdbc5057b78a2faa00bada
DIST text-0.11.2.0.tar.gz 121020 SHA256 178d12eb0dad50f3ef5135c443b31993e91ed91b1d04a2ebfa5c05520518a5bb SHA512 97eb691235c909b9f9c32b6ca481a5e9ecf90ad2aff6163ef8123503aebab339983a2dd99014dfecde0bf9868454f22da908f3515857ff30f2502f2ec56446c4 WHIRLPOOL 55432a488e3670973cd8259474ca4efa88d554b6b5a9bab4038b4f628a129eb50ece5358c1dd342214a74a828de8e6ff04b023a3904bae647914e7ad3b6b0ea4
DIST text-0.11.2.1.tar.gz 121169 SHA256 69c9b5df8743cb5e5444f1730a8f7aed087e347bb26546e22e104ee46017502a SHA512 bf1662aa7d57a05539fe8e56808dff304b781803a7798b1668bcd3a54dc9a6b45d451a3389a6b60e1041c6575740cb465481d4746af6b2714fb0836365911198 WHIRLPOOL 82f06847462c7053a572ab90a810a830b9881247fe60d6f17343641eae147d3a1ff51cc2fe3b3197cea7ecdb697fb64fa3bb2c6bf792eba7876bf48c65fd4fd6
DIST text-0.11.2.2.tar.gz 121201 SHA256 6344e28609a0a08acd8cf59ecdf0e58b9afb849a6cf5eeaae2f14e2e79740032 SHA512 c3c171b6f30f3daa40532642201bad883256274ba03eb33d4c04d44408ce79da6ab3a13cda33a99cfdfef8174c7f22c91992df9a4f9b748b4fa8dc9f9257acba WHIRLPOOL e6585b03773a1e5399f6fe9ba8288ef2b3f8a932749f7766cce324f3dd12c1fb13694fdb00cb27ecd045f8b2aa5463ff0b8b8425bd2d8bb2f3baaaf4f66bd817
+DIST text-0.11.2.3.tar.gz 122938 SHA256 352737b045a42635f1017473179297ab562d53513ab3a4b965f38514171e344b SHA512 f84b05d1f88afd2e041c463fa9e912fcb695c95498fd60bb1fdcfc804803740f22f7aa4b482ef3b641ec3e487f0e84161bdf430c483a2d7b29707cf1ac1e24e0 WHIRLPOOL 1309dfeef98f52c83a16fa3a93a765b7208604c57e2e57f30ea4b97ca83922992b065bedb62d0aab90e5ea8b057c9668402575a71cd24de4a90d1b9f52859811
diff --git a/dev-haskell/text/text-0.11.2.3.ebuild b/dev-haskell/text/text-0.11.2.3.ebuild
new file mode 100644
index 000000000000..ba67533bfe8b
--- /dev/null
+++ b/dev-haskell/text/text-0.11.2.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/text-0.11.2.3.ebuild,v 1.1 2012/09/14 13:14:16 gienah Exp $
+
+EAPI=4
+
+# ebuild generated by hackport 0.2.18.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="An efficient packed Unicode text type."
+HOMEPAGE="https://github.com/bos/text"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${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"
+# tests fail to build:
+# : cannot satisfy -package-id text-0.11.2.3-inplace:
+# text-0.11.2.3-inplace is shadowed by package text-0.11.2.3-db61832d0c4660614c4ceff234ed4abb
+# http://hackage.haskell.org/trac/hackage/ticket/807
+IUSE="test"
+
+RDEPEND=">=dev-haskell/deepseq-1.1.0.0[profile?]
+ >=dev-lang/ghc-6.10.1"
+DEPEND="${RDEPEND}
+ test? ( >=dev-haskell/hunit-1.2[profile?]
+ >=dev-haskell/quickcheck-2.4[profile?]
+ dev-haskell/random[profile?]
+ >=dev-haskell/test-framework-0.4[profile?]
+ >=dev-haskell/test-framework-hunit-0.2[profile?]
+ >=dev-haskell/test-framework-quickcheck2-0.2[profile?]
+ )
+ >=dev-haskell/cabal-1.8"
+
+src_configure() {
+ # the tests need a utf-8 locale
+ cabal_src_configure $(use test && use_enable test tests) #395351
+}
diff --git a/dev-java/netbeans-ide/netbeans-ide-7.1.2-r1.ebuild b/dev-java/netbeans-ide/netbeans-ide-7.1.2-r1.ebuild
new file mode 100644
index 000000000000..56a79f87b791
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-7.1.2-r1.ebuild
@@ -0,0 +1,388 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-ide/netbeans-ide-7.1.2-r1.ebuild,v 1.1 2012/09/14 20:17:36 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="7.1"
+SOURCE_URL="http://dlc.sun.com.edgesuite.net/netbeans/7.1.2/final/zip/netbeans-7.1.2-201204101705-src.zip"
+SRC_URI="${SOURCE_URL}
+ http://dev.gentoo.org/~fordfrog/distfiles/netbeans-9999-r1-build.xml.patch.bz2
+ http://hg.netbeans.org/binaries/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar
+ http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+ http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+ http://hg.netbeans.org/binaries/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar
+ http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+ http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip
+ http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+ http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+ http://hg.netbeans.org/binaries/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar
+ http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip
+ http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+ http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+ http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+ http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+ http://hg.netbeans.org/binaries/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar
+ http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+ http://hg.netbeans.org/binaries/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar
+ http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+ http://hg.netbeans.org/binaries/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar
+ http://hg.netbeans.org/binaries/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar
+ http://hg.netbeans.org/binaries/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar
+ http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar
+ http://hg.netbeans.org/binaries/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar
+ http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip
+ http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip
+ http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+ http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar
+ http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar
+ http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar
+ http://hg.netbeans.org/binaries/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar
+ http://hg.netbeans.org/binaries/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar
+ http://hg.netbeans.org/binaries/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar
+ http://hg.netbeans.org/binaries/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar
+ http://hg.netbeans.org/binaries/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar
+ http://hg.netbeans.org/binaries/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar
+ http://hg.netbeans.org/binaries/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar
+ http://hg.netbeans.org/binaries/1FE453D0B251571463F9BE4F51F413BBA5A376A7-org.eclipse.equinox.security-1.0.200.jar
+ http://hg.netbeans.org/binaries/34E70691382D67EE5C84EF207FB8D3784594BA2C-org.eclipse.jgit-1.0.0.201106090707-r.jar
+ http://hg.netbeans.org/binaries/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar
+ http://hg.netbeans.org/binaries/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar
+ http://hg.netbeans.org/binaries/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar
+ http://hg.netbeans.org/binaries/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar
+ http://hg.netbeans.org/binaries/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar
+ http://hg.netbeans.org/binaries/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip
+ http://hg.netbeans.org/binaries/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar
+ http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+ http://hg.netbeans.org/binaries/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip
+ http://hg.netbeans.org/binaries/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip
+ http://hg.netbeans.org/binaries/0B9606F570B28FFC4FCE6C7222B88B3DCEFB1A36-svnClientAdapter-javahl-1.6.13.jar
+ http://hg.netbeans.org/binaries/A11623D2AF72A99C1509EC2A0ADA2DACBEE9A8E4-svnClientAdapter-main-1.6.13.jar
+ http://hg.netbeans.org/binaries/0AE20EC02958F193ADAB4C272ACCF6FE3196DCA0-svnClientAdapter-svnkit-1.6.13.jar
+ http://hg.netbeans.org/binaries/636C6FF256A978B786D7502F43E788448E9DAB4B-svnkit-1.3.4.jar
+ http://hg.netbeans.org/binaries/AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar
+ http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar
+ http://hg.netbeans.org/binaries/538D727A9A0874019FB11280F07CE3F43EE723BC-sqljet-1.0.3.jar
+ http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+ http://hg.netbeans.org/binaries/68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar
+ http://hg.netbeans.org/binaries/55CD0B272084EB80B8C91F3A0617BB602B4EF2DF-ValidationAPI.jar
+ http://hg.netbeans.org/binaries/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar
+ http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+ http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+ http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+ http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+ ~dev-java/netbeans-platform-${PV}
+ dev-java/commons-httpclient:3
+ dev-java/commons-io:1
+ dev-java/commons-lang:2.1
+ dev-java/commons-logging:0
+ dev-java/freemarker:2.3
+ dev-java/icu4j:49
+ dev-java/jdbc-mysql:0
+ dev-java/jdbc-postgresql:0
+ dev-java/jsr173:0
+ dev-java/jvyamlb:0
+ dev-java/log4j:0
+ dev-java/lucene:3.0
+ dev-java/saxon:9
+ dev-java/smack:2.2
+ dev-java/sun-jaf:0
+ dev-java/tomcat-servlet-api:2.2
+ dev-java/ws-commons-util:0
+ dev-java/xerces:2
+ dev-vcs/subversion:0[java]"
+# dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+# app-text/jing:0 our version is probably too old
+# dev-java/ini4j:0 our version is too old
+# java-virtuals/jaf:0 could use this instead of sun-jaf but it returns empty classpath
+# dev-java/trilead-ssh2:0 in overlay
+DEPEND="virtual/jdk:1.6
+ app-arch/unzip
+ dev-java/commons-codec:0
+ dev-java/jsch:0
+ dev-java/jzlib:0
+ ${CDEPEND}
+ dev-java/javacc:0
+ dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+ ${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+ unpack $(basename ${SOURCE_URL})
+
+ einfo "Deleting bundled jars..."
+ find -name "*.jar" -type f -delete
+
+ unpack netbeans-9999-r1-build.xml.patch.bz2
+
+ pushd "${S}" >/dev/null || die
+ ln -s "${DISTDIR}"/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar libs.antlr3.runtime/external/antlr-runtime-3.3.jar || die
+ ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+ ln -s "${DISTDIR}"/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar libs.commons_net/external/commons-net-3.0.1.jar || die
+ # system commons-io fails with following error:
+ # Missing manifest tag OpenIDE-Module; /var/tmp/portage/dev-java/netbeans-ide-9999_p20110911/work/nbbuild/netbeans/ide/modules/org-apache-commons-io.jar is not a module
+ ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar ||die
+ ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+ ln -s "${DISTDIR}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+ ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+ ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+ ln -s "${DISTDIR}"/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+ ln -s "${DISTDIR}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip html.parser/external/html5doc.zip || die
+ ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+ ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+ ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+ ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+ ln -s "${DISTDIR}"/FACC6D84B0B0A650B1D44FED941E9ADD9F326862-isorelax20041111.jar html.validation/external/isorelax20041111.jar || die
+ ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+ ln -s "${DISTDIR}"/BCF23B1D858C6F69D67C851D497984D25345D0B1-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+ ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+ ln -s "${DISTDIR}"/2EC69BD69B66B0DABEA392DE713A11F975001760-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+ ln -s "${DISTDIR}"/64D468922B85A9626178AEDF564FFDBDE980B3EC-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+ ln -s "${DISTDIR}"/F02664A059617D060BEC3EBA0BC002B2102AEB84-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+ ln -s "${DISTDIR}"/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar html.validation/external/jing.jar || die
+ ln -s "${DISTDIR}"/71F7D2D5A3CF17CECBD15049A856BC0245C95C56-js.jar html.validation/external/js.jar || die
+ ln -s "${DISTDIR}"/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip javascript.editing/external/js-domstubs.zip || die
+ ln -s "${DISTDIR}"/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip javascript.editing/external/jsstubs.zip || die
+ ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.destroy/external/libpam4j-1.1.jar || die
+ ln -s "${DISTDIR}"/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar html.validation/external/non-schema.jar || die
+ ln -s "${DISTDIR}"/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype-3.4.100.jar || die
+ ln -s "${DISTDIR}"/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.1.jar || die
+ ln -s "${DISTDIR}"/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar o.eclipse.core.net/external/org.eclipse.core.net-1.2.100.jar || die
+ ln -s "${DISTDIR}"/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.6.0.jar || die
+ ln -s "${DISTDIR}"/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth-3.2.200.jar || die
+ ln -s "${DISTDIR}"/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.1.jar || die
+ ln -s "${DISTDIR}"/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common-3.6.0.jar || die
+ ln -s "${DISTDIR}"/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.3.0.jar || die
+ ln -s "${DISTDIR}"/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry-3.5.0.jar || die
+ ln -s "${DISTDIR}"/1FE453D0B251571463F9BE4F51F413BBA5A376A7-org.eclipse.equinox.security-1.0.200.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.0.200.jar || die
+ ln -s "${DISTDIR}"/34E70691382D67EE5C84EF207FB8D3784594BA2C-org.eclipse.jgit-1.0.0.201106090707-r.jar o.eclipse.jgit/external/org.eclipse.jgit-1.0.0.201106090707-r.jar || die
+ ln -s "${DISTDIR}"/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core-3.6.0.jar || die
+ ln -s "${DISTDIR}"/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core-3.6.0.jar || die
+ ln -s "${DISTDIR}"/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net-3.6.0.jar || die
+ ln -s "${DISTDIR}"/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar || die
+ ln -s "${DISTDIR}"/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core-3.6.0.jar || die
+ ln -s "${DISTDIR}"/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip javascript.editing/external/preindexed.zip || die
+ ln -s "${DISTDIR}"/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar extexecution.destroy/external/processtreekiller-1.0.1.jar || die
+ ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+ ln -s "${DISTDIR}"/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip o.mozilla.rhino.patched/external/rhino1_7R2rc1.zip || die
+ ln -s "${DISTDIR}"/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip javascript.editing/external/sdocs.zip || die
+ ln -s "${DISTDIR}"/538D727A9A0874019FB11280F07CE3F43EE723BC-sqljet-1.0.3.jar libs.svnClientAdapter.svnkit/external/sqljet-1.0.3.jar || die
+ ln -s "${DISTDIR}"/0B9606F570B28FFC4FCE6C7222B88B3DCEFB1A36-svnClientAdapter-javahl-1.6.13.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.6.13.jar || die
+ ln -s "${DISTDIR}"/A11623D2AF72A99C1509EC2A0ADA2DACBEE9A8E4-svnClientAdapter-main-1.6.13.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.6.13.jar || die
+ ln -s "${DISTDIR}"/0AE20EC02958F193ADAB4C272ACCF6FE3196DCA0-svnClientAdapter-svnkit-1.6.13.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.6.13.jar || die
+ ln -s "${DISTDIR}"/636C6FF256A978B786D7502F43E788448E9DAB4B-svnkit-1.3.4.jar libs.svnClientAdapter.svnkit/external/svnkit-1.3.4.jar || die
+ ln -s "${DISTDIR}"/AB271CFC19469D9088BE306685A7AC8787373F99-svnkit-javahl.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl.jar || die
+ ln -s "${DISTDIR}"/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar libs.swingx/external/swingx-0.9.5.jar || die
+ ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+ ln -s "${DISTDIR}"/68B82D7246FD90E0FC70BB9C8F10611489BF371A-trilead.jar libs.svnClientAdapter.svnkit/external/trilead.jar || die
+ ln -s "${DISTDIR}"/55CD0B272084EB80B8C91F3A0617BB602B4EF2DF-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+ ln -s "${DISTDIR}"/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar html.validation/external/validator.jar || die
+ ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.destroy/external/winp-1.14-patched.jar || die
+ ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+ ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+ ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+ popd >/dev/null || die
+}
+
+src_prepare() {
+ einfo "Deleting bundled class files..."
+ find -name "*.class" -type f | xargs rm -vf
+
+ epatch netbeans-9999-r1-build.xml.patch
+
+ # Support for custom patches
+ if [ -n "${NETBEANS9999_PATCHES_DIR}" -a -d "${NETBEANS9999_PATCHES_DIR}" ] ; then
+ local files=`find "${NETBEANS9999_PATCHES_DIR}" -type f`
+
+ if [ -n "${files}" ] ; then
+ einfo "Applying custom patches:"
+
+ for file in ${files} ; do
+ epatch "${file}"
+ done
+ fi
+ fi
+
+ einfo "Symlinking external libraries..."
+ java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+ einfo "Linking in other clusters..."
+ mkdir "${S}"/nbbuild/netbeans || die
+ pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+ ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+ cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.platform.built
+
+ ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+ cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.harness.built
+
+ popd >/dev/null || die
+
+ java-pkg_jar-from --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.44.jar
+ java-pkg_jar-from --build-only --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+ java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.13-bin.jar
+ java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-8.3-603.jdbc3.jar
+ java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+ java-pkg_jar-from --into extexecution.destroy/external commons-io-1 commons-io.jar commons-io-1.4.jar
+ java-pkg_jar-from --into html.parser/external icu4j-49 icu4j.jar icu4j-4_0.jar
+ java-pkg_jar-from --into html.validation/external commons-logging commons-logging.jar commons-logging-1.1.1.jar
+ java-pkg_jar-from --into html.validation/external commons-logging commons-logging-api.jar commons-logging-api-1.1.1.jar
+ # java-pkg_jar-from --into html.validation/external jing jing.jar jing.jar
+ java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+ java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+ # java-pkg_jar-from --into libs.antlr3.runtime/external antlr-3 antlr3.jar antlr-runtime-3.1.3.jar
+ # java-pkg_jar-from --into libs.commons_net/external commons-net commons-net.jar commons-net-1.4.1.jar
+ java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.8.jar
+ # java-pkg_jar-from --into libs.ini4j/external ini4j ini4j.jar ini4j-0.5.1.jar
+ # java-pkg_jar-from --into libs.jaxb/external jaxb-2 jaxb-impl.jar jaxb-impl.jar
+ java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
+ java-pkg_jar-from --into libs.lucene/external lucene-3.0 lucene-core.jar lucene-core-3.0.3.jar
+ java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+ java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+ java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.6.0.jar
+ # java-pkg_jar-from --into libs.svnClientAdapter.svnkit/external trilead-ssh2 trilead-ssh2.jar trilead.jar
+ java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+ java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+ java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+ java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+ java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.jar
+ java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+ java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+ java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+ # java-pkg_jar-from --into xml.jaxb.api/external jaxb-2 jaxb-api.jar jaxb-api.jar
+ java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_api.jar
+
+ java-pkg-2_src_prepare
+}
+
+src_compile() {
+ unset DISPLAY
+ eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+ pushd nbbuild/netbeans/ide >/dev/null || die
+
+ insinto ${INSTALL_DIR}
+
+ grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+ doins -r *
+ rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+ rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+ insinto ${INSTALL_DIR}/bin/nativeexecution
+ doins bin/nativeexecution/*
+
+ pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+ for file in *.sh ; do
+ fperms 755 ${file}
+ done
+ popd >/dev/null || die
+
+ if use x86 ; then
+ doins -r bin/nativeexecution/Linux-x86
+ pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+ for file in * ; do
+ fperms 755 ${file}
+ done
+ popd >/dev/null || die
+ elif use amd64 ; then
+ doins -r bin/nativeexecution/Linux-x86_64
+ pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+ for file in * ; do
+ fperms 755 ${file}
+ done
+ popd >/dev/null || die
+ fi
+
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext
+ pushd "${D}"/${instdir} >/dev/null || die
+ # rm antlr-runtime-3.1.3.jar && dosym /usr/share/antlr-3/lib/antlr3.jar ${instdir}/antlr-runtime-3.1.3.jar || die
+ # bytelist-0.1.jar
+ rm commons-logging-api-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging-api.jar ${instdir}/commons-logging-api-1.1.1.jar || die
+ rm commons-logging-1.1.1.jar && dosym /usr/share/commons-logging/lib/commons-logging.jar ${instdir}/commons-logging-1.1.1.jar || die
+ # rm commons-net-1.4.1.jar && dosym /usr/share/commons-net/lib/commons-net.jar ${instdir}/commons-net-1.4.1.jar || die
+ # ddl.jar
+ rm freemarker-2.3.8.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.8.jar || die
+ # html5-datatypes.jar
+ # html5-parser.jar
+ rm icu4j-4_0.jar && dosym /usr/share/icu4j-49/lib/icu4j.jar ${instdir}/icu4j-4_0.jar || die
+ # [[ -f ini4j-0.5.1.jar ]] && java-pkg_jar-from ini4j ini4j.jar ${instdir}/ini4j-0.5.1.jar || die
+ # io-xml-util.jar
+ # iri.jar
+ # isorelax20041111.jar
+ # [[ -f jing.jar ]] && java-pkg_jar-from jing jing.jar ${instdir}/jing.jar || die
+ # js.jar
+ rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
+ # libpam4j-1.1.jar
+ rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+ rm lucene-core-3.0.3.jar && dosym /usr/share/lucene-3.0/lib/lucene-core.jar ${instdir}/lucene-core-3.0.3.jar || die
+ rm mysql-connector-java-5.1.13-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.13-bin.jar || die
+ # non-schema.jar
+ # org.eclipse.mylyn.bugzilla.core_3.3.1.jar
+ # org.eclipse.mylyn.commons.core_3.3.1.jar
+ # org.eclipse.mylyn.commons.net_3.3.0.jar
+ # org.eclipse.mylyn.tasks.core_3.3.1.jar
+ # org-netbeans-tax.jar
+ rm postgresql-8.3-603.jdbc3.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-8.3-603.jdbc3.jar || die
+ # processtreekiller-1.0.1.jar
+ # resolver-1.2.jar
+ rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+ rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+ rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+ rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+ # sqljet-1.0.3.jar
+ # svnClientAdapter-javahl-1.6.13.jar
+ # svnClientAdapter-main-1.6.13.jar
+ # svnClientAdapter-svnkit-1.6.13.jar
+ rm svnjavahl-1.6.0.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl-1.6.0.jar || die
+ # svnkit-javahl.jar
+ # svnkit-1.3.4.jar
+ # swingx-0.9.5.jar
+ # [[ -f trilead.jar ]] && java-pkg_jar-from trilead-ssh2 trilead-ssh2.jar ${instdir}/trilead.jar || die
+ # ValidationAPI.jar
+ # validator.jar
+ # webserver.jar
+ # winp-1.14-patched.jar
+ rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext/jaxb
+ pushd "${D}"/${instdir} >/dev/null || die
+ rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+ # [[ -f jaxb-impl.jar ]] && java-pkg_jar-from jaxb-2 jaxb-impl.jar ${instdir}/jaxb-impl.jar || die
+ # jaxb-xjc.jar
+ # jaxb1-impl.jar
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+ pushd "${D}"/${instdir} >/dev/null || die
+ # [[ -f jaxb-api.jar ]] && java-pkg_jar-from jaxb-2 jaxb-api.jar ${instdir}/jaxb-api.jar || die
+ rm jsr173_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_api.jar || die
+ popd >/dev/null || die
+
+ dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}
diff --git a/dev-java/netbeans-ide/netbeans-ide-7.2-r1.ebuild b/dev-java/netbeans-ide/netbeans-ide-7.2-r1.ebuild
new file mode 100644
index 000000000000..7a8ca51d8b56
--- /dev/null
+++ b/dev-java/netbeans-ide/netbeans-ide-7.2-r1.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/netbeans-ide/netbeans-ide-7.2-r1.ebuild,v 1.1 2012/09/14 20:17:36 fordfrog Exp $
+
+EAPI="4"
+WANT_ANT_TASKS="ant-nodeps"
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Netbeans IDE Cluster"
+HOMEPAGE="http://netbeans.org/projects/ide"
+SLOT="7.2"
+SOURCE_URL="http://download.netbeans.org/netbeans/7.2/final/zip/netbeans-7.2-201207171143-src.zip"
+SRC_URI="${SOURCE_URL}
+ http://dev.gentoo.org/~fordfrog/distfiles/netbeans-7.2-r1-build.xml.patch.bz2
+ http://hg.netbeans.org/binaries/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar
+ http://hg.netbeans.org/binaries/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar
+ http://hg.netbeans.org/binaries/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar
+ http://hg.netbeans.org/binaries/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar
+ http://hg.netbeans.org/binaries/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip
+ http://hg.netbeans.org/binaries/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip
+ http://hg.netbeans.org/binaries/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip
+ http://hg.netbeans.org/binaries/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip
+ http://hg.netbeans.org/binaries/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar
+ http://hg.netbeans.org/binaries/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip
+ http://hg.netbeans.org/binaries/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar
+ http://hg.netbeans.org/binaries/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar
+ http://hg.netbeans.org/binaries/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar
+ http://hg.netbeans.org/binaries/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar
+ http://hg.netbeans.org/binaries/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip
+ http://hg.netbeans.org/binaries/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar
+ http://hg.netbeans.org/binaries/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip
+ http://hg.netbeans.org/binaries/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar
+ http://hg.netbeans.org/binaries/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar
+ http://hg.netbeans.org/binaries/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar
+ http://hg.netbeans.org/binaries/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar
+ http://hg.netbeans.org/binaries/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip
+ http://hg.netbeans.org/binaries/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip
+ http://hg.netbeans.org/binaries/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar
+ http://hg.netbeans.org/binaries/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar
+ http://hg.netbeans.org/binaries/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar
+ http://hg.netbeans.org/binaries/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar
+ http://hg.netbeans.org/binaries/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar
+ http://hg.netbeans.org/binaries/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar
+ http://hg.netbeans.org/binaries/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar
+ http://hg.netbeans.org/binaries/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar
+ http://hg.netbeans.org/binaries/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar
+ http://hg.netbeans.org/binaries/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar
+ http://hg.netbeans.org/binaries/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar
+ http://hg.netbeans.org/binaries/B24FB024EA57B794FA1433CE974102507A231539-org.eclipse.equinox.security-1.0.200.jar
+ http://hg.netbeans.org/binaries/A00DC524B1D1DB1ABBF95407AA3E6009C3D2C157-org.eclipse.jgit-1.3.0.201202151440-r.jar
+ http://hg.netbeans.org/binaries/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar
+ http://hg.netbeans.org/binaries/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar
+ http://hg.netbeans.org/binaries/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar
+ http://hg.netbeans.org/binaries/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar
+ http://hg.netbeans.org/binaries/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar
+ http://hg.netbeans.org/binaries/2EB57252FE095468DF7CA74E5D0D5882D17DAB11-org.tmatesoft.svnkit_1.7.4.t20120412_2022.jar
+ http://hg.netbeans.org/binaries/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip
+ http://hg.netbeans.org/binaries/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar
+ http://hg.netbeans.org/binaries/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar
+ http://hg.netbeans.org/binaries/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip
+ http://hg.netbeans.org/binaries/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip
+ http://hg.netbeans.org/binaries/0E30D36ADF1728F6CFE1E87DF71C5541D3E61931-svnClientAdapter-javahl-1.8.5.jar
+ http://hg.netbeans.org/binaries/84D26BD9524B46955910CE6704812E2308F1D518-svnClientAdapter-main-1.8.5.jar
+ http://hg.netbeans.org/binaries/076FCE66657A48670381BA94B0492C991CF10375-svnClientAdapter-svnkit-1.8.5.jar
+ http://hg.netbeans.org/binaries/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar
+ http://hg.netbeans.org/binaries/8ECD1EA66F54C0D5FB20186FD4918D9520096054-sqljet-1.1.0.jar
+ http://hg.netbeans.org/binaries/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar
+ http://hg.netbeans.org/binaries/97484EC8B82D84D6957976C2DCF1740AAD708054-com.trilead.ssh2_1.0.0.build214.jar
+ http://hg.netbeans.org/binaries/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar
+ http://hg.netbeans.org/binaries/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar
+ http://hg.netbeans.org/binaries/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar
+ http://hg.netbeans.org/binaries/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar
+ http://hg.netbeans.org/binaries/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar
+ http://hg.netbeans.org/binaries/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar"
+LICENSE="|| ( CDDL GPL-2-with-linking-exception )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}"
+
+CDEPEND="~dev-java/netbeans-harness-${PV}
+ ~dev-java/netbeans-platform-${PV}
+ dev-java/commons-httpclient:3
+ dev-java/commons-io:1
+ dev-java/commons-lang:2.1
+ dev-java/commons-logging:0
+ dev-java/freemarker:2.3
+ dev-java/icu4j:49
+ dev-java/iso-relax:0
+ dev-java/jdbc-mysql:0
+ dev-java/jdbc-postgresql:0
+ dev-java/jsr173:0
+ dev-java/jvyamlb:0
+ dev-java/log4j:0
+ dev-java/lucene:3.5
+ dev-java/rhino:1.6
+ dev-java/saxon:9
+ dev-java/smack:2.2
+ dev-java/sun-jaf:0
+ dev-java/tomcat-servlet-api:2.2
+ dev-java/ws-commons-util:0
+ dev-java/xerces:2
+ dev-vcs/subversion:0[java]"
+# app-text/jing:0 our version is probably too old
+# dev-java/commons-io fails with following error:
+# Missing manifest tag OpenIDE-Module; /var/tmp/portage/dev-java/netbeans-ide-9999_p20110911/work/nbbuild/netbeans/ide/modules/org-apache-commons-io.jar is not a module
+# dev-java/ini4j:0 our version is too old
+# dev-java/jaxb:2 upstream version contains more stuff so websvccommon does not compile with ours
+# dev-java/trilead-ssh2:0 in overlay
+DEPEND="virtual/jdk:1.6
+ app-arch/unzip
+ dev-java/commons-codec:0
+ dev-java/jsch:0
+ dev-java/jzlib:0
+ ${CDEPEND}
+ dev-java/javacc:0
+ dev-java/javahelp:0"
+RDEPEND=">=virtual/jdk-1.6
+ ${CDEPEND}"
+
+INSTALL_DIR="/usr/share/${PN}-${SLOT}"
+
+EANT_BUILD_XML="nbbuild/build.xml"
+EANT_BUILD_TARGET="rebuild-cluster"
+EANT_EXTRA_ARGS="-Drebuild.cluster.name=nb.cluster.ide -Dext.binaries.downloaded=true -Djava.awt.headless=true"
+EANT_FILTER_COMPILER="ecj-3.3 ecj-3.4 ecj-3.5 ecj-3.6 ecj-3.7"
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+ unpack $(basename ${SOURCE_URL})
+
+ einfo "Deleting bundled jars..."
+ find -name "*.jar" -type f -delete
+
+ unpack netbeans-7.2-r1-build.xml.patch.bz2
+
+ pushd "${S}" >/dev/null || die
+ ln -s "${DISTDIR}"/B7ADB35C7BC16AFA8AE49C4D61F87E607BDADB41-antlr-runtime-3.3.jar libs.antlr3.runtime/external/antlr-runtime-3.3.jar || die
+ ln -s "${DISTDIR}"/886FAF4B85054DD6E50D9B3438542F432B5F9251-bytelist-0.1.jar libs.bytelist/external/bytelist-0.1.jar || die
+ ln -s "${DISTDIR}"/643CC426B9F75AA111FAC0FAC0E52FF5D991A337-commons-net-3.0.1.jar libs.commons_net/external/commons-net-3.0.1.jar || die
+ ln -s "${DISTDIR}"/A8762D07E76CFDE2395257A5DA47BA7C1DBD3DCE-commons-io-1.4.jar o.apache.commons.io/external/commons-io-1.4.jar ||die
+ ln -s "${DISTDIR}"/901D8F815922C435D985DA3814D20E34CC7622CB-css21-spec.zip css.editor/external/css21-spec.zip || die
+ ln -s "${DISTDIR}"/53AFD6CAA1B476204557B0626E7D673FBD5D245C-css3-spec.zip css.editor/external/css3-spec.zip || die
+ ln -s "${DISTDIR}"/C9A6304FAA121C97CB2458B93D30B1FD6F0F7691-derbysampledb.zip derby/external/derbysampledb.zip || die
+ ln -s "${DISTDIR}"/23123BB29025254556B6E573023FCDF0F6715A66-html-4.01.zip html.editor/external/html-4.01.zip || die
+ ln -s "${DISTDIR}"/77DB1AFF3C0730C144D30C9935A1CD8DCD2488A9-html5-datatypes.jar html.validation/external/html5-datatypes.jar || die
+ ln -s "${DISTDIR}"/4388C34B9F085A42FBEA06C5B00FDF0A251171EC-html5doc.zip html.parser/external/html5doc.zip || die
+ ln -s "${DISTDIR}"/D528B44AE7593D2275927396BF930B28078C5220-htmlparser-1.2.1.jar html.parser/external/htmlparser-1.2.1.jar || die
+ ln -s "${DISTDIR}"/8E737D82ECAC9BA6100A9BBA71E92A381B75EFDC-ini4j-0.5.1.jar libs.ini4j/external/ini4j-0.5.1.jar || die
+ ln -s "${DISTDIR}"/A2862B7795EF0E0F0716BEC84528FA3B629E479C-io-xml-util.jar html.validation/external/io-xml-util.jar || die
+ ln -s "${DISTDIR}"/0DCC973606CBD9737541AA5F3E76DED6E3F4D0D0-iri.jar html.validation/external/iri.jar || die
+ ln -s "${DISTDIR}"/F90E3DA5259DB07F36E6987EFDED647A5231DE76-ispell-enwl-3.1.20.zip spellchecker.dictionary_en/external/ispell-enwl-3.1.20.zip || die
+ ln -s "${DISTDIR}"/71F434378F822B09A57174AF6C75D37408687C57-jaxb-api.jar xml.jaxb.api/external/jaxb-api.jar || die
+ ln -s "${DISTDIR}"/27FAE927B5B9AE53A5B0ED825575DD8217CE7042-jaxb-api-doc.zip libs.jaxb/external/jaxb-api-doc.zip || die
+ ln -s "${DISTDIR}"/387BE740EAEF52B3F6E6EE2F140757E7632584CE-jaxb-impl.jar libs.jaxb/external/jaxb-impl.jar || die
+ ln -s "${DISTDIR}"/C3787DAB0DDFBD9E98086ED2F219859B0CB77EF7-jaxb-xjc.jar libs.jaxb/external/jaxb-xjc.jar || die
+ ln -s "${DISTDIR}"/F4DB465F207907A2406B0BF5C8FFEE22A5C3E4E3-jaxb1-impl.jar libs.jaxb/external/jaxb1-impl.jar || die
+ ln -s "${DISTDIR}"/C0C5653D2200F2BD2E834B26DFDBC830D07FA0F4-jing.jar html.validation/external/jing.jar || die
+ ln -s "${DISTDIR}"/098B14300B35E1053AA9945FF2C1CDA164F43B33-js-domstubs.zip javascript.editing/external/js-domstubs.zip || die
+ ln -s "${DISTDIR}"/5756AA27E54A3EC6C8CDAE32F49BCA7BC139EB15-jsstubs.zip javascript.editing/external/jsstubs.zip || die
+ ln -s "${DISTDIR}"/2E07375E5CA3A452472F0E87FB33F243F7A5C08C-libpam4j-1.1.jar extexecution.destroy/external/libpam4j-1.1.jar || die
+ ln -s "${DISTDIR}"/A1C0ED8C43A306E3FB7676E7463204B9DA9BE290-non-schema.jar html.validation/external/non-schema.jar || die
+ ln -s "${DISTDIR}"/DF8DD2981C9C3EBEDB059CA98450B587E784AF58-org.eclipse.core.contenttype-3.4.100.jar o.eclipse.core.contenttype/external/org.eclipse.core.contenttype-3.4.100.jar || die
+ ln -s "${DISTDIR}"/A71B23F287BB0CB27E3A5B7808AC07D45BE44841-org.eclipse.core.jobs-3.5.1.jar o.eclipse.core.jobs/external/org.eclipse.core.jobs-3.5.1.jar || die
+ ln -s "${DISTDIR}"/93CDEDB00404BF3C56AD3BF0501A9E7A09BD2108-org.eclipse.core.net-1.2.100.jar o.eclipse.core.net/external/org.eclipse.core.net-1.2.100.jar || die
+ ln -s "${DISTDIR}"/46735A729401036FC2C14CC05257ACB4CD4F6906-org.eclipse.core.runtime-3.6.0.jar o.eclipse.core.runtime/external/org.eclipse.core.runtime-3.6.0.jar || die
+ ln -s "${DISTDIR}"/9C98C277CFFBB4CA06CAFD5820562EF7B5100F5C-org.eclipse.core.runtime.compatibility.auth-3.2.200.jar o.eclipse.core.runtime.compatibility.auth/external/org.eclipse.core.runtime.compatibility.auth-3.2.200.jar || die
+ ln -s "${DISTDIR}"/8A288BD66E90B1081F843A17F95973514ED55A97-org.eclipse.equinox.app-1.3.1.jar o.eclipse.equinox.app/external/org.eclipse.equinox.app-1.3.1.jar || die
+ ln -s "${DISTDIR}"/491025C38F84A6FF9823315A74A0CAC4C30E51A8-org.eclipse.equinox.common-3.6.0.jar o.eclipse.equinox.common/external/org.eclipse.equinox.common-3.6.0.jar || die
+ ln -s "${DISTDIR}"/F411AB988320260361C3611714CA5AF1480CD1A3-org.eclipse.equinox.preferences-3.3.0.jar o.eclipse.equinox.preferences/external/org.eclipse.equinox.preferences-3.3.0.jar || die
+ ln -s "${DISTDIR}"/AD19FF36B5D976E5B4F289B5ACB32967216C1B2D-org.eclipse.equinox.registry-3.5.0.jar o.eclipse.equinox.registry/external/org.eclipse.equinox.registry-3.5.0.jar || die
+ ln -s "${DISTDIR}"/B24FB024EA57B794FA1433CE974102507A231539-org.eclipse.equinox.security-1.0.200.jar o.eclipse.equinox.security/external/org.eclipse.equinox.security-1.0.200.jar || die
+ ln -s "${DISTDIR}"/A00DC524B1D1DB1ABBF95407AA3E6009C3D2C157-org.eclipse.jgit-1.3.0.201202151440-r.jar o.eclipse.jgit/external/org.eclipse.jgit-1.3.0.201202151440-r.jar || die
+ ln -s "${DISTDIR}"/6AC191F42860D1698C9268AE044AFAA5FE806CE7-org.eclipse.mylyn.bugzilla.core-3.6.0.jar o.eclipse.mylyn.bugzilla.core/external/org.eclipse.mylyn.bugzilla.core-3.6.0.jar || die
+ ln -s "${DISTDIR}"/4617423828BC2E79A1871949C2914285405D8EFF-org.eclipse.mylyn.commons.core-3.6.0.jar o.eclipse.mylyn.commons.core/external/org.eclipse.mylyn.commons.core-3.6.0.jar || die
+ ln -s "${DISTDIR}"/053602E0177D42BF707019F1BC646193A899D571-org.eclipse.mylyn.commons.net-3.6.0.jar o.eclipse.mylyn.commons.net/external/org.eclipse.mylyn.commons.net-3.6.0.jar || die
+ ln -s "${DISTDIR}"/032EFC784E1DE21E4093C08F336C7582F5694760-org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar o.eclipse.mylyn.commons.xmlrpc/external/org.eclipse.mylyn.commons.xmlrpc-3.6.0.jar || die
+ ln -s "${DISTDIR}"/5D73EEAEABC42C6FCB85593D1F5B04ACBDFAA0F9-org.eclipse.mylyn.tasks.core-3.6.0.jar o.eclipse.mylyn.tasks.core/external/org.eclipse.mylyn.tasks.core-3.6.0.jar || die
+ ln -s "${DISTDIR}"/2EB57252FE095468DF7CA74E5D0D5882D17DAB11-org.tmatesoft.svnkit_1.7.4.t20120412_2022.jar libs.svnClientAdapter.svnkit/external/org.tmatesoft.svnkit_1.7.4.t20120412_2022.jar || die
+ ln -s "${DISTDIR}"/CD33537FD47E801E01B427997F3DE4016159B414-preindexed.zip javascript.editing/external/preindexed.zip || die
+ ln -s "${DISTDIR}"/E66876EB5F33AA0E57F035F1AADD8C44FEAE7FCB-processtreekiller-1.0.1.jar extexecution.destroy/external/processtreekiller-1.0.1.jar || die
+ ln -s "${DISTDIR}"/B0D0FCBAC68826D2AFA3C7C89FC4D57B95A000C3-resolver-1.2.jar o.apache.xml.resolver/external/resolver-1.2.jar || die
+ ln -s "${DISTDIR}"/1162833E0FE87B69B99B1F7DEB3A6C386EAB6F84-rhino1_7R2rc1.zip o.mozilla.rhino.patched/external/rhino1_7R2rc1.zip || die
+ ln -s "${DISTDIR}"/C56F4F5C42102A67F56EB8F12D0219E92E5307C2-sdocs.zip javascript.editing/external/sdocs.zip || die
+ ln -s "${DISTDIR}"/8ECD1EA66F54C0D5FB20186FD4918D9520096054-sqljet-1.1.0.jar libs.svnClientAdapter.svnkit/external/sqljet-1.1.0.jar || die
+ ln -s "${DISTDIR}"/0E30D36ADF1728F6CFE1E87DF71C5541D3E61931-svnClientAdapter-javahl-1.8.5.jar libs.svnClientAdapter.javahl/external/svnClientAdapter-javahl-1.8.5.jar || die
+ ln -s "${DISTDIR}"/84D26BD9524B46955910CE6704812E2308F1D518-svnClientAdapter-main-1.8.5.jar libs.svnClientAdapter/external/svnClientAdapter-main-1.8.5.jar || die
+ ln -s "${DISTDIR}"/076FCE66657A48670381BA94B0492C991CF10375-svnClientAdapter-svnkit-1.8.5.jar libs.svnClientAdapter.svnkit/external/svnClientAdapter-svnkit-1.8.5.jar || die
+ ln -s "${DISTDIR}"/3B91269E9055504778F57744D24F505856698602-svnkit-1.7.0-beta4-20120316.233307-1.jar libs.svnClientAdapter.svnkit/external/svnkit-1.7.0-beta4-20120316.233307-1.jar || die
+ ln -s "${DISTDIR}"/015525209A02BD74254930FF844C7C13498B7FB9-svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar libs.svnClientAdapter.svnkit/external/svnkit-javahl16-1.7.0-beta4-20120316.233536-1.jar || die
+ ln -s "${DISTDIR}"/7C6ED64C55164C5AE0394E11303CA95CB24166AF-swingx-0.9.5.jar libs.swingx/external/swingx-0.9.5.jar || die
+ ln -s "${DISTDIR}"/CD5B5996B46CB8D96C8F0F89A7A734B3C01F3DF7-tomcat-webserver-3.2.jar httpserver/external/tomcat-webserver-3.2.jar || die
+ ln -s "${DISTDIR}"/97484EC8B82D84D6957976C2DCF1740AAD708054-com.trilead.ssh2_1.0.0.build214.jar libs.svnClientAdapter.svnkit/external/com.trilead.ssh2_1.0.0.build214.jar || die
+ ln -s "${DISTDIR}"/89BC047153217F5254506F4C622A771A78883CBC-ValidationAPI.jar swing.validation/external/ValidationAPI.jar || die
+ ln -s "${DISTDIR}"/7A5A7DF07297A86A944D4D0562C685585B0734EF-validator.jar html.validation/external/validator.jar || die
+ ln -s "${DISTDIR}"/C9757EFB2CFBA523A7375A78FA9ECFAF0D0AC505-winp-1.14-patched.jar extexecution.destroy/external/winp-1.14-patched.jar || die
+ ln -s "${DISTDIR}"/64F5BEEADD2A239C4BC354B8DFDB97CF7FDD9983-xmlrpc-client-3.0.jar o.apache.xmlrpc/external/xmlrpc-client-3.0.jar || die
+ ln -s "${DISTDIR}"/8FA16AD28B5E79A7CD52B8B72985B0AE8CCD6ADF-xmlrpc-common-3.0.jar o.apache.xmlrpc/external/xmlrpc-common-3.0.jar || die
+ ln -s "${DISTDIR}"/D6917BF718583002CBE44E773EE21E2DF08ADC71-xmlrpc-server-3.0.jar o.apache.xmlrpc/external/xmlrpc-server-3.0.jar || die
+ popd >/dev/null || die
+}
+
+src_prepare() {
+ einfo "Deleting bundled class files..."
+ find -name "*.class" -type f | xargs rm -vf
+
+ epatch netbeans-7.2-r1-build.xml.patch
+
+ # Support for custom patches
+ if [ -n "${NETBEANS72_PATCHES_DIR}" -a -d "${NETBEANS72_PATCHES_DIR}" ] ; then
+ local files=`find "${NETBEANS72_PATCHES_DIR}" -type f`
+
+ if [ -n "${files}" ] ; then
+ einfo "Applying custom patches:"
+
+ for file in ${files} ; do
+ epatch "${file}"
+ done
+ fi
+ fi
+
+ einfo "Symlinking external libraries..."
+ java-pkg_jar-from --build-only --into javahelp/external javahelp jhall.jar jhall-2.0_05.jar
+
+ einfo "Linking in other clusters..."
+ mkdir "${S}"/nbbuild/netbeans || die
+ pushd "${S}"/nbbuild/netbeans >/dev/null || die
+
+ ln -s /usr/share/netbeans-platform-${SLOT} platform || die
+ cat /usr/share/netbeans-platform-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.platform.built
+
+ ln -s /usr/share/netbeans-harness-${SLOT} harness || die
+ cat /usr/share/netbeans-harness-${SLOT}/moduleCluster.properties >> moduleCluster.properties || die
+ touch nb.cluster.harness.built
+
+ popd >/dev/null || die
+
+ java-pkg_jar-from --build-only --into c.jcraft.jsch/external jsch jsch.jar jsch-0.1.45.jar
+ java-pkg_jar-from --build-only --into c.jcraft.jzlib/external jzlib jzlib.jar jzlib-1.0.7.jar
+ java-pkg_jar-from --into db.drivers/external jdbc-mysql jdbc-mysql.jar mysql-connector-java-5.1.18-bin.jar
+ java-pkg_jar-from --into db.drivers/external jdbc-postgresql jdbc-postgresql.jar postgresql-9.1-901.jdbc4.jar
+ java-pkg_jar-from --build-only --into db.sql.visualeditor/external javacc javacc.jar javacc-3.2.jar
+ java-pkg_jar-from --into extexecution.destroy/external commons-io-1 commons-io.jar commons-io-1.4.jar
+ java-pkg_jar-from --into html.parser/external icu4j-49 icu4j.jar icu4j-4_0.jar
+ java-pkg_jar-from --into html.validation/external iso-relax isorelax.jar isorelax20041111.jar
+ java-pkg_jar-from --into html.validation/external log4j log4j.jar log4j-1.2.15.jar
+ java-pkg_jar-from --into html.validation/external rhino-1.6 js.jar js.jar
+ java-pkg_jar-from --into html.validation/external saxon-9 saxon.jar saxon9B.jar
+ java-pkg_jar-from --into libs.freemarker/external freemarker-2.3 freemarker.jar freemarker-2.3.8.jar
+ java-pkg_jar-from --into libs.jvyamlb/external jvyamlb jvyamlb.jar jvyamlb-0.2.3.jar
+ java-pkg_jar-from --into libs.lucene/external lucene-3.5 lucene-core.jar lucene-core-3.5.0.jar
+ java-pkg_jar-from --into libs.smack/external smack-2.2 smack.jar smack.jar
+ java-pkg_jar-from --into libs.smack/external smack-2.2 smackx.jar smackx.jar
+ java-pkg_jar-from --into libs.svnClientAdapter.javahl/external subversion svn-javahl.jar svnjavahl-1.7.2.jar
+ java-pkg_jar-from --into libs.xerces/external xerces-2 xercesImpl.jar xerces-2.8.0.jar
+ java-pkg_jar-from --build-only --into o.apache.commons.codec/external commons-codec commons-codec.jar apache-commons-codec-1.3.jar
+ java-pkg_jar-from --into o.apache.commons.httpclient/external commons-httpclient-3 commons-httpclient.jar commons-httpclient-3.1.jar
+ java-pkg_jar-from --into o.apache.commons.lang/external commons-lang-2.1 commons-lang.jar commons-lang-2.4.jar
+ java-pkg_jar-from --into o.apache.commons.logging/external commons-logging commons-logging.jar commons-logging-1.1.jar
+ java-pkg_jar-from --into o.apache.ws.commons.util/external ws-commons-util ws-commons-util.jar ws-commons-util-1.0.1.jar
+ java-pkg_jar-from --into servletapi/external tomcat-servlet-api-2.2 servlet.jar servlet-2.2.jar
+ java-pkg_jar-from --into xml.jaxb.api/external sun-jaf activation.jar activation.jar
+ java-pkg_jar-from --into xml.jaxb.api/external jsr173 jsr173.jar jsr173_1.0_api.jar
+
+ java-pkg-2_src_prepare
+}
+
+src_compile() {
+ unset DISPLAY
+ eant -f ${EANT_BUILD_XML} ${EANT_EXTRA_ARGS} ${EANT_BUILD_TARGET} || die "Compilation failed"
+}
+
+src_install() {
+ pushd nbbuild/netbeans/ide >/dev/null || die
+
+ insinto ${INSTALL_DIR}
+
+ grep -E "/ide$" ../moduleCluster.properties > "${D}"/${INSTALL_DIR}/moduleCluster.properties || die
+
+ doins -r *
+ rm -fr "${D}"/${INSTALL_DIR}/bin/nativeexecution || die
+ rm -fr "${D}"/${INSTALL_DIR}/modules/lib || die
+
+ insinto ${INSTALL_DIR}/bin/nativeexecution
+ doins bin/nativeexecution/*
+
+ pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution >/dev/null || die
+ for file in *.sh ; do
+ fperms 755 ${file}
+ done
+ popd >/dev/null || die
+
+ if use x86 ; then
+ doins -r bin/nativeexecution/Linux-x86
+ pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86 >/dev/null || die
+ for file in * ; do
+ fperms 755 ${file}
+ done
+ popd >/dev/null || die
+ elif use amd64 ; then
+ doins -r bin/nativeexecution/Linux-x86_64
+ pushd "${D}"/${INSTALL_DIR}/bin/nativeexecution/Linux-x86_64 >/dev/null || die
+ for file in * ; do
+ fperms 755 ${file}
+ done
+ popd >/dev/null || die
+ fi
+
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext
+ pushd "${D}"/${instdir} >/dev/null || die
+ rm freemarker-2.3.8.jar && dosym /usr/share/freemarker-2.3/lib/freemarker.jar ${instdir}/freemarker-2.3.8.jar || die
+ rm icu4j-4_0.jar && dosym /usr/share/icu4j-49/lib/icu4j.jar ${instdir}/icu4j-4_0.jar || die
+ rm isorelax20041111.jar && dosym /usr/share/iso-relax/lib/isorelax.jar ${instdir}/isorelax20041111.jar || die
+ rm js.jar && dosym /usr/share/rhino-1.6/lib/js.jar ${instdir}/js.jar || die
+ rm jvyamlb-0.2.3.jar && dosym /usr/share/jvyamlb/lib/jvyamlb.jar ${instdir}/jvyamlb-0.2.3.jar || die
+ rm log4j-1.2.15.jar && dosym /usr/share/log4j/lib/log4j.jar ${instdir}/log4j-1.2.15.jar || die
+ rm lucene-core-3.5.0.jar && dosym /usr/share/lucene-3.5/lib/lucene-core.jar ${instdir}/lucene-core-3.5.0.jar || die
+ rm mysql-connector-java-5.1.18-bin.jar && dosym /usr/share/jdbc-mysql/lib/jdbc-mysql.jar ${instdir}/mysql-connector-java-5.1.18-bin.jar || die
+ rm postgresql-9.1-901.jdbc4.jar && dosym /usr/share/jdbc-postgresql/lib/jdbc-postgresql.jar ${instdir}/postgresql-9.1-901.jdbc4.jar || die
+ rm saxon9B.jar && dosym /usr/share/saxon-9/lib/saxon.jar ${instdir}/saxon9B.jar || die
+ rm servlet-2.2.jar && dosym /usr/share/tomcat-servlet-api-2.2/lib/servlet.jar ${instdir}/servlet-2.2.jar || die
+ rm smack.jar && dosym /usr/share/smack-2.2/lib/smack.jar ${instdir}/smack.jar || die
+ rm smackx.jar && dosym /usr/share/smack-2.2/lib/smackx.jar ${instdir}/smackx.jar || die
+ rm svnjavahl-1.7.2.jar && dosym /usr/share/subversion/lib/svn-javahl.jar ${instdir}/svnjavahl-1.7.2.jar || die
+ rm xerces-2.8.0.jar && dosym /usr/share/xerces-2/lib/xercesImpl.jar ${instdir}/xerces-2.8.0.jar || die
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext/jaxb
+ pushd "${D}"/${instdir} >/dev/null || die
+ rm activation.jar && dosym /usr/share/sun-jaf/lib/activation.jar ${instdir}/activation.jar || die
+ popd >/dev/null || die
+
+ local instdir=${INSTALL_DIR}/modules/ext/jaxb/api
+ pushd "${D}"/${instdir} >/dev/null || die
+ rm jsr173_1.0_api.jar && dosym /usr/share/jsr173/lib/jsr173.jar ${instdir}/jsr173_1.0_api.jar || die
+ popd >/dev/null || die
+
+ dosym ${INSTALL_DIR} /usr/share/netbeans-nb-${SLOT}/ide
+}
diff --git a/dev-lang/go/go-1.0.2.ebuild b/dev-lang/go/go-1.0.2.ebuild
index e494fcb79388..e830e9c5f8ed 100644
--- a/dev-lang/go/go-1.0.2.ebuild
+++ b/dev-lang/go/go-1.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.0.2.ebuild,v 1.3 2012/09/01 17:34:11 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.0.2.ebuild,v 1.4 2012/09/14 18:29:06 maekke Exp $
EAPI=4
@@ -15,7 +15,7 @@ inherit bash-completion-r1 elisp-common eutils
if [[ ${PV} != 9999 ]]; then
SRC_URI="http://go.googlecode.com/files/go${PV}.src.tar.gz"
# Upstream only supports go on amd64, arm and x86 architectures.
- KEYWORDS="-* ~amd64 ~x86"
+ KEYWORDS="-* ~amd64 ~arm ~x86"
fi
DESCRIPTION="A concurrent garbage collected and typesafe programming language"
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index e9a4a77e3d5e..6d1e15d0bcfb 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -13,6 +13,6 @@ DIST swi-prolog-6.0.1-gentoo-patchset-2.tar.gz 5328 SHA256 3822c85351b47364c121e
DIST swi-prolog-6.1.11-gentoo-patchset-0.tar.gz 3446 SHA256 fc1eb64315866bcb5818371b368298416353b1d7eb21b953e9018a899f686948
DIST swi-prolog-6.1.12-gentoo-patchset-0.tar.gz 3433 SHA256 c8f7e51db45cbd187ef7152df0a52056bf9c808949101a2158e31e8314087e9b
DIST swi-prolog-6.1.13-gentoo-patchset-0.tar.gz 3435 SHA256 a16df5de519ec53ce233780ff211d35a597ea1a82633b35c7c9487efbd4019fe SHA512 a6c0a0fcac6e6b17cdacaef280a460a9aa11b8a217adbddf2f6212f3d3db550785650aafbe39710a541dace4aba466d9cb033e0814e2bac9a71ccb514d8e61ef WHIRLPOOL aece994301ee3197a9f4799cfe725c2b3a0bddc44423fc55e981099d708fe2b80bc1cfee112a998750e87807ea3dbd734cf7e35a82b8ceca7f4cf575eda147c1
-DIST swi-prolog-6.2.0-gentoo-patchset-1.tar.gz 3773 SHA256 463ea14066dbbbd9d1c31edd9e1d29c3371ce71cdc56446e81c7a88bece72fc7 SHA512 bce3ec47c91b2f8270080be63cf9252824e81d07616e99dfd51128421b09bcc72f8de5450e387a748b5202193f3e70fea9b0b7319335924bc8fd2c3a0ed9e3fd WHIRLPOOL 635455d20ec48a24e11a89627c5cbad2bafa418f8f85c1e876be5f7b9f40928ccbde34ff16d0112f5e3366fbb19247ff10ceb73562d0412b34a0dcfef1497784
-DIST swi-prolog-6.2.1-gentoo-patchset-0.tar.gz 3184 SHA256 2503380216e2033a0e50e44931605e91bae9bb98c82885a193f072e0b90821fd SHA512 12456a3ecf834604156a088c2041289efa386077766ea6d87001738cf95d08ea22a105016187cd929e42ee8aace6307c66a2e200fc7e2849a6489c7a86f2e4c9 WHIRLPOOL f8b007a431990dbd45db83b836e7eede552dca4acf3458823dc59ca8731e0dfb5b9c32790513da4dd6abc0f6a50baf11813fe7d426fa4d93c0b32280c5e5a1d6
-DIST swi-prolog-6.3.0-gentoo-patchset-0.tar.gz 3191 SHA256 9418e130592cdc5b8ffdacaf1915214d2ddde4a5bcba6c762c530124796536ec SHA512 5ae5d4d77f98fcc25a0bd993e9f000e15e44e01f685f990ce044d365148a0937e46a4f9b3999736c6badaef6256397dea7c20a54d358cfe41278676ebc350828 WHIRLPOOL afeae1ec37450ead4612e263fe4c58c6034300b87eeadd3b8295cf4b6660ec64395b290230aa3f15482ef03e767cdf44aead830131ae454c30a90975b8a1d703
+DIST swi-prolog-6.2.0-gentoo-patchset-3.tar.gz 4688 SHA256 f4c4e8720afcac36f01eb141f878de0423a3c083de931d52b7b95b35fb7dd0bc SHA512 b4130952814623ac321a7a303892e1ea954b19b850b2f2452e5af97bd9f0dcad4fdc3bdbb09b5f2f5a03160ee426b2098342c445804fe1abda0aa3ff64882ff3 WHIRLPOOL 3013deabbb03e440d7a2dbf12694ac029b54f4f24622996842b03c72304e972675da4997d45023a88e9d341f75134acff2f91f537e049ecd85b16239bef02ad6
+DIST swi-prolog-6.2.1-gentoo-patchset-2.tar.gz 4098 SHA256 df8c9b60cdde4eb5f17984dc13d328dfa2f3ac29c6be40b0e8f801a074d7133f SHA512 ce68e2283fedbc8e4d332f639c170555fca0ed22ff5f00ad622ba8ed3dc754f0baacf33862036a4c752d8bc53ab8642c207207033873b16f8509e654cd695801 WHIRLPOOL 438038f7438476d1477df78644b8fd14c44a58ff65faebe512f21b2f105169633d0c6ac0ef68b6c686e6773a04479de116f662f938539fecb6a538c39fd7b386
+DIST swi-prolog-6.3.0-gentoo-patchset-2.tar.gz 4107 SHA256 28e474d039f3bda20b82915aa8cf6a337fad57c6ef572714a460c250b3b8a5d0 SHA512 17c2f213405f0688e71f76807d6c335f5679aef1084037e013e14f09f9ab5cbb6320ace18b78001b0b97ab9991a59e5dae7a8a843a4fff64238efc33ac8194ef WHIRLPOOL 642a7a0f8bce8d75af8c610774cb880ff7b0b5cee56aafa74d9327256a0a67470563d000195d340541ef5e998ebf24c2a0c4bb6917bcadae3d5e51cd3c1905e7
diff --git a/dev-lang/swi-prolog/swi-prolog-6.2.0.ebuild b/dev-lang/swi-prolog/swi-prolog-6.2.0.ebuild
index baec6d73676a..d86b49170bae 100644
--- a/dev-lang/swi-prolog/swi-prolog-6.2.0.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-6.2.0.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-lang/swi-prolog/swi-prolog-6.2.0.ebuild,v 1.2 2012/08/24 09:09:31 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.2.0.ebuild,v 1.4 2012/09/14 20:31:35 keri Exp $
EAPI=2
inherit eutils flag-o-matic java-pkg-opt-2 multilib
-PATCHSET_VER="1"
+PATCHSET_VER="3"
DESCRIPTION="free, small, and standard compliant Prolog compiler"
HOMEPAGE="http://www.swi-prolog.org/"
diff --git a/dev-lang/swi-prolog/swi-prolog-6.2.1.ebuild b/dev-lang/swi-prolog/swi-prolog-6.2.1.ebuild
index 1d9d7ce4dd5d..4c88c3ea9a86 100644
--- a/dev-lang/swi-prolog/swi-prolog-6.2.1.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-6.2.1.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-lang/swi-prolog/swi-prolog-6.2.1.ebuild,v 1.1 2012/09/12 12:00:13 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.2.1.ebuild,v 1.3 2012/09/14 20:31:35 keri Exp $
EAPI=2
inherit eutils flag-o-matic java-pkg-opt-2 multilib
-PATCHSET_VER="0"
+PATCHSET_VER="2"
DESCRIPTION="free, small, and standard compliant Prolog compiler"
HOMEPAGE="http://www.swi-prolog.org/"
diff --git a/dev-lang/swi-prolog/swi-prolog-6.3.0.ebuild b/dev-lang/swi-prolog/swi-prolog-6.3.0.ebuild
index 3833aed20808..a5786be961c9 100644
--- a/dev-lang/swi-prolog/swi-prolog-6.3.0.ebuild
+++ b/dev-lang/swi-prolog/swi-prolog-6.3.0.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-lang/swi-prolog/swi-prolog-6.3.0.ebuild,v 1.1 2012/08/31 14:33:30 keri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/swi-prolog/swi-prolog-6.3.0.ebuild,v 1.3 2012/09/14 20:31:35 keri Exp $
EAPI=2
inherit eutils flag-o-matic java-pkg-opt-2 multilib
-PATCHSET_VER="0"
+PATCHSET_VER="2"
DESCRIPTION="free, small, and standard compliant Prolog compiler"
HOMEPAGE="http://www.swi-prolog.org/"
diff --git a/dev-libs/libdshconfig/Manifest b/dev-libs/libdshconfig/Manifest
index 849c1001e1d8..0c460d99f3c9 100644
--- a/dev-libs/libdshconfig/Manifest
+++ b/dev-libs/libdshconfig/Manifest
@@ -1,2 +1,2 @@
-DIST libdshconfig-0.20.11.tar.gz 298917 SHA256 a09f518def6a8190d403c855e6ff7cccf89bdf756f6faa50e42d30aef81354b7 SHA512 6d0856e8c855bcd399d16e50849a1e8979db6d44b8dc39a2287504ae9037c12d2c539069acc54c14754595a27ce31513d673f36f13fde4f826bbbd39f23a1a7a WHIRLPOOL 87169a74f01872070d70bf55dc604a533a79149ab68a36a15f11f7fd3f683b9670b48f3d7c53238dba36eb897cb684a419d195cd3782a7bd0486149e954da6b8
DIST libdshconfig-0.20.12.tar.gz 316955 SHA256 aa7d7a2ec78ea03a7776fbf1899edbcc79477833c7c79c54d2bfa0106e3e359e SHA512 6ee7e813599715c2217f05212e0efb94d9588f71db3f3f470e50e9fbde93be3fd3ce3b8164251ea647e76ba9fd0db502985b5fc1e3afffdf9074a00ee9900b64 WHIRLPOOL 8cebd2327e6636b2476530c5eb35919bef11212d14989ff26658714ad34848c81dddc0bddeebbe8fbd1ab03e13071f9d2d22c588776b6f018e682c2fda1fc400
+DIST libdshconfig-0.20.13.tar.gz 323720 SHA256 6f372686c5d8d721820995d2b60d2fda33fdb17cdddee9fce34795e7e98c5384 SHA512 04f3580bf1e1dbac130d350eb4c6e86a980f2ae8636a206821813ed0e14db07dc7ea720ebb3816455a4a939294caa2f2247b7348ecea72769a6f05bee0dbf19a WHIRLPOOL 401f791c88bf5048a0b296ec32ec75128322b2db61b94e82221ce7f1b18c4feba6fd573eed1a2356ca9b56a09ce7a63157dcd54585c0e6dba5214de15a2f1fbf
diff --git a/dev-libs/libdshconfig/libdshconfig-0.20.12.ebuild b/dev-libs/libdshconfig/libdshconfig-0.20.12.ebuild
index de642e00f9b6..f9206a1f34ff 100644
--- a/dev-libs/libdshconfig/libdshconfig-0.20.12.ebuild
+++ b/dev-libs/libdshconfig/libdshconfig-0.20.12.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-libs/libdshconfig/libdshconfig-0.20.12.ebuild,v 1.7 2011/12/11 09:18:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdshconfig/libdshconfig-0.20.12.ebuild,v 1.8 2012/09/14 08:41:36 scarabeus Exp $
DESCRIPTION="Library for parsing dsh.style configuration files"
HOMEPAGE="http://www.netfort.gr.jp/~dancer/software/downloads/"
@@ -8,7 +8,7 @@ SRC_URI="http://www.netfort.gr.jp/~dancer/software/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~m68k-mint"
IUSE=""
DEPEND=""
diff --git a/dev-libs/libdshconfig/libdshconfig-0.20.11.ebuild b/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild
similarity index 56%
rename from dev-libs/libdshconfig/libdshconfig-0.20.11.ebuild
rename to dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild
index 4bbfff794d9c..de1d6958f921 100644
--- a/dev-libs/libdshconfig/libdshconfig-0.20.11.ebuild
+++ b/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdshconfig/libdshconfig-0.20.11.ebuild,v 1.2 2009/09/23 17:21:58 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild,v 1.1 2012/09/14 08:41:36 scarabeus Exp $
+
+EAPI=4
+
+inherit eutils
DESCRIPTION="Library for parsing dsh.style configuration files"
HOMEPAGE="http://www.netfort.gr.jp/~dancer/software/downloads/"
@@ -8,12 +12,19 @@ SRC_URI="http://www.netfort.gr.jp/~dancer/software/downloads/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~m68k-mint"
+IUSE="static-libs"
DEPEND=""
RDEPEND="virtual/ssh"
+src_configure() {
+ econf \
+ $(use_enable static-libs static)
+}
+
src_install() {
- make install DESTDIR=${D} || die
+ default
+
+ prune_libtool_files --all
}
diff --git a/dev-libs/libestr/libestr-0.1.3.ebuild b/dev-libs/libestr/libestr-0.1.3.ebuild
index 5413ca608590..c67e9c654fc9 100644
--- a/dev-libs/libestr/libestr-0.1.3.ebuild
+++ b/dev-libs/libestr/libestr-0.1.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libestr/libestr-0.1.3.ebuild,v 1.4 2012/09/08 02:05:19 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libestr/libestr-0.1.3.ebuild,v 1.5 2012/09/14 14:15:32 ago Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://libestr.adiscon.com/files/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 arm ~hppa ~x86"
+KEYWORDS="amd64 arm ~hppa ~x86"
IUSE="debug static-libs"
DEPEND=""
diff --git a/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.50.0.ebuild b/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.50.0.ebuild
index 576b04bf38b5..2f6d59f8149f 100644
--- a/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.50.0.ebuild
+++ b/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.50.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-perl/Astro-FITS-Header/Astro-FITS-Header-3.50.0.ebuild,v 1.3 2012/09/12 10:54:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Astro-FITS-Header/Astro-FITS-Header-3.50.0.ebuild,v 1.4 2012/09/14 18:39:11 maekke Exp $
EAPI=4
@@ -12,7 +12,7 @@ DESCRIPTION="Interface to FITS headers"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~s390 ~sh ~sparc x86"
IUSE=""
RDEPEND=""
diff --git a/dev-perl/Convert-ASN1/Convert-ASN1-0.260.0.ebuild b/dev-perl/Convert-ASN1/Convert-ASN1-0.260.0.ebuild
index b2599692ce7f..eb8311b95506 100644
--- a/dev-perl/Convert-ASN1/Convert-ASN1-0.260.0.ebuild
+++ b/dev-perl/Convert-ASN1/Convert-ASN1-0.260.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-perl/Convert-ASN1/Convert-ASN1-0.260.0.ebuild,v 1.3 2012/09/12 10:56:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Convert-ASN1/Convert-ASN1-0.260.0.ebuild,v 1.4 2012/09/14 18:37:49 maekke Exp $
EAPI=4
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Standard en/decode of ASN.1 structures"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
SRC_TEST="do"
diff --git a/dev-perl/HTTP-Date/HTTP-Date-6.20.0.ebuild b/dev-perl/HTTP-Date/HTTP-Date-6.20.0.ebuild
index ab3c918d3b20..0bf4a4c0bd49 100644
--- a/dev-perl/HTTP-Date/HTTP-Date-6.20.0.ebuild
+++ b/dev-perl/HTTP-Date/HTTP-Date-6.20.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-perl/HTTP-Date/HTTP-Date-6.20.0.ebuild,v 1.4 2012/09/12 10:58:27 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTTP-Date/HTTP-Date-6.20.0.ebuild,v 1.5 2012/09/14 18:44:43 maekke Exp $
EAPI=4
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Date conversion for HTTP date formats"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Test-Deep/Test-Deep-0.110.0.ebuild b/dev-perl/Test-Deep/Test-Deep-0.110.0.ebuild
index d9db91ec7640..b070b268a463 100644
--- a/dev-perl/Test-Deep/Test-Deep-0.110.0.ebuild
+++ b/dev-perl/Test-Deep/Test-Deep-0.110.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-perl/Test-Deep/Test-Deep-0.110.0.ebuild,v 1.4 2012/09/12 11:11:17 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Deep/Test-Deep-0.110.0.ebuild,v 1.5 2012/09/14 18:47:28 maekke Exp $
EAPI=4
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Test::Deep - Extremely flexible deep comparison"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="test"
DEPEND="
diff --git a/dev-perl/Tie-Simple/metadata.xml b/dev-perl/Tie-Simple/metadata.xml
index e72e387cf691..ac580875533e 100644
--- a/dev-perl/Tie-Simple/metadata.xml
+++ b/dev-perl/Tie-Simple/metadata.xml
@@ -2,10 +2,6 @@
perl
-
- ssuominen@gentoo.org
- Samuli Suominen
-
Tie-Simple
Tie::Simple
diff --git a/dev-php/PEAR-Net_LDAP/Manifest b/dev-php/PEAR-Net_LDAP/Manifest
index 8d6636fb2a94..a544b39d1530 100644
--- a/dev-php/PEAR-Net_LDAP/Manifest
+++ b/dev-php/PEAR-Net_LDAP/Manifest
@@ -1,2 +1 @@
-DIST Net_LDAP-1.0.0.tgz 52986 SHA256 c7ded6e08fa7fe5d83b79bd896d90e5fc4d7396e16d5ed1b50c05aca4f869f69 SHA512 e8c6d2fd4d97db393c2d8d6156a7e4b0ead6f487508041a52717769f4a05221075e5dfb84c166dc0984e5610fbd7ce0ada741ad6550c1222f001d230c3ad475e WHIRLPOOL 00c17e5314c82dbbd37886d4a1bc89cc470fbde05b6b8490451c6974f460d147823abd03770166bc21d34e88502c5c04b5ad50b2c3c540fba7122c26c317bf94
DIST Net_LDAP-1.1.5.tgz 74782 SHA256 bb2f40a9d08eed1968582d4dc9342e15e93b9222e0a8b6b60ae83c34b25a51b2 SHA512 447e22478dc45fd2f2a20671c6cfb81852d940473f014769d3912edbe1f4523f88cc8af7d7138fbc367ffee3c6a7b63f3b3a34698feb0373ffbdc3c89a2c7441 WHIRLPOOL 7f5583ab9b75f93afc9cebd97bef48639c49b5db5797c45b5527f5dc57666ad12adc3e4cb84dac48166277fa0d7bc3061c65f6593a874f54a869996ca26e53a6
diff --git a/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.0.0.ebuild b/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.0.0.ebuild
deleted file mode 100644
index 2c87f5293498..000000000000
--- a/dev-php/PEAR-Net_LDAP/PEAR-Net_LDAP-1.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# 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_LDAP/PEAR-Net_LDAP-1.0.0.ebuild,v 1.9 2012/09/09 17:08:22 armin76 Exp $
-
-inherit php-pear-r1 depend.php
-
-KEYWORDS="amd64 hppa ppc x86"
-
-DESCRIPTION="OO interface for searching and manipulating LDAP-entries"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_setup() {
- require_php_with_use ldap
-}
diff --git a/dev-php/YAML/YAML-1.0.6.ebuild b/dev-php/YAML/YAML-1.0.6.ebuild
index 5a35ccc1d2b5..f824cd13db02 100644
--- a/dev-php/YAML/YAML-1.0.6.ebuild
+++ b/dev-php/YAML/YAML-1.0.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/YAML/YAML-1.0.6.ebuild,v 1.1 2012/06/22 17:33:51 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/YAML/YAML-1.0.6.ebuild,v 1.2 2012/09/14 22:28:48 ago Exp $
EAPI=4
@@ -15,7 +15,7 @@ SRC_URI="http://pear.symfony-project.com//get/YAML-1.0.6.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE=""
DEPEND=">=dev-lang/php-5.2.4
diff --git a/dev-python/foolscap/foolscap-0.6.4.ebuild b/dev-python/foolscap/foolscap-0.6.4.ebuild
index 5400af6c10b7..adb487092927 100644
--- a/dev-python/foolscap/foolscap-0.6.4.ebuild
+++ b/dev-python/foolscap/foolscap-0.6.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.6.4.ebuild,v 1.5 2012/09/12 12:19:08 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/foolscap/foolscap-0.6.4.ebuild,v 1.6 2012/09/15 01:48:40 blueness Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -17,7 +17,7 @@ SRC_URI="http://${PN}.lothar.com/releases/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="doc ssl"
RDEPEND=">=dev-python/twisted-2.4.0
diff --git a/dev-python/gst-python/gst-python-0.10.22.ebuild b/dev-python/gst-python/gst-python-0.10.22.ebuild
index 43e7beee0f2d..c7b604d88fa0 100644
--- a/dev-python/gst-python/gst-python-0.10.22.ebuild
+++ b/dev-python/gst-python/gst-python-0.10.22.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gst-python/gst-python-0.10.22.ebuild,v 1.7 2012/09/08 09:11:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gst-python/gst-python-0.10.22.ebuild,v 1.8 2012/09/14 18:28:41 maekke Exp $
EAPI=4
@@ -17,7 +17,7 @@ SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2"
SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="examples test"
RDEPEND="dev-libs/libxml2
diff --git a/dev-python/simplejson/simplejson-2.6.0.ebuild b/dev-python/simplejson/simplejson-2.6.0.ebuild
index cc8f430c4b78..5cd339fc87c9 100644
--- a/dev-python/simplejson/simplejson-2.6.0.ebuild
+++ b/dev-python/simplejson/simplejson-2.6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-2.6.0.ebuild,v 1.3 2012/09/12 12:23:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simplejson/simplejson-2.6.0.ebuild,v 1.5 2012/09/15 02:00:22 blueness Exp $
EAPI="3"
PYTHON_DEPEND="2"
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ppc ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE=""
DEPEND=""
diff --git a/dev-ruby/jquery-rails/Manifest b/dev-ruby/jquery-rails/Manifest
index 2e00e5844132..e113760766cd 100644
--- a/dev-ruby/jquery-rails/Manifest
+++ b/dev-ruby/jquery-rails/Manifest
@@ -1,3 +1,4 @@
DIST jquery-rails-1.0.19.gem 262656 SHA256 886da031bb562fdbba88ea40c8630b8bfe995673b6f98720c6cb6d24773f67be SHA512 0d5001307027d651896694b2e25c1dccb7ce05d52086069f1072f026676672e2841c2a92545ad7aa1d1bc1d21df46bc5dba6ea83c6d218d292797ca6bbd22b3a WHIRLPOOL 232d47c91619f09276fdd2c73dffbb197636cbc0e139e24b84f68c273ba736eb93c1007d12d683b2926e4f19317de3fcf9e210e8ce87b8f453f0d6960c0bb91c
DIST jquery-rails-2.0.2.gem 264192 SHA256 09545ba28d859187918f333e43878428d4216f04e50bebd9b21ccb632a2d8ab9 SHA512 9aeae92c9f74167be20d8f0b187542080470f19ef9aa85bcef2d472868bbbcc578e3dc7e4ef66d03567d1d4e6d708b2538cfb7254377cf93fdcaff14e26a9555 WHIRLPOOL ebb44ab600919ad719eefe1a196c81cdb2a6cf14b5922761e1bcb29dd55b9f0eb2848c413747ac788b9c08d823724ce9fdd4aa2ec60924115151bc3dd82bb5c1
DIST jquery-rails-2.1.1.gem 265728 SHA256 fbb01addcf503d53657527ab5dcffa82c4940d66b0ea9033bc77a0fafa65c5fa SHA512 7cad3607da183adec85b46fa113fa82e068ef825c62a35311c57f78e695892b8ea5febf63c23692c605c3325f8fa6f106a8d9e2a67dddea5365ff1dad761805b WHIRLPOOL cbdf1a49aa5c60bf6c9a092f7ca339d4b9125a6ecf86a8c42edf658407278dca8b2d773027a837f16cccc377b1963ab8ec2d3a7e3d6dce881b6e20bd3c0429fa
+DIST jquery-rails-2.1.2.gem 266752 SHA256 04e310b5bc695f1fc43f15fe9c4afc628484371c5a4508c8f8d1682e71e8e79c SHA512 baec5f994633c6109089d88c5bd9b0e6ddb2cd272c5cbd836d4b99e957d21eef17652bcb89effbe624b56124310cc4f8385818bfeb2dd657af21aab0874e9cd9 WHIRLPOOL 9ff8d5048c57ac42c3bfd96657a584204e3a67ebcc53cfded8bd2404271f93e86a5aeea9f4351955318373b675be1754a66a21472e7b29b8056e6c0a32806909
diff --git a/dev-ruby/jquery-rails/jquery-rails-2.1.2.ebuild b/dev-ruby/jquery-rails/jquery-rails-2.1.2.ebuild
new file mode 100644
index 000000000000..9c7ea5842fd6
--- /dev/null
+++ b/dev-ruby/jquery-rails/jquery-rails-2.1.2.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/dev-ruby/jquery-rails/jquery-rails-2.1.2.ebuild,v 1.1 2012/09/14 12:21:53 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="vendor"
+
+RUBY_FAKEGEM_GEMSPEC="jquery-rails.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="jQuery! For Rails! So great."
+HOMEPAGE="http://www.rubyonrails.org"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~x86 ~x64-macos"
+
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/railties-3.2.0 >=dev-ruby/thor-0.14"
+
+all_ruby_prepare() {
+ sed -i -e '/git ls-files/d' jquery-rails.gemspec || die
+}
diff --git a/dev-ruby/timecop/Manifest b/dev-ruby/timecop/Manifest
index 061824642020..1300d516f17a 100644
--- a/dev-ruby/timecop/Manifest
+++ b/dev-ruby/timecop/Manifest
@@ -1 +1,2 @@
DIST timecop-0.3.5.gem 13824 SHA256 ddd30e99586f1e07dea62057dadb5161d58b81b225f50b5d5f07df554eded760 SHA512 c69de431cc274b941a8146bfde5cebde0466f23d695d3b2d080ab54056e289e59e8ffe92f0b8feedf8387e474800afd7a9e604e689fc3c175f60d04e065a3d92 WHIRLPOOL fe2594fe239a1a834a0746dfdef9e14becf2230dbcdac05e3e7929a5cf088f2b36d543e28b6c098d3942e2f101981bcfbc8b3585d19bd3dc5f4e6e6f670513f1
+DIST timecop-0.5.0.gem 14848 SHA256 c762cbf129475e73018d54c432d539020a0d00a554133e7160e53c061e1271df SHA512 be67ae936d70cc09a194703c4ac942b159b21249b463f3c87dec3dfd957eb69c92b2fe647aff8b6e816d62d0984f7c6037b0f8c7d8379efd89905d11bc8dcc63 WHIRLPOOL f08b8679ff14aa27d2180dbc428bdb190babab76088259f76296f9bb187cd5159f5a0f13a4f8cbc60bec79efb9be06b2c8e0372361b62368ba85c1399b513198
diff --git a/dev-ruby/timecop/timecop-0.5.0.ebuild b/dev-ruby/timecop/timecop-0.5.0.ebuild
new file mode 100644
index 000000000000..3d7fa84ff097
--- /dev/null
+++ b/dev-ruby/timecop/timecop-0.5.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/timecop/timecop-0.5.0.ebuild,v 1.1 2012/09/14 13:47:01 graaff Exp $
+
+EAPI="4"
+
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_TASK_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.markdown History.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A gem providing 'time travel' and 'time freezing' capabilities"
+HOMEPAGE="http://github.com/jtrupiano/timecop"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+ sed -i -e '/bundler/ s:^:#:' Rakefile || die
+}
diff --git a/dev-util/a8/Manifest b/dev-util/a8/Manifest
index 4951759ae60d..f4b974645147 100644
--- a/dev-util/a8/Manifest
+++ b/dev-util/a8/Manifest
@@ -1 +1,2 @@
DIST a8-0.10.tar.gz 32904 SHA256 5b08b9cf1500f1a2a27020ac1ea377478baac93f4d9a13cee979dc647558c4c5 SHA512 0cb23ca797caa5bb242b343e8523f24d42498a995193a51313eb685aca1436b37d41582f69a7f94f4e655afceb66a7112e67fbc14c57cb563d8639afbb26674c WHIRLPOOL 1a7a01283c8ebd7a7f081cf56b221545037546bfa148cf62448be8382da7fd004b543de4322df6cad69a37c5eef1d997f7748adf3a57520cc407ac65ac79001e
+DIST a8-0.11.tar.gz 39435 SHA256 0ef94e70f0b97de0ecfdd7297f70435b52efbdf3a04e0b8ba1927d3535cca7f2 SHA512 253aa8161a195d4dd1d1fb392338478c179b5878e672d94baffa99a5e7e42f1deeb6d1dc8bbc9f3991411ca231d054a71ab96be1aae7925a22347d478832e0a2 WHIRLPOOL f64d61b6a59d03c2cd9e78f57c01842ea0b7e2c3542aa533cdf7c15d6c9e41750d4581ca5d7348beb311754e273e168275e36d80daca00ca58e999559f3ef348
diff --git a/dev-util/a8/a8-0.11.ebuild b/dev-util/a8/a8-0.11.ebuild
new file mode 100644
index 000000000000..6d9b9d561667
--- /dev/null
+++ b/dev-util/a8/a8-0.11.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/dev-util/a8/a8-0.11.ebuild,v 1.1 2012/09/14 08:01:18 ssuominen Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="2.5 3.*"
+
+inherit distutils eutils gnome2-utils
+
+DESCRIPTION="An ultra-lightweight IDE, that embeds Vim, a terminal emulator, and a file browser"
+HOMEPAGE="http://code.google.com/p/abominade/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/argparse
+ >=dev-python/dbus-python-1
+ dev-python/logbook
+ dev-python/psutil
+ dev-python/pyyaml
+ >=dev-python/pygtk-2.22
+ >=dev-python/pygtkhelpers-0.4.3
+ x11-libs/vte:0[python]"
+RDEPEND="${DEPEND}
+ app-editors/gvim
+ app-editors/vim"
+
+src_install() {
+ distutils_src_install
+ doicon -s 48 a8/data/icons/a8.png
+ make_desktop_entry ${PN} ${PN} ${PN} 'Development;IDE'
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+ distutils_pkg_postinst
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ distutils_pkg_postrm
+}
diff --git a/dev-util/a8/metadata.xml b/dev-util/a8/metadata.xml
index aa879c91c635..933713725513 100644
--- a/dev-util/a8/metadata.xml
+++ b/dev-util/a8/metadata.xml
@@ -2,8 +2,7 @@
- ssuominen@gentoo.org
- Samuli Suominen
+ maintainer-needed@gentoo.org
a8
diff --git a/dev-util/nemiver/Manifest b/dev-util/nemiver/Manifest
index ea74d6b781c3..e9fe789cf763 100644
--- a/dev-util/nemiver/Manifest
+++ b/dev-util/nemiver/Manifest
@@ -1 +1,2 @@
DIST nemiver-0.9.2.tar.xz 2294260 SHA256 770392965a45d728b798da3c6111c4e7cb55d51f109a78aedead99083f8e2520 SHA512 bce3ac881e0d3a29a341cd67062b77c4bef723193dc49297209062ad44d61dc973bf37deef28d5bf7799b98e4dc1f32d81d41fa85d6e2e0c34645e3ea962f2a0 WHIRLPOOL ab98f5f4b0205b95feb177ebff1485c4bb4499dc2a41eab63387c8636cb094d662a25c357835c27de83c11378e73afddab6f2886b62eaaa33b6c35fcba17ab50
+DIST nemiver-0.9.3.tar.xz 2383192 SHA256 27b8845e54a61ba597050eb16640aaaf2bf21be3191081c9ddd3a34fc2ae617d SHA512 8f8a8ee34e3c445784b90732037d3b3bd20e8adc4082ddb33eaf97481ae0efa9cf5819c0657cf59184f043528e26757681833f37e0d411a67a2705e4492aeff6 WHIRLPOOL d35f9f2dfcbfe227bf205b6933f9fc88fb60f3d73d68371da47157d47ea88929075d99899a3efde1ba34e8cc1a4cc5a91be6cd69335b57e1bd824d813b7e5e01
diff --git a/dev-util/nemiver/nemiver-0.9.3.ebuild b/dev-util/nemiver/nemiver-0.9.3.ebuild
new file mode 100644
index 000000000000..2d70036aaa69
--- /dev/null
+++ b/dev-util/nemiver/nemiver-0.9.3.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/nemiver/nemiver-0.9.3.ebuild,v 1.1 2012/09/14 20:53:09 pacho Exp $
+
+EAPI="4"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="A gtkmm front end to the GNU Debugger (gdb)"
+HOMEPAGE="http://projects.gnome.org/nemiver/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="memoryview"
+
+RDEPEND=">=dev-libs/glib-2.16:2
+ >=dev-cpp/glibmm-2.30:2
+ >=dev-cpp/gtkmm-3:3.0
+ >=dev-cpp/gtksourceviewmm-3:3.0
+ >=gnome-base/gsettings-desktop-schemas-0.0.1
+ >=gnome-base/libgtop-2.19
+ >=x11-libs/vte-0.28:2.90
+ >=dev-db/sqlite-3:3
+ sys-devel/gdb
+ dev-libs/boost
+ memoryview? ( >=app-editors/ghex-2.90:2 )"
+# FIXME: dynamiclayout needs unreleased stable gdlmm:3
+# dynamiclayout? ( >=dev-cpp/gdlmm-3.0:3 )
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.17
+ >=dev-util/intltool-0.40
+ >=app-text/scrollkeeper-0.3.11
+ >=app-text/gnome-doc-utils-0.3.2
+ app-text/docbook-xml-dtd:4.1.2"
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog NEWS README TODO"
+ G2CONF="${G2CONF}
+ --disable-symsvis
+ --disable-dynamiclayout
+ --enable-gsettings
+ $(use_enable memoryview)
+ --disable-static"
+}
diff --git a/dev-util/valgrind/valgrind-3.7.0-r4.ebuild b/dev-util/valgrind/valgrind-3.7.0-r4.ebuild
index 24ed74f4e152..9079582214de 100644
--- a/dev-util/valgrind/valgrind-3.7.0-r4.ebuild
+++ b/dev-util/valgrind/valgrind-3.7.0-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/dev-util/valgrind/valgrind-3.7.0-r4.ebuild,v 1.3 2012/09/13 11:22:13 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/valgrind/valgrind-3.7.0-r4.ebuild,v 1.4 2012/09/14 14:14:32 ago Exp $
EAPI="4"
inherit autotools eutils flag-o-matic toolchain-funcs multilib pax-utils
@@ -11,7 +11,7 @@ SRC_URI="http://www.valgrind.org/downloads/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x64-macos"
+KEYWORDS="-* amd64 ~arm ppc ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="mpi"
DEPEND="mpi? ( virtual/mpi )"
diff --git a/games-action/bzflag/Manifest b/games-action/bzflag/Manifest
index a121dd6ed8b9..dda42ceaa5ca 100644
--- a/games-action/bzflag/Manifest
+++ b/games-action/bzflag/Manifest
@@ -1,2 +1,3 @@
-DIST bzflag-2.0.16.tar.bz2 11495082 RMD160 9156642183b9b33c6509737cd8e40f4ad612a657 SHA1 08e3a839fb0e4919c9244dd886c5059c076e1349 SHA256 fe6fa0b89e7f950950111b118ee8534cd54917d2c7f9215c1f3215ece38a608f
-DIST bzflag-2.4.0.tar.bz2 15045931 RMD160 0667587ccf826aef454983761c8c0ba180f1c5c5 SHA1 af469d63af7143479176ea0ac91ce2eaa6e4561f SHA256 424cec6fe2b23ce88a9975612799c0e3831bbe85f0b1524faadfb93e7c0ad452
+DIST bzflag-2.0.16.tar.bz2 11495082 SHA256 fe6fa0b89e7f950950111b118ee8534cd54917d2c7f9215c1f3215ece38a608f SHA512 e874c15fb18e02b7e9bccd60b88a3c879ea07f1d6e6f9aa3991cf42681119b04de28b90c168c7ad0fc16e61bd562f98ece5a2915143ffb45a547e314b1e003ee WHIRLPOOL 36e0a8643f4101372fa52fdb7cec7299724afbbf6b808cd5e31e6999ddca2cf3598a15ff689d03c1ffda0fcaf1ec57b8e9ebc84b606a479419e07b3fdd9c37bb
+DIST bzflag-2.4.0.tar.bz2 15045931 SHA256 424cec6fe2b23ce88a9975612799c0e3831bbe85f0b1524faadfb93e7c0ad452 SHA512 344349e54f96588589aaa378944997ac1f0d59b298f16b7952a24c4e350c98e62fa8f171dbeada4959ec96fa709b13d99775597d7c7a23acf315d6488202f8c0 WHIRLPOOL 0642fde6386e9320a4eb91e013bba9d97ea2ee17b5845cdc4a4af84ed5693806dd942c82fd835d1e7ec6d52d9b47b9915c44f0b8a18e52fdbc3f3d98c75e7031
+DIST bzflag-2.4.2.tar.bz2 15971448 SHA256 4f7bc52284cc4b39fc352855e555b2b064c1de6a18f7474e249073070762c811 SHA512 e5645e825f19896ad4dc1e3bf97c9b52ed3838210d97d5532936a9306623283330c9535288af90f86e32c88a1a7996b2c872b9c081558eea48400b86b3a1a6ff WHIRLPOOL 82a5e543a8fdcb80c516394c63901c80c77fc659090f952cb36f65a9fb14c5ca06d6547dc9d347c6abf0ee706c40437f80edf20c424775bf6e202423e025794c
diff --git a/games-action/bzflag/bzflag-2.4.2.ebuild b/games-action/bzflag/bzflag-2.4.2.ebuild
new file mode 100644
index 000000000000..94a163019376
--- /dev/null
+++ b/games-action/bzflag/bzflag-2.4.2.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/games-action/bzflag/bzflag-2.4.2.ebuild,v 1.1 2012/09/14 07:48:38 tupone Exp $
+
+EAPI=2
+inherit eutils flag-o-matic games
+
+DESCRIPTION="3D tank combat simulator game"
+HOMEPAGE="http://www.bzflag.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dedicated sdl upnp"
+
+UIDEPEND="virtual/opengl
+ virtual/glu
+ media-libs/libsdl[audio,joystick,video]
+ media-libs/glew
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libXxf86vm"
+
+DEPEND=">=net-misc/curl-7.15.0
+ sys-libs/ncurses
+ net-dns/c-ares
+ upnp? ( net-libs/miniupnpc )
+ sdl? ( ${UIDEPEND} )
+ !sdl? ( !dedicated? ( ${UIDEPEND} ) )"
+
+src_configure() {
+ local myconf
+
+ if use dedicated && ! use sdl ; then
+ ewarn
+ ewarn "You are building a server-only copy of BZFlag"
+ ewarn
+ myconf="--disable-client --without-SDL"
+ fi
+ egamesconf \
+ --disable-ccachetest \
+ --disable-dependency-tracking \
+ --without-regex \
+ $(use_enable upnp UPnP) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc AUTHORS TODO ChangeLog BUGS PORTING DEVINFO NEWS README*
+
+ if use sdl || ! use dedicated ; then
+ newicon "data/bzflag-48x48.png" ${PN}.png
+ make_desktop_entry ${PN} "BZFlag"
+ fi
+
+ prepgamesdirs
+}
diff --git a/games-board/domination/Manifest b/games-board/domination/Manifest
index ae37fc93ea36..1b9e292208fb 100644
--- a/games-board/domination/Manifest
+++ b/games-board/domination/Manifest
@@ -1,2 +1,3 @@
DIST Domination_1.1.0.9.zip 5924122 SHA256 cce4f422bb00dcaca9face801494638b3f2d08d0041477b7f7a1f9849efe89af SHA512 e5a5ed6cdcc5e0c5bd4ddd8c6b7c0f075c725e5faa09ff1ba240a7f6b0e1897f12273426823cab791fd23a4f4f4e482544d5f91fcb1896d16ab075df67eeed63 WHIRLPOOL 40a6a10298f76868b8917bb34fffcdf019fba4381608747c09ba3ce31a325d882fa80b45a5f8afa70f37e34b48e626f7f27cb57285a6cfca70b11ed00517a705
DIST Domination_1.1.1.0.zip 5911494 SHA256 2bcac1543fe7ee60bc878a8224f7573180baef214ba6902bc5cf65049779aabc SHA512 b89fe8217916de76737f8893877919c8fdf0440f4999b6676bc417730a8afd75a7391c2bc258570caeac2c9ffeed94add6876a58c93455755908e6792447b4f7 WHIRLPOOL 6c8a08fa20205d3be76630053747540e0b744c69e75cea42c57832440bfd13d62b3470376c51638b75234143d28663fd7a90996645b948af7713a8b31f282b8a
+DIST Domination_1.1.1.1.zip 6033327 SHA256 4a569874ce9d12435c3da78224b61b2b366592b9b8849b612bf0cfae7867cf55 SHA512 0c1bc5b21462ea1a78fe84a368f0ddccb682b5c0d6259a13e058b368ca70a993a7b92261050da2490fd35fa49d5c998ec14208ece8c3fae7ee31ed2a0c48da02 WHIRLPOOL 9822871d321653fa98873d5b9fceb6b0e9873c2b52baf4c4dcba4eb9dc9a9914d6ae19efc185dcb666ac50d2b76c87492de840ecf3f65a409c04debe1877e9ce
diff --git a/games-board/domination/domination-1.1.1.1.ebuild b/games-board/domination/domination-1.1.1.1.ebuild
new file mode 100644
index 000000000000..9b34d1318a15
--- /dev/null
+++ b/games-board/domination/domination-1.1.1.1.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/games-board/domination/domination-1.1.1.1.ebuild,v 1.1 2012/09/14 07:06:03 mr_bones_ Exp $
+
+inherit eutils java-pkg-2 java-ant-2 games
+
+DESCRIPTION="The well-known board game, written in java"
+HOMEPAGE="http://domination.sourceforge.net"
+SRC_URI="mirror://sourceforge/domination/Domination_${PV}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.4"
+DEPEND=">=virtual/jdk-1.4
+ app-arch/unzip"
+
+S=${WORKDIR}/Domination
+
+pkg_setup() {
+ games_pkg_setup
+ java-pkg-2_pkg_setup
+}
+
+EANT_BUILD_TARGET="game"
+
+src_compile() {
+ java-pkg-2_src_compile
+}
+
+src_install() {
+ mkdir -p "${D}${GAMES_PREFIX}"/bin
+ cp "${S}"/FlashGUI.sh "${D}${GAMES_PREFIX}"/bin/${PN} || die
+ sed -i \
+ -e "s|cd.*|cd \"${GAMES_DATADIR}\"/${PN}|" \
+ "${D}${GAMES_PREFIX}"/bin/${PN} \
+ || die
+ chmod +x "${D}${GAMES_PREFIX}"/bin/${PN} || die
+
+ insinto "${GAMES_DATADIR}/${PN}"
+ doins -r "${S}"/* || die
+ rm -f "${D}${GAMES_DATADIR}"/${PN}/*.cmd || die
+ java-pkg_regjar "${D}/${GAMES_DATADIR}/${PN}"/*.jar
+
+ newicon resources/icon.png ${PN}.png
+ make_desktop_entry ${PN} "Domination"
+
+ prepgamesdirs
+}
diff --git a/media-fonts/cantarell/Manifest b/media-fonts/cantarell/Manifest
index b25264af804d..79c733caa9a0 100644
--- a/media-fonts/cantarell/Manifest
+++ b/media-fonts/cantarell/Manifest
@@ -1,3 +1,3 @@
-DIST cantarell-fonts-0.0.7.tar.xz 363692 SHA256 6a21f841d28de444deee201a25e5cbc129fde14d633c547a7d36941437f72090 SHA512 28f35025e5be8c9aa996bacbaf9a3fc51bf7859725622d008fa832ae7d1eaeb06cb580fdcc81777ac6bb8b670942844cf37f26848f1965cb7c35ff766183e059 WHIRLPOOL 5618790ecd7c2f82d2b9166c363d4475c5fb51cd5b1f2bcc69ce000da11f4a9fd0464cf1c5e26dff79e0b0a197f7b5fac5697483e05a9369294d0b2d82b65f00
+DIST cantarell-fonts-0.0.10.tar.xz 287616 SHA256 68c993f4445b1e703480d45a50fda4be5ed8e83cf45690f64f5fea9facc0e5c9 SHA512 ea68c0f03d279d95736ee580f333f8ee3605e42e54e1bd10372f85fdb1c7c4e0c5678b54411eadcdd8680a00793bf7809190ce6f49e5cfb7605d4329733c284f WHIRLPOOL ec8470b53e187ab7c0c1970b34c2c698f4c28094bde6b1b2fa6923c04c4149fde8453e8e8b2d4aa51df967d8b80396b6c5993c8402d48782de83fd47dac31888
DIST cantarell-fonts-0.0.8.tar.xz 245272 SHA256 e5468861cee84c034dfc53ed9836a360bea45767873dd7840fe403a06bcc61fb SHA512 7bffbaf7d60135501096424dcce90ac293876e64bae0f75fd6676777a9d24bd1eb6f088119794be9f58f661d2aba14c011f9a84bf06565575556779b6494c00e WHIRLPOOL 94906555628dc13d61cb0c7566f1a79883e5027dda222c35ceb26f1dae13af48b15ad4fbbb17acfaf41871194748285124b0af8ad8c2f41e722548611da118e5
-DIST cantarell-fonts-0.0.9.tar.xz 313280 SHA256 793f4e2f28e5d03b266f4f714570c9569cb7f8b993a56219539788d45e0fa3fe
+DIST cantarell-fonts-0.0.9.tar.xz 313280 SHA256 793f4e2f28e5d03b266f4f714570c9569cb7f8b993a56219539788d45e0fa3fe SHA512 731488fb052b742a3d630f9b8d7c8665d0fcf4b06663721c9629dd7e04e7f4442f70b6d584f4fdb0346f59506df6e7a056854bef7f843a5fb600afce9e02cffb WHIRLPOOL 142dde8c10c98a9e7d9dcd5920a7dd89d7aeec1f701c5d3134fd4556088cfc6fccedefe502edadc1c37c37debd99befba864fbba6923eba93974d6037e6649fe
diff --git a/media-fonts/cantarell/cantarell-0.0.7.ebuild b/media-fonts/cantarell/cantarell-0.0.10.ebuild
similarity index 82%
rename from media-fonts/cantarell/cantarell-0.0.7.ebuild
rename to media-fonts/cantarell/cantarell-0.0.10.ebuild
index 54d52bef9a76..deaccf9aea56 100644
--- a/media-fonts/cantarell/cantarell-0.0.7.ebuild
+++ b/media-fonts/cantarell/cantarell-0.0.10.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-fonts/cantarell/cantarell-0.0.7.ebuild,v 1.8 2012/05/02 21:30:31 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/cantarell/cantarell-0.0.10.ebuild,v 1.1 2012/09/14 18:49:35 tetromino Exp $
EAPI="4"
GNOME_ORG_MODULE="${PN}-fonts"
@@ -12,7 +12,7 @@ HOMEPAGE="http://live.gnome.org/CantarellFonts"
LICENSE="OFL-1.1"
SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE=""
RDEPEND="media-libs/fontconfig"
diff --git a/media-gfx/comix/Manifest b/media-gfx/comix/Manifest
index 4dec13523d81..ab64c8c5a2ac 100644
--- a/media-gfx/comix/Manifest
+++ b/media-gfx/comix/Manifest
@@ -1,2 +1,2 @@
-DIST comix-4.0.3.tar.gz 468112 RMD160 1184650221762e01bf8ffde7818d528fef79e9b6 SHA1 2343c5912e4ff8074b03bcef967750bb1a79f2a4 SHA256 5c468a95452e0c1067508bc9ca7b57fc89c81b60ac947d0d428c714e8acc42fa
-DIST comix-4.0.4.tar.gz 481687 RMD160 48e4fba57697feed1d71977c1a0693a1aa6c3caf SHA1 a707cbd88efda85ee0263fd38ba6bca97eee402c SHA256 9352169de856957a16de76867fbd7dc711648edfbac7ce76191b55e5f6cd546a
+DIST comix-4.0.3.tar.gz 468112 SHA256 5c468a95452e0c1067508bc9ca7b57fc89c81b60ac947d0d428c714e8acc42fa
+DIST comix-4.0.4.tar.gz 481687 SHA256 9352169de856957a16de76867fbd7dc711648edfbac7ce76191b55e5f6cd546a SHA512 9cbc5b1cc100ee50b48b794ce9a7f08130fc7a79376533f0f55904be0e2e8cfe5f8b1deeff2f76e7038a3f81b0f709ce5eea88a709199e1584b73f5259df5f8e WHIRLPOOL 0016cb64185a6cd8983b7ecec7877f64f29a36dafd4d80b7dddcfdc8ebd1a13453faaad50d068c75bb250fbf421b7f2a9235f5472ec7d35073f62ac2731f1534
diff --git a/media-gfx/comix/comix-4.0.4.ebuild b/media-gfx/comix/comix-4.0.4.ebuild
index 5619f6c6a79e..6d49458e4c78 100644
--- a/media-gfx/comix/comix-4.0.4.ebuild
+++ b/media-gfx/comix/comix-4.0.4.ebuild
@@ -1,43 +1,54 @@
-# 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/media-gfx/comix/comix-4.0.4.ebuild,v 1.1 2010/02/11 00:52:38 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/comix/comix-4.0.4.ebuild,v 1.2 2012/09/14 10:33:16 ssuominen Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.6"
inherit python
DESCRIPTION="A GTK image viewer specifically designed to handle comic books."
HOMEPAGE="http://comix.sourceforge.net"
-SRC_URI="mirror://sourceforge/comix/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+LANGS=" ca cs es fr hr hu id ja ko pl pt_BR ru sv zh_CN zh_TW"
+IUSE="rar $(echo ${LANGS//\ /\ linguas_})"
+
RDEPEND=">=dev-python/imaging-1.1.5
>=dev-python/pygtk-2.12
rar? ( || ( app-arch/unrar app-arch/rar ) )"
-LANGS=" ca cs es fr hr hu id ja ko pl pt_BR ru sv zh_CN zh_TW"
-IUSE="rar $(echo ${LANGS//\ /\ linguas_})"
-src_unpack() {
- unpack ${A}
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
# do not install .pyc into /usr/share
local pythondir="$(python_get_sitedir)/comix"
pythondir="${pythondir/\/usr\/}"
- sed -i -e "s:share/comix/src:${pythondir}:g" "${S}"/install.py || die
-}
-
-src_compile() {
- einfo "Nothing to be compiled."
+ sed -i -e "s:share/comix/src:${pythondir}:g" install.py || die
+ python_convert_shebangs -r 2 install.py mime/comicthumb src/comix.py
}
src_install() {
dodir /usr
- python install.py install --no-mime --dir "${D}"usr || die
- insinto /usr/share/mime/packages/
- doins "${S}"/mime/comix.xml || die
- insinto /etc/gconf/schemas/
- doins "${S}"/mime/comicbook.schemas || die
- dobin "${S}"/mime/comicthumb || die
- dodoc ChangeLog README || die
+ python2 install.py install --no-mime --dir "${D}"usr || die
+
+ insinto /usr/share/mime/packages
+ doins mime/comix.xml
+
+ insinto /etc/gconf/schemas
+ doins mime/comicbook.schemas
+
+ dobin mime/comicthumb
+ dodoc ChangeLog README
+ local lang
for lang in ${LANGS} ; do
use linguas_${lang} || rm -r "${D}"/usr/share/locale/${lang}
done
diff --git a/media-gfx/gimp/files/gimp-2.6.12-CVE-2012-3403.patch b/media-gfx/gimp/files/gimp-2.6.12-CVE-2012-3403.patch
new file mode 100644
index 000000000000..f7d0b3766a60
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.6.12-CVE-2012-3403.patch
@@ -0,0 +1,511 @@
+From 65ac6cda675fafd57bc182175f685e5d8c1a9cc9 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen
+Date: Mon, 20 Aug 2012 15:28:44 +0200
+Subject: [PATCH] patch: CVE-2012-3403
+
+Squashed commit of the following:
+
+commit d002e513039a9667a06d3e2ba180f9c18785cc5f
+Author: Nils Philippsen
+Date: Fri Jul 13 15:47:16 2012 +0200
+
+ file-cel: close file on error
+
+commit ec3f1fe7586527ea7e2735b5c8548b925f622d5b
+Author: Nils Philippsen
+Date: Fri Jul 13 15:33:27 2012 +0200
+
+ file-cel: use g_set_error() for errors instead of g_message()
+ (cherry picked from commit 86f4cd39bd493c88a7a19b56d1827d8b911e07f6)
+
+ Conflicts:
+ plug-ins/common/file-cel.c
+
+commit 79bd89bc39195974d5cae2c2b06c829dd90c36ee
+Author: Nils Philippsen
+Date: Fri Jul 13 15:30:44 2012 +0200
+
+ file-cel: use statically allocated palette buffer
+ (cherry picked from commit 69b98191cf315bcf0f7b8878896c01600e67c124)
+
+commit 52d85468980b5947cfd3e84f9a256769158210cc
+Author: Nils Philippsen
+Date: Fri Jul 13 15:20:06 2012 +0200
+
+ file-cel: validate header data (CVE-2012-3403)
+ (cherry picked from commit b772d1b84c9272bb46ab9a21db4390e6263c9892)
+
+commit 62da97876070839097671e83eb8f5d408515396f
+Author: Nils Philippsen
+Date: Thu Jul 12 15:50:02 2012 +0200
+
+ file-cel: check fread()/g_fopen() return values and pass on errors
+ (cherry picked from commit 797db58b94c64f418c35d38b7a608d933c8cebef)
+---
+ plug-ins/common/file-cel.c | 283 +++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 234 insertions(+), 49 deletions(-)
+
+diff --git a/plug-ins/common/file-cel.c b/plug-ins/common/file-cel.c
+index a94671c..3357561 100644
+--- a/plug-ins/common/file-cel.c
++++ b/plug-ins/common/file-cel.c
+@@ -44,8 +44,10 @@ static void run (const gchar *name,
+ gint *nreturn_vals,
+ GimpParam **return_vals);
+
+-static gint load_palette (FILE *fp,
+- guchar palette[]);
++static gint load_palette (const gchar *file,
++ FILE *fp,
++ guchar palette[],
++ GError **error);
+ static gint32 load_image (const gchar *file,
+ const gchar *brief,
+ GError **error);
+@@ -55,7 +57,8 @@ static gboolean save_image (const gchar *file,
+ gint32 layer,
+ GError **error);
+ static void palette_dialog (const gchar *title);
+-static gboolean need_palette (const gchar *file);
++static gboolean need_palette (const gchar *file,
++ GError **error);
+
+
+ /* Globals... */
+@@ -150,6 +153,7 @@ run (const gchar *name,
+ gint32 image;
+ GimpExportReturn export = GIMP_EXPORT_CANCEL;
+ GError *error = NULL;
++ gint needs_palette = 0;
+
+ run_mode = param[0].data.d_int32;
+
+@@ -187,20 +191,32 @@ run (const gchar *name,
+ else if (run_mode == GIMP_RUN_INTERACTIVE)
+ {
+ /* Let user choose KCF palette (cancel ignores) */
+- if (need_palette (param[1].data.d_string))
+- palette_dialog (_("Load KISS Palette"));
++ needs_palette = need_palette (param[1].data.d_string, &error);
+
+- gimp_set_data (SAVE_PROC, palette_file, data_length);
+- }
++ if (! error)
++ {
++ if (needs_palette)
++ palette_dialog (_("Load KISS Palette"));
+
+- image = load_image (param[1].data.d_string, param[2].data.d_string,
+- &error);
++ gimp_set_data (SAVE_PROC, palette_file, data_length);
++ }
++ }
+
+- if (image != -1)
++ if (! error)
+ {
+- *nreturn_vals = 2;
+- values[1].type = GIMP_PDB_IMAGE;
+- values[1].data.d_image = image;
++ image = load_image (param[1].data.d_string, param[2].data.d_string,
++ &error);
++
++ if (image != -1)
++ {
++ *nreturn_vals = 2;
++ values[1].type = GIMP_PDB_IMAGE;
++ values[1].data.d_image = image;
++ }
++ else
++ {
++ status = GIMP_PDB_EXECUTION_ERROR;
++ }
+ }
+ else
+ {
+@@ -263,18 +279,33 @@ run (const gchar *name,
+
+ /* Peek into the file to determine whether we need a palette */
+ static gboolean
+-need_palette (const gchar *file)
++need_palette (const gchar *file,
++ GError **error)
+ {
+ FILE *fp;
+ guchar header[32];
++ size_t n_read;
+
+ fp = g_fopen (file, "rb");
+- if (!fp)
+- return FALSE;
++ if (fp == NULL)
++ {
++ g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
++ _("Could not open '%s' for reading: %s"),
++ gimp_filename_to_utf8 (file), g_strerror (errno));
++ return FALSE;
++ }
++
++ n_read = fread (header, 32, 1, fp);
+
+- fread (header, 32, 1, fp);
+ fclose (fp);
+
++ if (n_read < 1)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("EOF or error while reading image header"));
++ return FALSE;
++ }
++
+ return (header[5] < 32);
+ }
+
+@@ -286,11 +317,12 @@ load_image (const gchar *file,
+ GError **error)
+ {
+ FILE *fp; /* Read file pointer */
+- guchar header[32]; /* File header */
++ guchar header[32], /* File header */
++ file_mark, /* KiSS file type */
++ bpp; /* Bits per pixel */
+ gint height, width, /* Dimensions of image */
+ offx, offy, /* Layer offets */
+- colours, /* Number of colours */
+- bpp; /* Bits per pixel */
++ colours; /* Number of colours */
+
+ gint32 image, /* Image */
+ layer; /* Layer */
+@@ -301,6 +333,7 @@ load_image (const gchar *file,
+ GimpPixelRgn pixel_rgn; /* Pixel region for layer */
+
+ gint i, j, k; /* Counters */
++ size_t n_read; /* Number of items read from file */
+
+
+ /* Open the file for reading */
+@@ -319,7 +352,14 @@ load_image (const gchar *file,
+
+ /* Get the image dimensions and create the image... */
+
+- fread (header, 4, 1, fp);
++ n_read = fread (header, 4, 1, fp);
++
++ if (n_read < 1)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("EOF or error while reading image header"));
++ return -1;
++ }
+
+ if (strncmp ((const gchar *) header, "KiSS", 4))
+ {
+@@ -332,18 +372,53 @@ load_image (const gchar *file,
+ }
+ else
+ { /* New-style image file, read full header */
+- fread (header, 28, 1, fp);
++ n_read = fread (header, 28, 1, fp);
++
++ if (n_read < 1)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("EOF or error while reading image header"));
++ return -1;
++ }
++
++ file_mark = header[0];
++ if (file_mark != 0x20 && file_mark != 0x21)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("is not a CEL image file"));
++ return -1;
++ }
++
+ bpp = header[1];
+- if (bpp == 24)
+- colours = -1;
+- else
+- colours = (1 << header[1]);
++ switch (bpp)
++ {
++ case 4:
++ case 8:
++ case 32:
++ colours = (1 << bpp);
++ break;
++ default:
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("illegal bpp value in image: %hhu"), bpp);
++ return -1;
++ }
++
+ width = header[4] + (256 * header[5]);
+ height = header[6] + (256 * header[7]);
+ offx = header[8] + (256 * header[9]);
+ offy = header[10] + (256 * header[11]);
+ }
+
++ if ((width == 0) || (height == 0) || (width + offx > GIMP_MAX_IMAGE_SIZE) ||
++ (height + offy > GIMP_MAX_IMAGE_SIZE))
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("illegal image dimensions: width: %d, horizontal offset: "
++ "%d, height: %d, vertical offset: %d"),
++ width, offx, height, offy);
++ return -1;
++ }
++
+ if (bpp == 32)
+ image = gimp_image_new (width + offx, height + offy, GIMP_RGB);
+ else
+@@ -351,7 +426,8 @@ load_image (const gchar *file,
+
+ if (image == -1)
+ {
+- g_message (_("Can't create a new image"));
++ g_set_error (error, 0, 0, _("Can't create a new image"));
++ fclose (fp);
+ return -1;
+ }
+
+@@ -383,7 +459,15 @@ load_image (const gchar *file,
+ switch (bpp)
+ {
+ case 4:
+- fread (buffer, (width+1)/2, 1, fp);
++ n_read = fread (buffer, (width+1)/2, 1, fp);
++
++ if (n_read < 1)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("EOF or error while reading image data"));
++ return -1;
++ }
++
+ for (j = 0, k = 0; j < width*2; j+= 4, ++k)
+ {
+ if (buffer[k] / 16 == 0)
+@@ -410,7 +494,15 @@ load_image (const gchar *file,
+ break;
+
+ case 8:
+- fread (buffer, width, 1, fp);
++ n_read = fread (buffer, width, 1, fp);
++
++ if (n_read < 1)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("EOF or error while reading image data"));
++ return -1;
++ }
++
+ for (j = 0, k = 0; j < width*2; j+= 2, ++k)
+ {
+ if (buffer[k] == 0)
+@@ -427,7 +519,15 @@ load_image (const gchar *file,
+ break;
+
+ case 32:
+- fread (line, width*4, 1, fp);
++ n_read = fread (line, width*4, 1, fp);
++
++ if (n_read < 1)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("EOF or error while reading image data"));
++ return -1;
++ }
++
+ /* The CEL file order is BGR so we need to swap B and R
+ * to get the Gimp RGB order.
+ */
+@@ -440,7 +540,8 @@ load_image (const gchar *file,
+ break;
+
+ default:
+- g_message (_("Unsupported bit depth (%d)!"), bpp);
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("Unsupported bit depth (%d)!"), bpp);
+ return -1;
+ }
+
+@@ -457,7 +558,7 @@ load_image (const gchar *file,
+ if (bpp != 32)
+ {
+ /* Use palette from file or otherwise default grey palette */
+- palette = g_new (guchar, colours*3);
++ guchar palette[256*3];
+
+ /* Open the file for reading if user picked one */
+ if (palette_file == NULL)
+@@ -467,12 +568,23 @@ load_image (const gchar *file,
+ else
+ {
+ fp = g_fopen (palette_file, "r");
++
++ if (fp == NULL)
++ {
++ g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno),
++ _("Could not open '%s' for reading: %s"),
++ gimp_filename_to_utf8 (palette_file),
++ g_strerror (errno));
++ return -1;
++ }
+ }
+
+ if (fp != NULL)
+ {
+- colours = load_palette (fp, palette);
++ colours = load_palette (palette_file, fp, palette, error);
+ fclose (fp);
++ if (colours < 0 || *error)
++ return -1;
+ }
+ else
+ {
+@@ -483,10 +595,6 @@ load_image (const gchar *file,
+ }
+
+ gimp_image_set_colormap (image, palette + 3, colours - 1);
+-
+- /* Close palette file, give back allocated memory */
+-
+- g_free (palette);
+ }
+
+ /* Now get everything redrawn and hand back the finished image */
+@@ -498,32 +606,100 @@ load_image (const gchar *file,
+ }
+
+ static gint
+-load_palette (FILE *fp,
+- guchar palette[])
++load_palette (const gchar *file,
++ FILE *fp,
++ guchar palette[],
++ GError **error)
+ {
+ guchar header[32]; /* File header */
+ guchar buffer[2];
+- int i, bpp, colours= 0;
++ guchar file_mark, bpp;
++ gint i, colours = 0;
++ size_t n_read;
++
++ n_read = fread (header, 4, 1, fp);
++
++ if (n_read < 1)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("'%s': EOF or error while reading palette header"),
++ gimp_filename_to_utf8 (file));
++ return -1;
++ }
+
+- fread (header, 4, 1, fp);
+ if (!strncmp ((const gchar *) header, "KiSS", 4))
+ {
+- fread (header+4, 28, 1, fp);
++ n_read = fread (header+4, 28, 1, fp);
++
++ if (n_read < 1)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("'%s': EOF or error while reading palette header"),
++ gimp_filename_to_utf8 (file));
++ return -1;
++ }
++
++ file_mark = header[4];
++ if (file_mark != 0x10)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("'%s': is not a KCF palette file"),
++ gimp_filename_to_utf8 (file));
++ return -1;
++ }
++
+ bpp = header[5];
++ if (bpp != 12 && bpp != 24)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("'%s': illegal bpp value in palette: %hhu"),
++ gimp_filename_to_utf8 (file), bpp);
++ return -1;
++ }
++
+ colours = header[8] + header[9] * 256;
+- if (bpp == 12)
++ if (colours != 16 && colours != 256)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("'%s': illegal number of colors: %u"),
++ gimp_filename_to_utf8 (file), colours);
++ return -1;
++ }
++
++ switch (bpp)
+ {
++ case 12:
+ for (i = 0; i < colours; ++i)
+ {
+- fread (buffer, 1, 2, fp);
++ n_read = fread (buffer, 1, 2, fp);
++
++ if (n_read < 2)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("'%s': EOF or error while reading "
++ "palette data"),
++ gimp_filename_to_utf8 (file));
++ return -1;
++ }
++
+ palette[i*3]= buffer[0] & 0xf0;
+ palette[i*3+1]= (buffer[1] & 0x0f) * 16;
+ palette[i*3+2]= (buffer[0] & 0x0f) * 16;
+ }
+- }
+- else
+- {
+- fread (palette, colours, 3, fp);
++ break;
++ case 24:
++ n_read = fread (palette, colours, 3, fp);
++
++ if (n_read < 3)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("'%s': EOF or error while reading palette data"),
++ gimp_filename_to_utf8 (file));
++ return -1;
++ }
++ break;
++ default:
++ g_assert_not_reached ();
+ }
+ }
+ else
+@@ -532,7 +708,16 @@ load_palette (FILE *fp,
+ fseek (fp, 0, SEEK_SET);
+ for (i= 0; i < colours; ++i)
+ {
+- fread (buffer, 1, 2, fp);
++ n_read = fread (buffer, 1, 2, fp);
++
++ if (n_read < 2)
++ {
++ g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
++ _("'%s': EOF or error while reading palette data"),
++ gimp_filename_to_utf8 (file));
++ return -1;
++ }
++
+ palette[i*3] = buffer[0] & 0xf0;
+ palette[i*3+1] = (buffer[1] & 0x0f) * 16;
+ palette[i*3+2] = (buffer[0] & 0x0f) * 16;
+--
+1.7.11.4
+
diff --git a/media-gfx/gimp/files/gimp-2.6.12-CVE-2012-3481.patch b/media-gfx/gimp/files/gimp-2.6.12-CVE-2012-3481.patch
new file mode 100644
index 000000000000..a5aee6a34473
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.6.12-CVE-2012-3481.patch
@@ -0,0 +1,56 @@
+From 26b208c5aef5f7801bf0538f8df549f0bf8dcb92 Mon Sep 17 00:00:00 2001
+From: Nils Philippsen
+Date: Mon, 20 Aug 2012 15:30:33 +0200
+Subject: [PATCH] patch: CVE-2012-3481
+
+Squashed commit of the following:
+
+commit c56f3dc25cd4941f465e88bd91a0e107a4ac1b5e
+Author: Nils Philippsen
+Date: Tue Aug 14 15:27:39 2012 +0200
+
+ file-gif-load: fix type overflow (CVE-2012-3481)
+
+ Cast variables properly to avoid overflowing when computing how much
+ memory to allocate.
+ (cherry picked from commit 43fc9dbd8e2196944c8a71321e525b89b7df9f5c)
+
+commit 11e922a8cee5c9bb532e2a996d2db3beab6da6cb
+Author: Jan Lieskovsky
+Date: Tue Aug 14 12:18:22 2012 +0200
+
+ file-gif-load: limit len and height (CVE-2012-3481)
+
+ Ensure values of len and height can't overflow g_malloc() argument type.
+ (cherry picked from commit d95c2f0bcb6775bdee2bef35b7d84f6dfd490783)
+---
+ plug-ins/common/file-gif-load.c | 11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+diff --git a/plug-ins/common/file-gif-load.c b/plug-ins/common/file-gif-load.c
+index 8460ec0..295c351 100644
+--- a/plug-ins/common/file-gif-load.c
++++ b/plug-ins/common/file-gif-load.c
+@@ -1028,10 +1028,17 @@ ReadImage (FILE *fd,
+ cur_progress = 0;
+ max_progress = height;
+
++ if (len > (G_MAXSIZE / height / (alpha_frame ? (promote_to_rgb ? 4 : 2) : 1)))
++ {
++ g_message ("'%s' has a larger image size than GIMP can handle.",
++ gimp_filename_to_utf8 (filename));
++ return -1;
++ }
++
+ if (alpha_frame)
+- dest = (guchar *) g_malloc (len * height * (promote_to_rgb ? 4 : 2));
++ dest = (guchar *) g_malloc ((gsize)len * (gsize)height * (promote_to_rgb ? 4 : 2));
+ else
+- dest = (guchar *) g_malloc (len * height);
++ dest = (guchar *) g_malloc ((gsize)len * (gsize)height);
+
+ #ifdef GIFDEBUG
+ g_print ("GIF: reading %d by %d%s GIF image, ncols=%d\n",
+--
+1.7.11.4
+
diff --git a/media-gfx/gimp/gimp-2.6.12-r4.ebuild b/media-gfx/gimp/gimp-2.6.12-r4.ebuild
new file mode 100644
index 000000000000..6376c271f0c2
--- /dev/null
+++ b/media-gfx/gimp/gimp-2.6.12-r4.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.12-r4.ebuild,v 1.1 2012/09/15 01:35:53 sping Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="python? 2:2.5"
+
+inherit eutils gnome2 fdo-mime multilib python
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="http://www.gimp.org/"
+SRC_URI="
+ http://dev.gentoo.org/~jlec/distfiles/${PN}-2.6.11-underlinking.patch.xz
+ mirror://gimp/v2.6/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+LANGS="am ar ast az be bg ca ca@valencia cs da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml mr ms my nb nds ne nl nn oc or pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
+IUSE="alsa aalib altivec curl dbus debug doc exif gnome jpeg lcms mmx mng pdf png python smp sse svg tiff webkit wmf"
+
+for lang in ${LANGS}; do
+ IUSE+=" linguas_${lang}"
+done
+
+RDEPEND="
+ >=dev-libs/glib-2.18.1:2
+ dev-libs/libxml2
+ dev-libs/libxslt
+ >=media-libs/fontconfig-2.2.0
+ >=media-libs/freetype-2.1.7
+ >=media-libs/gegl-0.0.22 =x11-libs/gtk+-2.12.5:2
+ x11-libs/libXpm
+ >=x11-libs/pango-1.18.0
+ sys-libs/zlib
+ x11-themes/hicolor-icon-theme
+ aalib? ( media-libs/aalib )
+ alsa? ( media-libs/alsa-lib )
+ curl? ( net-misc/curl )
+ dbus? ( dev-libs/dbus-glib )
+ exif? ( >=media-libs/libexif-0.6.15 )
+ gnome? ( gnome-base/gvfs )
+ jpeg? ( virtual/jpeg:0 )
+ lcms? ( =media-libs/lcms-1* )
+ mng? ( media-libs/libmng )
+ pdf? ( >=app-text/poppler-0.12.3-r3[cairo] )
+ png? ( >=media-libs/libpng-1.2.2:0 )
+ python? ( >=dev-python/pygtk-2.10.4:2 )
+ svg? ( >=gnome-base/librsvg-2.8.0:2 )
+ tiff? ( >=media-libs/tiff-3.5.7:0 )
+ webkit? ( net-libs/webkit-gtk:2 )
+ wmf? ( >=media-libs/libwmf-0.2.8 )"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ >=sys-devel/gettext-0.17
+ doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
+
+pkg_setup() {
+ G2CONF="--enable-default-binary \
+ --with-x \
+ $(use_with aalib aa) \
+ $(use_with alsa) \
+ $(use_enable altivec) \
+ $(use_with curl libcurl) \
+ $(use_with dbus) \
+ --without-hal \
+ $(use_with gnome gvfs) \
+ --without-gnomevfs \
+ $(use_with webkit) \
+ $(use_with jpeg libjpeg) \
+ $(use_with exif libexif) \
+ $(use_with lcms) \
+ $(use_enable mmx) \
+ $(use_with mng libmng) \
+ $(use_with pdf poppler) \
+ $(use_with png libpng) \
+ $(use_enable python) \
+ $(use_enable smp mp) \
+ $(use_enable sse) \
+ $(use_with svg librsvg) \
+ $(use_with tiff libtiff) \
+ $(use_with wmf)"
+
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
+ fi
+}
+
+src_prepare() {
+ # don't use empty, removed header
+ # https://bugs.gentoo.org/show_bug.cgi?id=377075
+ epatch "${FILESDIR}"/gimp-curl-headers.diff
+
+ # apply file-uri patch by upstream
+ # https://bugs.gentoo.org/show_bug.cgi?id=372941
+ # https://bugzilla.gnome.org/show_bug.cgi?id=653980#c6
+ epatch "${FILESDIR}"/${PN}-2.6.11-file-uri.patch
+
+ # fix test suite
+ # https://bugs.gentoo.org/show_bug.cgi?id=406625
+ epatch "${FILESDIR}"/${P}-potfiles-skip.patch
+
+ # buffer overflow patch backport
+ # https://bugs.gentoo.org/show_bug.cgi?id=418425
+ epatch "${FILESDIR}"/${P}-CVE-2012-2763.patch
+
+ # CEL and GIF plug-ins: Heap-based buffer overflows (CVE-2012-{3403,3481})
+ # https://bugs.gentoo.org/show_bug.cgi?id=434580
+ # Patches from Fedora
+ epatch "${FILESDIR}"/${P}-CVE-2012-3403.patch
+ epatch "${FILESDIR}"/${P}-CVE-2012-3481.patch
+
+ echo '#!/bin/sh' > py-compile
+ gnome2_src_prepare
+}
+
+_clean_up_locales() {
+ elog "Cleaning up locales..."
+ for lang in ${LANGS}; do
+ use "linguas_${lang}" && {
+ elog "- keeping ${lang}"
+ continue
+ }
+ rm -Rf "${D}"/usr/share/locale/"${lang}" || die
+ done
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use python; then
+ python_convert_shebangs -r $(python_get_version) "${ED}"
+ python_need_rebuild
+ fi
+
+ # Workaround for bug #321111 to give GIMP the least
+ # precedence on PDF documents by default
+ mv "${D}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+ find "${D}" -name '*.la' -delete || die
+
+ _clean_up_locales
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ use python && python_mod_optimize /usr/$(get_libdir)/gimp/2.0/python \
+ /usr/$(get_libdir)/gimp/2.0/plug-ins
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ use python && python_mod_cleanup /usr/$(get_libdir)/gimp/2.0/python \
+ /usr/$(get_libdir)/gimp/2.0/plug-ins
+}
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index e870bf3a55de..875712a4b891 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,4 +1,4 @@
-DIST libgexiv2-0.1.0.tar.bz2 23971 RMD160 8f8ffb19b58772679437df072153eb26101345b1 SHA1 31d14d35189e128f3c72e51cf627fa462dc60dd9 SHA256 0efddbda2e103f0704f57b06571cacded7401323480082107ee5cde3f1d61f6f
-DIST libgexiv2-0.2.1.tar.bz2 24419 RMD160 4882c83a2646c3dc8f4ac0a885e76129f1ddc3b9 SHA1 b7ab9c35ed221dc18ab4493c51b7b9aac936867f SHA256 6279becd711de669606a95d6a2198000ef3909611b19fdfd9478a0cf265243da
-DIST libgexiv2-0.3.1.tar.bz2 25083 RMD160 562f8474c27353eb285a3670e2ba1b8005282875 SHA1 828894bb4bcb4625820b8c0c468417e9cd8c5c2f SHA256 27cc4247cb5d6513c235a2a0fe4e3a5a35fc7010d37cb9fe117001c941b139ae
-DIST libgexiv2-0.4.1.tar.bz2 25484 RMD160 5a13ef1646996a6e58956be34e1ec8b34b6390c1 SHA1 b74cd19a4cf4a4a32a938ecb267974c29e630dc2 SHA256 c51e8bae7e53866b474b51e4eef19b98385fbeaf2edac2aefd7d24ed3f7d9d6e
+DIST libgexiv2-0.1.0.tar.bz2 23971 SHA256 0efddbda2e103f0704f57b06571cacded7401323480082107ee5cde3f1d61f6f
+DIST libgexiv2-0.2.1.tar.bz2 24419 SHA256 6279becd711de669606a95d6a2198000ef3909611b19fdfd9478a0cf265243da
+DIST libgexiv2-0.3.1.tar.bz2 25083 SHA256 27cc4247cb5d6513c235a2a0fe4e3a5a35fc7010d37cb9fe117001c941b139ae
+DIST libgexiv2-0.4.1.tar.bz2 25484 SHA256 c51e8bae7e53866b474b51e4eef19b98385fbeaf2edac2aefd7d24ed3f7d9d6e SHA512 cbc9b2e6c7bbb6ef1862d6cb2cc8319843dad46d7a14b7340cab368dd6cd9bda5b776ecf3980c835b60b17ba3d49717b4194bdac82324c27013b03df04fddfb5 WHIRLPOOL 2c8300d5971bf7f5cfd11ff5d34d22af32e7951b0e8434e874b840fba0027409e21b5ec72a59182ee14a3fdace62a1196e2c8a3d5c9ee3d763836ba16babc9c4
diff --git a/media-libs/gexiv2/gexiv2-0.4.1.ebuild b/media-libs/gexiv2/gexiv2-0.4.1.ebuild
index d317da70bcd9..9561782290fe 100644
--- a/media-libs/gexiv2/gexiv2-0.4.1.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gexiv2/gexiv2-0.4.1.ebuild,v 1.2 2012/05/05 08:02:25 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gexiv2/gexiv2-0.4.1.ebuild,v 1.3 2012/09/14 17:34:48 ago Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="http://www.yorba.org/download/${PN}/${MY_PV}/lib${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="static-libs"
RDEPEND="
diff --git a/media-libs/imlib2/Manifest b/media-libs/imlib2/Manifest
index b4abb668a015..ed8630c7ad33 100644
--- a/media-libs/imlib2/Manifest
+++ b/media-libs/imlib2/Manifest
@@ -1,2 +1,2 @@
-DIST imlib2-1.4.4.tar.gz 977630 SHA256 a4de52c90b8cd155b41ca70c2d34209f7b94a9e4f8e77582f2682a1795306198
-DIST imlib2-1.4.5.tar.gz 986785 SHA256 6e809413a571f82b9e67aeaf5577a1245a034c866ae5fa83c191a227f60cc7a0
+DIST imlib2-1.4.4.tar.gz 977630 SHA256 a4de52c90b8cd155b41ca70c2d34209f7b94a9e4f8e77582f2682a1795306198 SHA512 657ca882e7358fb021ce08247f1f7dedee1aeb0e5fb7daa2dec4bf4859106801429eef3404ddb263fc3eccfde631d8559a69fec9f0cf23a6ca45bcbc98d3a380 WHIRLPOOL 4432edb84ea07c1d71d1e53459eea3378a18d1916a3d0b5514dbbc20b693197c3b10374b04b89caf0e268257963e0d3b33b8670242844e1fa5bb3cb70ff9c2cf
+DIST imlib2-1.4.5.tar.gz 986785 SHA256 6e809413a571f82b9e67aeaf5577a1245a034c866ae5fa83c191a227f60cc7a0 SHA512 6c3bceec39ffcb7515925c3eb4199834295732a1cc9cfa307aa8610e2565e770edfc5464ca983d1d95570bd9bac09c989e0751fa39b07cf794c0c5dce4262edf WHIRLPOOL 53c003601ca6f89927794af0f0ba48f31cce31504061b71f68f0d67b0c4266d2617a24df467af2a03d485d129ad6de745382338addf39f70810ec71db6b0833c
diff --git a/media-libs/imlib2/imlib2-1.4.5.ebuild b/media-libs/imlib2/imlib2-1.4.5.ebuild
index a6c6c71ac3dd..948135297779 100644
--- a/media-libs/imlib2/imlib2-1.4.5.ebuild
+++ b/media-libs/imlib2/imlib2-1.4.5.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/imlib2/imlib2-1.4.5.ebuild,v 1.5 2012/09/11 00:51:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.4.5.ebuild,v 1.6 2012/09/14 14:21:35 ago Exp $
EAPI=4
inherit enlightenment toolchain-funcs
@@ -8,7 +8,7 @@ inherit enlightenment toolchain-funcs
DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm"
HOMEPAGE="http://www.enlightenment.org/"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE="X bzip2 gif jpeg mmx mp3 png static-libs tiff zlib"
RDEPEND="=media-libs/freetype-2*
diff --git a/media-libs/jasper/jasper-1.900.1-r5.ebuild b/media-libs/jasper/jasper-1.900.1-r5.ebuild
index 19be3db53b54..4180a0dbf887 100644
--- a/media-libs/jasper/jasper-1.900.1-r5.ebuild
+++ b/media-libs/jasper/jasper-1.900.1-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/media-libs/jasper/jasper-1.900.1-r5.ebuild,v 1.2 2012/09/06 15:56:12 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jasper/jasper-1.900.1-r5.ebuild,v 1.3 2012/09/14 18:35:11 maekke Exp $
EAPI=3
@@ -13,7 +13,7 @@ SRC_URI="http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-${PV}.zip
LICENSE="JasPer2.0"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="jpeg opengl static-libs"
RDEPEND="jpeg? ( virtual/jpeg )
diff --git a/media-libs/libirman/Manifest b/media-libs/libirman/Manifest
index aa48c772e074..da737095993d 100644
--- a/media-libs/libirman/Manifest
+++ b/media-libs/libirman/Manifest
@@ -1 +1,2 @@
+DIST libirman-0.4.2.tar.gz 52665 SHA256 43b12f243c6978ffa85dc4a606335b1e46b5df870e61e3381387edae4f20beb8 SHA512 4bca358dae5b3a02dd2f654eb2534565ef4b66d0f728c7248ba21c14d5a0b06cb85c2cd2d162460ca0bbac381527abb69a29d4178bb0ee3b21429dd74d085d9c WHIRLPOOL d42b046b503c7dd97ecf8890e90e96d92463268a87486972c0d0947773f4ab889a0383822a51aa2336c92244416c5cb2319b86debb826815aed8915d30a0a014
DIST libirman-0.4.5.tar.bz2 225330 SHA256 e0220645fedb511277720c03feb5fbf51ec2cef08f8e859c0ff4ecff4286064e SHA512 5b0a8e1c0699bf1d8b43bbb2320b3abbd1f8d400264efd78d1cfb5ea942ff1d272b150012dfa61f5afc427824282a62755ec1e1189dd3d849a5f62293125ffb3 WHIRLPOOL 6cf209e416bc162acc5142ab2ce3f390700cdc05cc8a521206a9293322d46d481c8b59bd5bcfa1a1c9d590a79d9e485e2dfd3246b4ff6a6fe7a59288ef37880d
diff --git a/media-libs/libirman/files/libirman-0.4.2-PICShared.patch b/media-libs/libirman/files/libirman-0.4.2-PICShared.patch
new file mode 100644
index 000000000000..1b8025581a6c
--- /dev/null
+++ b/media-libs/libirman/files/libirman-0.4.2-PICShared.patch
@@ -0,0 +1,73 @@
+diff -Naur libirman-0.4.2.orig/Makefile.in libirman-0.4.2/Makefile.in
+--- libirman-0.4.2.orig/Makefile.in 1999-03-28 15:42:41.000000000 -0800
++++ libirman-0.4.2/Makefile.in 2004-07-04 23:39:43.101677411 -0700
+@@ -16,7 +16,7 @@
+ CC = @CC@
+ TAR = tar
+
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fPIC -DPIC
+ CPPFLAGS = -I. @CPPFLAGS@ @DEFS@
+ LDFLAGS = @LDFLAGS@ -L. -lirman
+ LDFLAGS_SW = @LDFLAGS@ -L. -lirman_sw
+@@ -58,9 +58,9 @@
+ both: standard swtest
+
+
+-libirman: libirman.a
++libirman: libirman.a libirman.so
+
+-libirman_sw: libirman_sw.a
++libirman_sw: libirman_sw.a libirman_sw.so
+
+
+ test_io: libirman.a $(IO_OBJS)
+@@ -85,10 +85,16 @@
+ $(AR) $(ARFLAGS) libirman.a $(IROBJS)
+ $(RANLIB) libirman.a
+
++libirman.so: $(IROBJS)
++ $(CC) -shared -Wl,-shared,-soname,libirman.so -o libirman.so $(IROBJS)
++
+ libirman_sw.a: $(IROBJS_SW)
+ $(AR) $(ARFLAGS) libirman_sw.a $(IROBJS_SW)
+ $(RANLIB) libirman_sw.a
+
++libirman_sw.so: $(IROBJS_SW)
++ $(CC) -shared -Wl,-shared,-soname,libirman_sw.so -o libirman_sw.so $(IROBJS_SW)
++
+ %.o: %.c irman.h config.h
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+
+@@ -96,7 +102,7 @@
+ $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+
+ ircmd.o: ircmd.c irman.h config.h
+- $(CC) $(CPPFLAGS) -DIR_SYSCONF_DIR=\"$(sysconfdir)\" -c $(srcdir)/ircmd.c -o ircmd.o
++ $(CC) $(CFLAGS) $(CPPFLAGS) -DIR_SYSCONF_DIR=\"$(sysconfdir)\" -c $(srcdir)/ircmd.c -o ircmd.o
+ irfunc_sw.o: irfunc.c irman.h
+ $(CC) $(CPPFLAGS) -DIR_SOFTWARE_TEST $(CFLAGS) -c $(srcdir)/irfunc.c -o irfunc_sw.o
+
+@@ -114,18 +120,22 @@
+ install-normal:
+ $(INSTALL) -m 755 workmanir $(bindir)/workmanir
+ $(INSTALL) -m 755 libirman.a $(libdir)/libirman.a
++ $(INSTALL) -m 755 libirman.so $(libdir)/libirman.so
+ $(INSTALL) -m 644 irman.conf $(sysconfdir)/irman.conf
+ $(INSTALL) -m 644 irman.h $(includedir)/irman.h
+
+ install-swtest:
+ $(INSTALL) -m 755 workmanir $(bindir)/workmanir
+ $(INSTALL) -m 755 libirman_sw.a $(libdir)/libirman_sw.a
++ $(INSTALL) -m 755 libirman_sw.so $(libdir)/libirman_sw.so
+
+ uninstall:
+ $(RM) $(bindir)/workmanir
+ $(RM) $(bindir)/workmanir_sw
+ $(RM) $(libdir)/libirman.a
++ $(RM) $(libdir)/libirman.so
+ $(RM) $(libdir)/libirman_sw.a
++ $(RM) $(libdir)/libirman_sw.so
+ $(RM) $(sysconfdir)/irman.conf
+
+ dist:
diff --git a/media-libs/libirman/files/libirman-0.4.2-destdir.patch b/media-libs/libirman/files/libirman-0.4.2-destdir.patch
new file mode 100644
index 000000000000..cb4d94b4d1a6
--- /dev/null
+++ b/media-libs/libirman/files/libirman-0.4.2-destdir.patch
@@ -0,0 +1,38 @@
+diff -Naur libirman-0.4.2.orig/Makefile.in libirman-0.4.2/Makefile.in
+--- libirman-0.4.2.orig/Makefile.in 2004-09-24 02:58:09.312603000 -0700
++++ libirman-0.4.2/Makefile.in 2004-09-24 02:59:22.620612916 -0700
+@@ -112,22 +112,22 @@
+ @echo notice: the test programs are only installed in the current directory \(`pwd`\)
+
+ install-dirs:
+- $(top_srcdir)/mkinstalldirs $(libdir)
+- $(top_srcdir)/mkinstalldirs $(bindir)
+- $(top_srcdir)/mkinstalldirs $(sbindir)
+- $(top_srcdir)/mkinstalldirs $(sysconfdir)
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
++ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+
+ install-normal:
+- $(INSTALL) -m 755 workmanir $(bindir)/workmanir
+- $(INSTALL) -m 755 libirman.a $(libdir)/libirman.a
+- $(INSTALL) -m 755 libirman.so $(libdir)/libirman.so
+- $(INSTALL) -m 644 irman.conf $(sysconfdir)/irman.conf
+- $(INSTALL) -m 644 irman.h $(includedir)/irman.h
++ $(INSTALL) -m 755 workmanir $(DESTDIR)$(bindir)/workmanir
++ $(INSTALL) -m 755 libirman.a $(DESTDIR)$(libdir)/libirman.a
++ $(INSTALL) -m 755 libirman.so $(DESTDIR)$(libdir)/libirman.so
++ $(INSTALL) -m 644 irman.conf $(DESTDIR)$(sysconfdir)/irman.conf
++ $(INSTALL) -m 644 irman.h $(DESTDIR)$(includedir)/irman.h
+
+ install-swtest:
+- $(INSTALL) -m 755 workmanir $(bindir)/workmanir
+- $(INSTALL) -m 755 libirman_sw.a $(libdir)/libirman_sw.a
+- $(INSTALL) -m 755 libirman_sw.so $(libdir)/libirman_sw.so
++ $(INSTALL) -m 755 workmanir $(DESTDIR)$(bindir)/workmanir
++ $(INSTALL) -m 755 libirman_sw.a $(DESTDIR)$(libdir)/libirman_sw.a
++ $(INSTALL) -m 755 libirman_sw.so $(DESTDIR)$(libdir)/libirman_sw.so
+
+ uninstall:
+ $(RM) $(bindir)/workmanir
diff --git a/media-libs/libirman/files/libirman-0.4.2-format.patch b/media-libs/libirman/files/libirman-0.4.2-format.patch
new file mode 100644
index 000000000000..ee1c4f5cfe74
--- /dev/null
+++ b/media-libs/libirman/files/libirman-0.4.2-format.patch
@@ -0,0 +1,13 @@
+Index: libirman-0.4.2/workmanir.c
+===================================================================
+--- libirman-0.4.2.orig/workmanir.c
++++ libirman-0.4.2/workmanir.c
+@@ -148,7 +148,7 @@ int main(int argc, char **argv)
+
+ errno = 0;
+ if (ir_init(filename) < 0) {
+- fprintf(stderr, "%s: error initialising Irman: `%s'\n", ir_strerror(errno));
++ fprintf(stderr, "%s: error initialising Irman: `%s'\n", progname, ir_strerror(errno));
+ exit(1);
+ }
+
diff --git a/media-libs/libirman/files/libirman-0.4.2-gcc4.patch b/media-libs/libirman/files/libirman-0.4.2-gcc4.patch
new file mode 100644
index 000000000000..4c21df4a7a2a
--- /dev/null
+++ b/media-libs/libirman/files/libirman-0.4.2-gcc4.patch
@@ -0,0 +1,13 @@
+Index: libirman-0.4.2/chunk.c
+===================================================================
+--- libirman-0.4.2.orig/chunk.c
++++ libirman-0.4.2/chunk.c
+@@ -122,7 +122,7 @@ void *ch_malloc(size_t numbytes, chunk_t
+
+ ptr = ch->top;
+ ch->free -= numbytes;
+- (char *)ch->top += numbytes;
++ ch->top = (char*)(ch->top) + numbytes;
+
+ return ptr;
+ }
diff --git a/media-libs/libirman/libirman-0.4.2-r1.ebuild b/media-libs/libirman/libirman-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..31efae0b743d
--- /dev/null
+++ b/media-libs/libirman/libirman-0.4.2-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libirman/libirman-0.4.2-r1.ebuild,v 1.15 2012/09/14 17:33:11 axs Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="library for Irman control of Unix software"
+SRC_URI="http://www.lirc.org/software/snapshots/${P}.tar.gz"
+HOMEPAGE="http://www.evation.com/libirman/libirman.html"
+
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE=""
+
+src_unpack() {
+ unpack ${A}
+
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-PICShared.patch"
+ epatch "${FILESDIR}/${P}-destdir.patch"
+ epatch "${FILESDIR}/${P}-format.patch"
+ epatch "${FILESDIR}/${P}-gcc4.patch"
+}
+
+src_compile() {
+ tc-export CC LD AR RANLIB
+
+ econf || die "econf failed"
+ emake -j1 || die "emake failed"
+}
+
+src_install() {
+ dodir /usr/include
+
+ make DESTDIR="${D}" \
+ LIRC_DRIVER_DEVICE="${D}/dev/lirc" \
+ install || die
+
+ dobin test_func test_io test_name
+ dodoc NEWS README* TECHNICAL TODO
+}
diff --git a/media-libs/libshout/libshout-2.3.1.ebuild b/media-libs/libshout/libshout-2.3.1.ebuild
index 7e844ed4845d..d5c3405e4e84 100644
--- a/media-libs/libshout/libshout-2.3.1.ebuild
+++ b/media-libs/libshout/libshout-2.3.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/libshout/libshout-2.3.1.ebuild,v 1.2 2012/09/13 10:15:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libshout/libshout-2.3.1.ebuild,v 1.3 2012/09/14 18:51:16 maekke Exp $
EAPI=4
@@ -10,7 +10,7 @@ SRC_URI="http://downloads.xiph.org/releases/libshout/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="speex theora"
RDEPEND="media-libs/libogg
diff --git a/media-libs/raptor/raptor-2.0.8.ebuild b/media-libs/raptor/raptor-2.0.8.ebuild
index 91d425988cce..834791703351 100644
--- a/media-libs/raptor/raptor-2.0.8.ebuild
+++ b/media-libs/raptor/raptor-2.0.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-2.0.8.ebuild,v 1.2 2012/09/13 10:19:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-2.0.8.ebuild,v 1.3 2012/09/14 18:50:01 maekke Exp $
EAPI=4
inherit eutils libtool
@@ -14,7 +14,7 @@ SRC_URI="http://download.librdf.org/source/${MY_P}.tar.gz"
LICENSE="Apache-2.0 GPL-2 LGPL-2.1"
SLOT="2"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+curl debug json static-libs unicode"
RDEPEND="dev-libs/libxml2
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-fPIC.patch b/media-libs/svgalib/files/svgalib-1.9.25-fPIC.patch
deleted file mode 100644
index ab0e1c9ef7b3..000000000000
--- a/media-libs/svgalib/files/svgalib-1.9.25-fPIC.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#DPATCHLEVEL=1
---- svgalib-1.4.3.orig/src/Makefile
-+++ svgalib-1.4.3/src/Makefile
-@@ -471,9 +471,11 @@
- vga.o: vga.c
- $(CC) $(CFLAGS) $(VGA_DEFINES) -c -o $@ $<
-
--#lrmi must NOT be compiled as -fPIC
-+# XXX: Upstream used this so it may break, disabled to close an RC
-+# lrmi must NOT be compiled as -fPIC
- lrmi.o: lrmi.c
-- $(CC) $(CFLAGS:-fPIC=) -c -o $@ $<
-+ $(CC) $(CFLAGS) -c -o $@ $<
-+# $(CC) $(CFLAGS:-fPIC=) -c -o $@ $<
-
- $(RAMDAC): %.o: %.c
- $(CC) $(CFLAGS) $(RAMDAC_DEFINES) -c -o $@ $<
diff --git a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36.patch b/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36.patch
deleted file mode 100644
index eed935ebef4d..000000000000
--- a/media-libs/svgalib/files/svgalib-1.9.25-linux2.6.36.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- svgalib-1.9.25.orig/kernel/svgalib_helper/main.c
-+++ svgalib-1.9.25/kernel/svgalib_helper/main.c
-@@ -163,8 +163,15 @@ static void task_startad(void *data) {
- get_user(pciv.val, &user_pciv->val);
- #define PUT_PCIV \
- put_user(pciv.val, &user_pciv->val);
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
- static int svgalib_helper_ioctl( struct inode *inode, struct file *filp,
- unsigned int cmd, unsigned long arg) {
-+#else
-+static int svgalib_helper_ioctl(struct file *filp,
-+ unsigned int cmd, unsigned long arg) {
-+
-+ struct inode *inode=filp->f_dentry->d_inode;
-+#endif
-
- io_t iov, *user_iov=(io_t *)arg;
- pcic_t pciv, *user_pciv=(pcic_t *)arg;
-@@ -595,7 +602,11 @@ struct file_operations svgalib_helper_fo
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
- .owner = THIS_MODULE,
- #endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)
- .ioctl = svgalib_helper_ioctl,
-+#else
-+ .unlocked_ioctl = svgalib_helper_ioctl,
-+#endif
- .mmap = svgalib_helper_mmap,
- .open = svgalib_helper_open,
- .release = svgalib_helper_release,
diff --git a/media-libs/svgalib/svgalib-1.9.25-r1.ebuild b/media-libs/svgalib/svgalib-1.9.25-r1.ebuild
deleted file mode 100644
index 8f96ac536a1f..000000000000
--- a/media-libs/svgalib/svgalib-1.9.25-r1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.25-r1.ebuild,v 1.4 2011/10/03 17:01:40 mr_bones_ Exp $
-
-EAPI=1
-
-inherit eutils flag-o-matic toolchain-funcs linux-mod
-
-DESCRIPTION="A library for running svga graphics on the console"
-HOMEPAGE="http://www.svgalib.org/"
-SRC_URI="http://www.arava.co.il/matan/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="-* x86"
-IUSE="build +kernel-helper"
-
-DEPEND=""
-RDEPEND=""
-
-MODULE_NAMES="svgalib_helper(misc:${S}/kernel/svgalib_helper)"
-BUILD_TARGETS="default"
-
-pkg_setup() {
- linux-mod_pkg_setup
- BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.patch
- epatch "${FILESDIR}"/${PN}-1.9.19-pic.patch #51698
- epatch "${FILESDIR}"/${PN}-1.9.25-build.patch
- epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.28.patch
- epatch "${FILESDIR}"/${PN}-1.9.25-glibc210.patch #274305
- epatch "${FILESDIR}"/${PN}-1.9.25-linux2.6.36.patch
- sed -i -e '/linux\/smp_lock.h/d' kernel/svgalib_helper/main.c || die
-}
-
-src_compile() {
- use kernel-helper || export NO_HELPER=y
-
- export CC=$(tc-getCC)
-
- # First build static
- make OPTIMIZE="${CFLAGS}" static || die "Failed to build static libraries!"
- # Have to remove for shared to build ...
- rm -f src/svgalib_helper.h
- # Then build shared ...
- make OPTIMIZE="${CFLAGS}" shared || die "Failed to build shared libraries!"
- # Missing in some cases ...
- ln -s libvga.so.${PV} sharedlib/libvga.so
- # Build lrmi and tools ...
- make OPTIMIZE="${CFLAGS}" LDFLAGS="-L../sharedlib" \
- textutils lrmi utils \
- || die "Failed to build libraries and utils!"
- # Build the gl stuff tpp
- make OPTIMIZE="${CFLAGS}" -C gl || die "Failed to build gl!"
- make OPTIMIZE="${CFLAGS}" -C gl libvgagl.so.${PV} \
- || die "Failed to build libvgagl.so.${PV}!"
- # Missing in some cases ...
- ln -s libvgagl.so.${PV} sharedlib/libvgagl.so
- rm -f src/svgalib_helper.h
- make OPTIMIZE="${CFLAGS}" -C src libvga.so.${PV} \
- || die "Failed to build libvga.so.${PV}!"
- cp -pPR src/libvga.so.${PV} sharedlib/
- # Build threeDKit ...
- make OPTIMIZE="${CFLAGS}" LDFLAGS='-L../sharedlib' \
- -C threeDKit lib3dkit.a || die "Failed to build threeDKit!"
- # Build demo's ...
- make OPTIMIZE="${CFLAGS} -I../gl" LDFLAGS='-L../sharedlib' \
- demoprogs || die "Failed to build demoprogs!"
-
- ! use build && use kernel-helper && linux-mod_src_compile
-}
-
-src_install() {
- local x=
-
- dodir /etc/svgalib /usr/{include,lib,bin,share/man}
-
- emake \
- TOPDIR="${D}" OPTIMIZE="${CFLAGS}" INSTALLMODULE="" \
- install || die "Failed to install svgalib!"
- ! use build && use kernel-helper && linux-mod_src_install
-
- insinto /usr/include
- doins gl/vgagl.h
- dolib.a staticlib/libvga.a || die "dolib.a libvga"
- dolib.a gl/libvgagl.a || die "dolib.a libvgagl"
- dolib.a threeDKit/lib3dkit.a
- dolib.so gl/libvgagl.so.${PV} || die "dolib.so libvgagl.so"
- local abiver=$(sed -n '/^MAJOR_VER.*=/{s:.*=[ ]*::;p}' Makefile.cfg)
- for x in lib3dkit libvga libvgagl ; do
- dosym ${x}.so.${PV} /usr/lib/${x}.so
- dosym ${x}.so.${PV} /usr/lib/${x}.so.${abiver}
- done
-
- insinto /usr/include
- doins src/vga.h gl/vgagl.h src/mouse/vgamouse.h src/joystick/vgajoystick.h
- doins src/keyboard/vgakeyboard.h
-
- insinto /etc/udev/rules.d
- newins "${FILESDIR}"/svgalib.udev.rules.d.2 30-svgalib.rules
-
- exeinto /usr/lib/svgalib/demos
- for x in "${S}"/demos/* ; do
- [[ -x ${x} ]] && doexe ${x}
- done
-
- cd "${S}"/threeDKit
- exeinto /usr/lib/svgalib/threeDKit
- local THREED_PROGS="plane wrapdemo"
- doexe ${THREED_PROGS}
-
- cd "${S}"
- dodoc 0-README
- cd "${S}"/doc
- dodoc CHANGES DESIGN TODO
- docinto txt
- dodoc Driver-programming-HOWTO README.* add_driver svgalib.lsm
-}
-
-pkg_postinst() {
- ! use build && use kernel-helper && linux-mod_pkg_postinst
-}
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index c7e8835c7d74..2570f8c843c3 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -1,2 +1,2 @@
DIST Csound5.17.11.tar.gz 9152189 SHA256 a86595c4328b63e9b37205b40bf1441182a453451b0ea20558a7777dbc0380b7 SHA512 ff45b5ce057cc92481de90ad67515eaca1ce3a2bd906e43920e7f7597a285a6cf2289d379b4d8fa1ee9e66da712da0290d06f7f98f173603c159d484b91f3c31 WHIRLPOOL 127ca5947640c36e9a6c082127525c21abd69e5dde58fa54c6383f5c56b5863ea86e7c4d8832038efa0631862406aba75a09a3c2e250ffdf774fe5de7f87a1f6
-DIST Csound5.18.02.zip 9886927 SHA256 cd4a27f1ad25753e9fc3cfb03fdcc5e94501a6168d336536b88c041dd2ddadb6 SHA512 b9b1a702ed376b87960b79e6c442f7b14607f6d22cb1954d44d4515e75c8d3217ac0f3b1e73e4c71e0da53acaa71552daa886542527c0006dfafd486259bbacc WHIRLPOOL 7978c397e073a043a103b722f29800d30767b68b8a5b931ad54124b1b293cae2f6a8883c25f88dcd0df689156708656bd16118246f9853361b61c0912585c354
+DIST Csound5.18.02.tar.gz 9211491 SHA256 4c461cf3bf60b83671224949dd33805379b7121bf2c0ad6af5e191e7f6f8adc8 SHA512 74db496d2f7c4fa288579c171982c2620165d4677885be692610695fb72ba9f08bd00d8976830f72158428cc05b8362c271f05a4f83b2925df246faa3281b045 WHIRLPOOL e7592fe5bf9d4eae5e2b2b78e5f3bf829c7b6c7431013a16594e3766bf6f51f32133a096c4e587c3bd26020e1c64d3799be7a0f3bb17a7dcafbb54616f8e78d2
diff --git a/media-sound/csound/csound-5.18.02.ebuild b/media-sound/csound/csound-5.18.02.ebuild
index a2bf2dfc3293..72dc33820269 100644
--- a/media-sound/csound/csound-5.18.02.ebuild
+++ b/media-sound/csound/csound-5.18.02.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/csound/csound-5.18.02.ebuild,v 1.1 2012/09/02 03:28:04 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.18.02.ebuild,v 1.2 2012/09/15 05:49:58 radhermit Exp $
EAPI="4"
PYTHON_DEPEND="python? 2"
@@ -12,7 +12,7 @@ MY_P="${MY_PN}${PV}"
DESCRIPTION="A sound design and signal processing system providing facilities for composition and performance"
HOMEPAGE="http://csounds.com/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
@@ -52,7 +52,6 @@ RDEPEND=">=media-libs/libsndfile-1.0.16
>=dev-lang/tk-8.5 )
utils? ( !media-sound/snd )"
DEPEND="${RDEPEND}
- app-arch/unzip
sys-devel/flex
virtual/yacc
chua? ( dev-libs/boost )
diff --git a/media-sound/frescobaldi/Manifest b/media-sound/frescobaldi/Manifest
index 27cf5341d022..312bb9a51e3f 100644
--- a/media-sound/frescobaldi/Manifest
+++ b/media-sound/frescobaldi/Manifest
@@ -1,3 +1,3 @@
-DIST frescobaldi-2.0.4.tar.gz 2734474 SHA256 cb6bf48f3c9b603ae5e224bb6ffc43217af2629394847065ddd9cf180990582c
-DIST frescobaldi-2.0.6.tar.gz 2874196 SHA256 355d16a43bc0f2908ae1b0166f48cb55c567ae7bea66bff54f7aac7697edbfb1
+DIST frescobaldi-2.0.6.tar.gz 2874196 SHA256 355d16a43bc0f2908ae1b0166f48cb55c567ae7bea66bff54f7aac7697edbfb1 SHA512 87dedb21ee11b50a2ee14fad2ddf33c6a93dcb4d89355e31e6a5b2880da9162cdeb4ce3d4abffb5655cc8b248b9fcceed3462c0a67d2566151ae377ce3a44a95 WHIRLPOOL cdc1912b482150edad230c8ef02d2d5420d896f15f95efbb82c543c44853da7ebe557842a94eebb28cb85338a1327ce6133190de4ef22b5e17e09bb7bdbd7c59
DIST frescobaldi-2.0.7.tar.gz 2922145 SHA256 e168d75b8f9c00fba5515e24ab25fb33b5c7123f73e6c9db6225f8bb56ea61e0 SHA512 68b7241143b48e7533939ee192c07441876660cd3635f9ed061c0848b225ebc1255559ea77b998e50244f675d6bad5d956d7c3e2107938a3f31788af9ae1a845 WHIRLPOOL 342b07acbc73e6ca1021c1d97159437cfe2d007bacbe7270b7b6fe2cac8c3d3a31398d9a4051fb2dc1edf5466176adbbc28a14ee2290b23c8a93b0776221152f
+DIST frescobaldi-2.0.8.tar.gz 2951714 SHA256 2a9a8ecdd1b48753e2c2c63a03a4b89f366e5944d5e9badb1a18935776effadb SHA512 debb6b37ba12d88a444cb997be860f7421e12e953a1ca2dd9c94684eebe61404fb8b2d5b6f919016f7cd1464c596ba4ba7413a70a4f4fafbf606c33f0d4e3b11 WHIRLPOOL 6ffd6ecc8cba69dae17a033fa14450cef64495580958c73fa90a5b451bd6ac578ceb735bb7a6cab37363546722f2e815f1115e8be78c3e6f6c814cfac6abf17b
diff --git a/media-sound/frescobaldi/frescobaldi-2.0.4.ebuild b/media-sound/frescobaldi/frescobaldi-2.0.8.ebuild
similarity index 93%
rename from media-sound/frescobaldi/frescobaldi-2.0.4.ebuild
rename to media-sound/frescobaldi/frescobaldi-2.0.8.ebuild
index c7c4a0d253c0..682a76d71e8e 100644
--- a/media-sound/frescobaldi/frescobaldi-2.0.4.ebuild
+++ b/media-sound/frescobaldi/frescobaldi-2.0.8.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/frescobaldi-2.0.4.ebuild,v 1.5 2012/03/13 14:01:17 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/frescobaldi/frescobaldi-2.0.8.ebuild,v 1.1 2012/09/15 05:33:49 radhermit Exp $
EAPI=4
diff --git a/media-sound/guayadeque/guayadeque-0.3.5.ebuild b/media-sound/guayadeque/guayadeque-0.3.5.ebuild
index dc11d376df72..148c1c0b9745 100644
--- a/media-sound/guayadeque/guayadeque-0.3.5.ebuild
+++ b/media-sound/guayadeque/guayadeque-0.3.5.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/guayadeque/guayadeque-0.3.5.ebuild,v 1.3 2012/08/31 15:43:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/guayadeque/guayadeque-0.3.5.ebuild,v 1.4 2012/09/14 14:15:04 ago Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="ayatana ipod"
# No test available, Making src_test fail
diff --git a/media-video/mplayer-resume/Manifest b/media-video/mplayer-resume/Manifest
index d0677e89df41..47f8996ddaf4 100644
--- a/media-video/mplayer-resume/Manifest
+++ b/media-video/mplayer-resume/Manifest
@@ -1,4 +1 @@
-DIST mplayer-resume-1.3.tar.gz 2956 RMD160 d0d3a5cebf851fe4693d28fec64d1166b88df06b SHA1 142b2503a522848624f7db66a38a7a066e85a7fc SHA256 b117afe8b2ee6062e3348acee40b69d1b7a79ae3f923f0a910d4b10d2f5fcc26
-DIST mplayer-resume-1.5.tar.gz 4608 RMD160 ca19af2ec334fb849388232b34070eef6bb8109c SHA1 7e04347f7cab8af61fe2343a412c0eb30e84cb9a SHA256 2c0bebd23954b7494e26dd27a834eefc5872b65f7eafd0bb721e87cbb36a919d
-DIST mplayer-resume-1.6.tar.gz 4963 RMD160 b00e5c7d3ad459e3e5b0089fcc1ff888d300510c SHA1 8f62e2051d66c6d446adbdcc97f3e4f831e7a9c6 SHA256 a45208a849924ad49e433070ee0927a39dee7a2d5d47e4d8313eb21437ba7bce
-DIST mplayer-resume-2.0.tar.gz 5251 RMD160 9f0b5dc719f38cbf035abd78d95aa97cfecc42f9 SHA1 1369edf66cfa13ad235e84a3e16674c9944b087d SHA256 482f5de621ff17baa3571eb6f5fccf4afa38c982bfb8c8fbd58178ae375c173b
+DIST mplayer-resume-2.0.tar.gz 5251 SHA256 482f5de621ff17baa3571eb6f5fccf4afa38c982bfb8c8fbd58178ae375c173b
diff --git a/media-video/mplayer-resume/mplayer-resume-1.3.ebuild b/media-video/mplayer-resume/mplayer-resume-1.3.ebuild
deleted file mode 100644
index 56b3a03d8d8a..000000000000
--- a/media-video/mplayer-resume/mplayer-resume-1.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-resume/mplayer-resume-1.3.ebuild,v 1.5 2007/05/01 00:57:27 genone Exp $
-
-inherit depend.php
-
-DESCRIPTION="MPlayer wrapper script to save/resume playback position"
-HOMEPAGE="http://www.spaceparanoids.org/trac/bend/wiki/mplayer-resume"
-SRC_URI="http://spaceparanoids.org/downloads/mplayer-resume/${P}.tar.gz"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND=""
-RDEPEND="app-misc/lirc
- media-video/mplayer"
-
-need_php_cli
-
-pkg_setup() {
-
- require_php_with_use pcre cli
-
- if ! built_with_use media-video/mplayer lirc
- then
- eerror "media-video/mplayer must also be compiled with the"
- eerror "lirc use flag to work properly with mplayer-resume."
- die "Fix mplayer use flags and re-emerge"
- fi
-}
-
-src_compile() {
- return;
-}
-
-src_install() {
- dobin mplayer-resume
- dodoc ChangeLog README
-}
-
-pkg_postinst() {
- elog "To get mplayer-resume to save playback position with LIRC,"
- elog "you will need to setup an entry in ~/.lircrc to run "
- elog "'get_time_pos' and then 'quit'. More instructions are"
- elog "detailed in the README, but the position will not be saved"
- elog "until you set it up."
- elog ""
- elog "Playback position files are saved in ~/.mplayer/playback"
-}
diff --git a/media-video/mplayer-resume/mplayer-resume-1.5.ebuild b/media-video/mplayer-resume/mplayer-resume-1.5.ebuild
deleted file mode 100644
index 4c4514f404b9..000000000000
--- a/media-video/mplayer-resume/mplayer-resume-1.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-resume/mplayer-resume-1.5.ebuild,v 1.1 2008/01/13 05:40:46 beandog Exp $
-
-inherit depend.php
-
-DESCRIPTION="MPlayer wrapper script to save/resume playback position"
-HOMEPAGE="http://www.spaceparanoids.org/trac/bend/wiki/mplayer-resume"
-SRC_URI="http://spaceparanoids.org/downloads/mplayer-resume/${P}.tar.gz"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=""
-RDEPEND="app-misc/lirc
- media-video/mplayer"
-
-need_php_cli
-
-pkg_setup() {
-
- require_php_with_use pcre cli
-
- if ! built_with_use media-video/mplayer lirc
- then
- eerror "media-video/mplayer must also be compiled with the"
- eerror "lirc use flag to work properly with mplayer-resume."
- die "Fix mplayer use flags and re-emerge"
- fi
-}
-
-src_compile() {
- return;
-}
-
-src_install() {
- dobin mplayer-resume
- dodoc ChangeLog README
-}
-
-pkg_postinst() {
- elog "To get mplayer-resume to save playback position with LIRC,"
- elog "you will need to setup an entry in ~/.lircrc to run "
- elog "'get_time_pos' and then 'quit'. More instructions are"
- elog "detailed in the README, but the position will not be saved"
- elog "until you set it up."
- elog ""
- elog "Playback position files are saved in ~/.mplayer/playback"
-}
diff --git a/media-video/mplayer-resume/mplayer-resume-1.6.ebuild b/media-video/mplayer-resume/mplayer-resume-1.6.ebuild
deleted file mode 100644
index 297fd43c4b0f..000000000000
--- a/media-video/mplayer-resume/mplayer-resume-1.6.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer-resume/mplayer-resume-1.6.ebuild,v 1.1 2008/12/16 20:38:27 beandog Exp $
-
-inherit depend.php
-
-DESCRIPTION="MPlayer wrapper script to save/resume playback position"
-HOMEPAGE="http://www.spaceparanoids.org/trac/bend/wiki/mplayer-resume"
-SRC_URI="http://spaceparanoids.org/downloads/mplayer-resume/${P}.tar.gz"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=""
-RDEPEND="app-misc/lirc
- media-video/mplayer"
-
-need_php_cli
-
-pkg_setup() {
-
- require_php_with_use pcre cli
-
- if ! built_with_use media-video/mplayer lirc
- then
- eerror "media-video/mplayer must also be compiled with the"
- eerror "lirc use flag to work properly with mplayer-resume."
- die "Fix mplayer use flags and re-emerge"
- fi
-}
-
-src_compile() {
- return;
-}
-
-src_install() {
- dobin mplayer-resume
- dodoc ChangeLog README
-}
-
-pkg_postinst() {
- elog "To get mplayer-resume to save playback position with LIRC,"
- elog "you will need to setup an entry in ~/.lircrc to run "
- elog "'get_time_pos' and then 'quit'. More instructions are"
- elog "detailed in the README, but the position will not be saved"
- elog "until you set it up."
- elog ""
- elog "Playback position files are saved in ~/.mplayer/playback"
-}
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 6728b685c906..64d77ff7e511 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -2,10 +2,6 @@
video
-
- aballier@gentoo.org
- Alexis Ballier
-