diff --git a/app-accessibility/eflite/eflite-0.4.1-r2.ebuild b/app-accessibility/eflite/eflite-0.4.1-r2.ebuild
new file mode 100644
index 000000000000..9b156ae99653
--- /dev/null
+++ b/app-accessibility/eflite/eflite-0.4.1-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/eflite/eflite-0.4.1-r2.ebuild,v 1.1 2014/07/05 14:42:07 teiresias Exp $
+
+EAPI="5"
+inherit autotools eutils user
+
+DESCRIPTION="A speech server that allows emacspeak and other screen readers to interact with festival lite."
+HOMEPAGE="http://eflite.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="+16k_voice"
+
+DEPEND=">=app-accessibility/flite-1.4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i 's:/etc/es.conf:/etc/eflite/es.conf:g' *
+ epatch "${FILESDIR}"/${PN}-0.4.1-flite14.patch
+ eautoreconf
+}
+
+src_configure() {
+ local myconf
+ if use 16k_voice; then
+ myconf='--with-vox=cmu_us_kal16'
+ fi
+ econf ${myconf}
+}
+
+src_install() {
+ einstall
+ dodoc ChangeLog README INSTALL eflite_test.txt
+
+ insinto /etc/eflite
+ doins "${FILESDIR}"/es.conf
+
+ newinitd "${FILESDIR}"/eflite.rc eflite
+}
+
+pkg_postinst() {
+ enewgroup speech
+}
diff --git a/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch b/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch
new file mode 100644
index 000000000000..cb3096d88a43
--- /dev/null
+++ b/app-accessibility/eflite/files/eflite-0.4.1-flite14.patch
@@ -0,0 +1,24 @@
+diff -Naur eflite-0.4.1/Makefile.in eflite-0.4.1-new/Makefile.in
+--- eflite-0.4.1/Makefile.in 2007-01-18 18:01:09.000000000 -0600
++++ eflite-0.4.1-new/Makefile.in 2010-07-23 20:06:45.000000000 -0500
+@@ -34,7 +34,7 @@
+ $(CC) $(LDFLAGS) -o $@ $^ -lm $(LIBS) $(FLITE_LIBS) $(AUDIOLIBS)
+
+ fs.o: fs.c
+- $(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(subst cmu_us_kal16,cmu_us_kal,$(FL_VOX)) -DSTANDALONE -DEFLITE -c -o $@ $<
++ $(CC) $(CFLAGS) @AUDIODEFS@ -I. -I$(flite_include_dir) -DREGISTER_VOX=register_$(FL_VOX) -DSTANDALONE -DEFLITE -c -o $@ $<
+
+ tone.o: tone.c
+ $(CC) $(CFLAGS) -I$(flite_include_dir) -DEFLITE -c -o $@ $<
+diff -Naur eflite-0.4.1/fs.c eflite-0.4.1.new/fs.c
+--- eflite-0.4.1/fs.c 2007-01-18 16:01:09.000000000 -0800
++++ eflite-0.4.1.new/fs.c 2013-09-08 09:31:57.417262688 -0700
+@@ -523,7 +523,7 @@
+ int playlen, skip;
+ if (type == SPEECH)
+ {
+- skip = (187 * wptr->sample_rate) / speed;
++ skip = 0;
+ playlen = wptr->num_samples - (skip * 2);
+ if (playlen > 0 && playlen < 500) playlen += (skip * 2) / 3;
+ }
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild
index 24ee8e6dfb76..e79d51fc0b42 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild,v 1.2 2014/04/27 11:00:47 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r24.ebuild,v 1.3 2014/07/05 08:21:00 swift Exp $
EAPI=4
@@ -16,9 +16,9 @@ SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirro
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="network-cron nls"
+IUSE="network-cron nls selinux"
-DEPEND=""
+DEPEND="selinux? ( sec-policy/selinux-hddtemp )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild
index a7a300af09a9..fb95d97119d9 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild,v 1.2 2014/05/02 17:42:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r25.ebuild,v 1.3 2014/07/05 08:21:00 swift Exp $
EAPI=5
inherit eutils autotools readme.gentoo systemd
@@ -15,9 +15,9 @@ SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirro
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~sparc ~x86"
-IUSE="network-cron nls"
+IUSE="network-cron nls selinux"
-DEPEND=""
+DEPEND="selinux? ( sec-policy/selinux-hddtemp )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild
index fee52f7ca17b..0a81852c0777 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild,v 1.10 2014/05/02 17:42:01 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild,v 1.11 2014/07/05 08:21:00 swift Exp $
EAPI=5
inherit eutils autotools readme.gentoo systemd
@@ -15,9 +15,9 @@ SRC_URI="http://download.savannah.gnu.org/releases/hddtemp/${MY_P}.tar.bz2 mirro
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
-IUSE="nls"
+IUSE="nls selinux"
-DEPEND=""
+DEPEND="selinux? ( sec-policy/selinux-hddtemp )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
diff --git a/app-admin/killproc/killproc-2.13-r1.ebuild b/app-admin/killproc/killproc-2.13-r1.ebuild
index 6b5a4bf14591..2353bc4d7aa5 100644
--- a/app-admin/killproc/killproc-2.13-r1.ebuild
+++ b/app-admin/killproc/killproc-2.13-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/killproc/killproc-2.13-r1.ebuild,v 1.1 2014/07/01 13:20:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/killproc/killproc-2.13-r1.ebuild,v 1.2 2014/07/04 12:59:00 klausman Exp $
EAPI=5
inherit eutils toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.suse.com/pub/projects/init/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~x86"
src_prepare() {
epatch "${FILESDIR}/${P}-makefile.patch"
diff --git a/app-admin/perl-cleaner/Manifest b/app-admin/perl-cleaner/Manifest
index c60f8cc69e1d..7131de96079b 100644
--- a/app-admin/perl-cleaner/Manifest
+++ b/app-admin/perl-cleaner/Manifest
@@ -1 +1,2 @@
DIST perl-cleaner-2.14.tar.bz2 6067 SHA256 d941fb6c4dc168b5192cba31e0c68a5e1642fe67c04d7b3ad09d03742e9bd3fc SHA512 a4d0ee749712e4f0c4a6acfd08be9091d440fdc2aba34f5c82952123a133201f812ef9e893b6e06652a21601a0ef84e6b4ee92251e0a0520c4f03963b0f72f9a WHIRLPOOL 4c2620fa7ca73ccb95061ed81951f1d7563cffd0966d01d95d7786e81f7dec081364f980d127f619e335c8a74cebaef8d5ff20e5cbf6c7e3e0256c8655031a72
+DIST perl-cleaner-2.15.tar.bz2 6165 SHA256 20371908fd19b08e90ec282dc9ceba90e01655336444ebb22c7a432bcb81adb1 SHA512 58bda82808b8213019a0807cedba30b10fceda04a256f268a654bba8328ab11eb3c7b8a33046d7a24147f2b35d8a53ce86ad30efb0c77d5598f185c3a5d6a797 WHIRLPOOL 9a37d200c144eea0121beea816778b9bd3244cac1c88ada8a6854cc661d9f0071c113a5099df1a0ba6ed1bfeb00a2201308762422d85ac2f0d3a6eb9f0a467f9
diff --git a/app-admin/perl-cleaner/perl-cleaner-2.15.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.15.ebuild
new file mode 100644
index 000000000000..9e3f7d412337
--- /dev/null
+++ b/app-admin/perl-cleaner/perl-cleaner-2.15.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/perl-cleaner/perl-cleaner-2.15.ebuild,v 1.1 2014/07/05 19:08:52 dilfridge Exp $
+
+EAPI=5
+
+DESCRIPTION="User land tool for cleaning up old perl installs"
+HOMEPAGE="http://www.gentoo.org/proj/en/perl/"
+
+if [[ "${PV}" == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="http://github.com/gentoo-perl/perl-cleaner.git"
+ KEYWORDS=""
+else
+ SRC_URI="mirror://gentoo/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+[[ "${PV}" == "9999" ]] && DEPEND="sys-apps/help2man"
+
+RDEPEND="app-shells/bash
+ || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin )
+ dev-lang/perl"
+
+src_install() {
+ dosbin perl-cleaner
+ doman perl-cleaner.1
+}
diff --git a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
index b90a210252aa..d98a25a16b54 100644
--- a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.52-r1.ebuild,v 1.6 2014/04/20 11:35:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/webapp-config/webapp-config-1.52-r1.ebuild,v 1.7 2014/07/04 12:35:03 klausman Exp $
EAPI="5"
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
inherit distutils-r1
SRC_URI="http://dev.gentoo.org/~twitch153/${PN}/${P}.tar.bz2"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
DESCRIPTION="Gentoo's installer for web-based applications"
HOMEPAGE="http://sourceforge.net/projects/webapp-config/"
diff --git a/app-arch/lz4/lz4-0_p106-r1.ebuild b/app-arch/lz4/lz4-0_p106-r1.ebuild
index 0b62c0acdf01..0f807ea586f6 100644
--- a/app-arch/lz4/lz4-0_p106-r1.ebuild
+++ b/app-arch/lz4/lz4-0_p106-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p106-r1.ebuild,v 1.12 2014/06/08 10:41:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/lz4/lz4-0_p106-r1.ebuild,v 1.13 2014/07/05 14:41:01 klausman Exp $
EAPI=5
@@ -14,7 +14,7 @@ if [ ${PV} == "9999" ] ; then
ESVN_PROJECT="lz4-read-only"
else
SRC_URI="http://dev.gentoo.org/~ryao/dist/${P}.tar.xz"
- KEYWORDS="amd64 ~arm hppa ia64 ~mips ~s390 x86 ~amd64-linux ~x86-linux"
+ KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ~s390 x86 ~amd64-linux ~x86-linux"
fi
DESCRIPTION="Extremely Fast Compression algorithm"
diff --git a/app-backup/tsm/tsm-7.1.0.0.ebuild b/app-backup/tsm/tsm-7.1.0.0-r1.ebuild
similarity index 94%
rename from app-backup/tsm/tsm-7.1.0.0.ebuild
rename to app-backup/tsm/tsm-7.1.0.0-r1.ebuild
index 99091b28dee1..3c1825339943 100644
--- a/app-backup/tsm/tsm-7.1.0.0.ebuild
+++ b/app-backup/tsm/tsm-7.1.0.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/tsm-7.1.0.0.ebuild,v 1.1 2014/02/17 21:15:20 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-backup/tsm/tsm-7.1.0.0-r1.ebuild,v 1.1 2014/07/05 15:03:29 pacho Exp $
EAPI=5
@@ -176,8 +176,7 @@ src_install() {
dosym libvixDiskLibVim.so.5.5.0 $CLIENTDIR/ba/bin/libvixDiskLibVim.so.5
dosym libvixDiskLib.so.5.5.0 $CLIENTDIR/ba/bin/libvixDiskLib.so.5
- fowners -R :tsm /opt/tivoli
- fperms -R g+rX,o-rx /opt/tivoli # Allow only tsm group users to access TSM tools
+ fowners :tsm /opt/tivoli/tsm/client/ba/bin/dsmtca
fperms 4710 /opt/tivoli/tsm/client/ba/bin/dsmtca
keepdir /var/log/tsm
@@ -218,7 +217,7 @@ src_install() {
}
pkg_postinst() {
- local i
+ local i dirs
for i in /var/log/tsm/dsm{error,sched,j,webcl}.log; do
if [[ ! -e $i ]]; then
touch $i || die
@@ -232,5 +231,10 @@ pkg_postinst() {
chown root:tsm /var/log/tsm || die
chmod 0750 /var/log/tsm || die
+ # Bug 508052: directories used to be too restrictive, have to widen perms.
+ dirs=( /opt/tivoli $(find /opt/tivoli/tsm -type d) )
+ chown root:root "${dirs[@]}" || die
+ chmod 0755 "${dirs[@]}" || die
+
readme.gentoo_print_elog
}
diff --git a/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild b/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild
index dce08744ad96..42a240241e3a 100644
--- a/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild
+++ b/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild,v 1.5 2014/02/24 00:46:42 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrkit/cdrkit-1.1.11-r2.ebuild,v 1.6 2014/07/05 15:08:51 klausman Exp $
EAPI=5
inherit cmake-utils eutils
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.gz
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~arm-linux ~x86-linux"
IUSE="debug hfs unicode"
RDEPEND="app-arch/bzip2
diff --git a/app-crypt/gnupg/gnupg-1.4.18.ebuild b/app-crypt/gnupg/gnupg-1.4.18.ebuild
index fd91c9f47586..4dc500372df9 100644
--- a/app-crypt/gnupg/gnupg-1.4.18.ebuild
+++ b/app-crypt/gnupg/gnupg-1.4.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.18.ebuild,v 1.3 2014/07/01 18:25:30 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.18.ebuild,v 1.10 2014/07/05 11:29:15 ago Exp $
EAPI="5"
@@ -17,7 +17,7 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE="bzip2 curl ldap mta nls readline selinux smartcard static usb zlib linguas_ru"
COMMON_DEPEND="
diff --git a/app-crypt/gnupg/gnupg-2.0.25.ebuild b/app-crypt/gnupg/gnupg-2.0.25.ebuild
index 32759b29a996..7f05a1ae6111 100644
--- a/app-crypt/gnupg/gnupg-2.0.25.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.25.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.25.ebuild,v 1.3 2014/07/01 13:42:24 rich0 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.25.ebuild,v 1.10 2014/07/05 11:29:15 ago Exp $
EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb"
COMMON_DEPEND_LIBS="
diff --git a/app-crypt/trousers/trousers-0.3.10-r1.ebuild b/app-crypt/trousers/trousers-0.3.10-r1.ebuild
index 40e537c5db78..15b74b248c44 100644
--- a/app-crypt/trousers/trousers-0.3.10-r1.ebuild
+++ b/app-crypt/trousers/trousers-0.3.10-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.10-r1.ebuild,v 1.2 2014/06/10 00:19:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.10-r1.ebuild,v 1.3 2014/07/04 15:05:39 swift Exp $
EAPI=5
@@ -15,13 +15,14 @@ SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
LICENSE="CPL-1.0 GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~sh ~x86"
-IUSE="doc" # gtk
+IUSE="doc selinux" # gtk
# gtk support presently does NOT compile.
# gtk? ( >=x11-libs/gtk+-2 )
RDEPEND=">=dev-libs/glib-2
- >=dev-libs/openssl-0.9.7:0"
+ >=dev-libs/openssl-0.9.7:0
+ selinux? ( sec-policy/selinux-tcsd )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/app-crypt/trousers/trousers-0.3.10.ebuild b/app-crypt/trousers/trousers-0.3.10.ebuild
index b072d05ff421..7251dd36d392 100644
--- a/app-crypt/trousers/trousers-0.3.10.ebuild
+++ b/app-crypt/trousers/trousers-0.3.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.10.ebuild,v 1.8 2014/06/10 00:19:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.10.ebuild,v 1.9 2014/07/04 15:05:39 swift Exp $
EAPI=4
@@ -15,13 +15,14 @@ SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
LICENSE="CPL-1.0"
SLOT="0"
KEYWORDS="amd64 arm arm64 m68k s390 sh x86"
-IUSE="doc" # gtk
+IUSE="doc selinux" # gtk
# gtk support presently does NOT compile.
# gtk? ( >=x11-libs/gtk+-2 )
RDEPEND=">=dev-libs/glib-2
- >=dev-libs/openssl-0.9.7:0"
+ >=dev-libs/openssl-0.9.7:0
+ selinux? ( sec-policy/selinux-tcsd )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/app-crypt/trousers/trousers-0.3.6-r1.ebuild b/app-crypt/trousers/trousers-0.3.6-r1.ebuild
index 45597b789846..61d09040576e 100644
--- a/app-crypt/trousers/trousers-0.3.6-r1.ebuild
+++ b/app-crypt/trousers/trousers-0.3.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.6-r1.ebuild,v 1.4 2012/12/11 15:57:04 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.6-r1.ebuild,v 1.5 2014/07/04 15:05:39 swift Exp $
EAPI="3"
@@ -14,13 +14,14 @@ SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
LICENSE="CPL-1.0"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc" # gtk
+IUSE="doc selinux" # gtk
# gtk support presently does NOT compile.
# gtk? ( >=x11-libs/gtk+-2 )
RDEPEND=">=dev-libs/glib-2
- >=dev-libs/openssl-0.9.7:0"
+ >=dev-libs/openssl-0.9.7:0
+ selinux? ( sec-policy/selinux-tcsd )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/app-crypt/trousers/trousers-0.3.6.ebuild b/app-crypt/trousers/trousers-0.3.6.ebuild
index bebabef2f26f..50fac1709ae5 100644
--- a/app-crypt/trousers/trousers-0.3.6.ebuild
+++ b/app-crypt/trousers/trousers-0.3.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.6.ebuild,v 1.6 2012/05/31 03:33:16 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.6.ebuild,v 1.7 2014/07/04 15:05:39 swift Exp $
EAPI="3"
@@ -14,13 +14,14 @@ SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
LICENSE="CPL-1.0"
SLOT="0"
KEYWORDS="amd64 arm x86"
-IUSE="doc" # gtk
+IUSE="doc selinux" # gtk
# gtk support presently does NOT compile.
# gtk? ( >=x11-libs/gtk+-2 )
RDEPEND=">=dev-libs/glib-2
- >=dev-libs/openssl-0.9.7"
+ >=dev-libs/openssl-0.9.7
+ selinux? ( sec-policy/selinux-tcsd )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/app-dicts/gwaei/gwaei-3.6.2.ebuild b/app-dicts/gwaei/gwaei-3.6.2.ebuild
index b28e35d7479f..002aa4a47974 100644
--- a/app-dicts/gwaei/gwaei-3.6.2.ebuild
+++ b/app-dicts/gwaei/gwaei-3.6.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/gwaei/gwaei-3.6.2.ebuild,v 1.1 2013/06/05 00:54:48 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/gwaei/gwaei-3.6.2.ebuild,v 1.2 2014/07/05 03:33:22 naota Exp $
EAPI="4"
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/gwaei/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="gtk nls test mecab"
+IUSE="gtk hunspell nls test mecab"
RDEPEND=">=net-misc/curl-7.20.0
>=dev-libs/glib-2.31
@@ -21,6 +21,7 @@ RDEPEND=">=net-misc/curl-7.20.0
x11-libs/gtk+:3
>=app-text/gnome-doc-utils-0.14.0
)
+ hunspell? ( app-text/hunspell )
nls? ( virtual/libintl )
mecab? ( app-text/mecab )"
DEPEND="${RDEPEND}
@@ -41,6 +42,7 @@ src_configure() {
econf \
$(use_with gtk gnome) \
$(use_enable nls) \
+ $(use_with hunspell) \
$(use_with mecab) \
--disable-static \
--docdir=/usr/share/doc/${PF}
diff --git a/app-dicts/gwaei/metadata.xml b/app-dicts/gwaei/metadata.xml
index 8823d8c10739..754ebe0882e2 100644
--- a/app-dicts/gwaei/metadata.xml
+++ b/app-dicts/gwaei/metadata.xml
@@ -19,4 +19,9 @@
Enable app-text/mecab support
+
diff --git a/app-editors/adie/Manifest b/app-editors/adie/Manifest
index b93db437e8f4..b83ffb0187c2 100644
--- a/app-editors/adie/Manifest
+++ b/app-editors/adie/Manifest
@@ -1,3 +1,3 @@
DIST fox-1.6.36.tar.gz 4344694 SHA256 cf8f4d09e104d6b3c425df3ce5b3bd54ed4c8095389f742f81370aba16169dff SHA512 2985404d6b2122159e9859d3490a154b75429bb1cf9d9920155f454012ef88fbd005548db0e68d55826d7b9d68ec745bccd14e27a8ff13bdbf5c8357f47ccdc0 WHIRLPOOL 74af19f2d041b785e88799b1fc8aad5c94efa30e53b9fecd0e8bfb6abff58c3930ef28e91d3199d79acacb100d2281ad7497bc1656556ef0d78daa109f90c860
-DIST fox-1.7.44.tar.gz 5251615 SHA256 1fbead78847d2a2c6ae8a18a5317713f2ef36d4ebeddacf5d097b915e4728b4c SHA512 ba09a6a3bbf569beb1654070e93358a64ba8f81feac80927e4953fe8645722045ef6e95e64749c9f9783e56a482a9e6131fd16f4a5b386383643e2b0e3c56193 WHIRLPOOL 14e9ad3d04cdc712b8cf5cd0e52e4b6a208880159be476c97ca8a45c9f2280bebcef9b92dd17b130d1cb23743e465512c1d97ce3fe67999c589d51878e633bd7
DIST fox-1.7.45.tar.gz 5254563 SHA256 78f2b5f609a52d21da08e693d45b8eeb9d4ceed52ad86e451ef4485f2375c829 SHA512 ec8acf0eb0b1882254f7df2abdcb87445992fc9fb8165afcc08b8dd52a718cb31953849efc7a530bd682e6265687bdf4dc9fb5c930557b9405235182894684b0 WHIRLPOOL 08808e67e0e31c7389b1d4ac097d7d707fb48a925df233021913bc80363002c0c4ce19c8630f4bd5c87ebb5bc5c010dc7f3260f415dfa5b60390c5aae316de78
+DIST fox-1.7.47.tar.gz 5271135 SHA256 7f1de8566b88b0010137ea1172168d53494d2d14bfa03fe32f7796146a31a2a3 SHA512 8802c7a21ba35b48a638fb87354da3de54c82ebdd3f931a601f55473fe1f7c16bfa2df253e8531af2058665d9b6f31adf52f6973c2d94f435cc90ac112af22ed WHIRLPOOL fbcf4540b268e95fa4d70ed335d8f499ec46e18390cdc090c98c21b4be5ff3ec576439265cfcf8b90c037fed7937c3a5f19f8544db1906cf86a3f255b8092d62
diff --git a/app-editors/adie/adie-1.7.44.ebuild b/app-editors/adie/adie-1.7.47.ebuild
similarity index 52%
rename from app-editors/adie/adie-1.7.44.ebuild
rename to app-editors/adie/adie-1.7.47.ebuild
index 4f27e7920181..93f626ca3ad0 100644
--- a/app-editors/adie/adie-1.7.44.ebuild
+++ b/app-editors/adie/adie-1.7.47.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/adie/adie-1.7.44.ebuild,v 1.1 2013/12/13 21:06:36 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/adie/adie-1.7.47.ebuild,v 1.1 2014/07/04 21:03:25 mabi Exp $
-EAPI="4"
+EAPI=5
inherit fox
@@ -13,5 +13,7 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
-DEPEND="~x11-libs/fox-${PV}"
+DEPEND="~x11-libs/fox-${PV}
+ x11-libs/libICE
+ x11-libs/libSM"
RDEPEND="${DEPEND}"
diff --git a/app-emulation/aranym/Manifest b/app-emulation/aranym/Manifest
index 04365f8e4f86..7751ff866a79 100644
--- a/app-emulation/aranym/Manifest
+++ b/app-emulation/aranym/Manifest
@@ -1,2 +1,3 @@
DIST afros812.zip 9087862 SHA256 7d60230694734a42d912f47d03653f60ffd5a034d89771df35a414b6a6af6263 SHA512 0e9522740dc38c34b1fab4a999485caca0af95692d281bf2887fe6dddf48cceaf6c4d8b9802f402e2bd00726fb01c557ffb5731838ebd94b9eec987f1f0ce545 WHIRLPOOL bc641fef78cff4fb14448b0054eb39505a507d73f1511fb0d801f06637e0c81e2311c6c1fe1391aea379f967d5f20032e4ffb5184d9a9f39f3530c3cfeb63550
DIST aranym_0.9.14.orig.tar.gz 1831715 SHA256 04e85337fbf54cb3c80c2d26ce22f51337abc2ddc730d9bf9ed3b171def4b9fa SHA512 8145546bf6f6ffea8f4ea24f0fbfc19d1b33146b30473757dcf04c7603125f7f3a36f266ad190baf310510fa50b5f9ecfe2cd8627dea292d3851e6c64cf4fc17 WHIRLPOOL 86ad78d2a7ff0c66f94875bfb6d80957436bf594bd201884d8fee3e541aa11f5d03d16500807b3d9172155c5284e94d4d251913f08869def4d4bfd33f1d24bc7
+DIST aranym_0.9.16.orig.tar.gz 1778730 SHA256 11e7ca0dd93d42966c2ec70749a3c1e4345656ad1108a126ecd9754391a308c6 SHA512 b2848b1c6726b0e85f76da144a3f4f478bed13a1bc528658a448499c5e3434d5adb2ff6e0625d814a6e15a6d1ca9fe8922a3f282b50b1cb7763bb09c64342ae8 WHIRLPOOL 48a5cf68c4243c18292e3948d688ee8dc29306986b05177cc469cd6915dabe8733994f1578272acfac939cbae77d27a3bb4ced8fa41aa70cfb70ce503b6c717d
diff --git a/app-emulation/aranym/aranym-0.9.14.ebuild b/app-emulation/aranym/aranym-0.9.14.ebuild
index 28247a65c1e1..0b7f90de629a 100644
--- a/app-emulation/aranym/aranym-0.9.14.ebuild
+++ b/app-emulation/aranym/aranym-0.9.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/aranym/aranym-0.9.14.ebuild,v 1.3 2014/01/25 01:38:27 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/aranym/aranym-0.9.14.ebuild,v 1.4 2014/07/05 13:50:27 zlogene Exp $
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/aranym/${P/-/_}.orig.tar.gz
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
IUSE="+fullmmu +lilo opengl usbhost X"
RDEPEND="games-emulation/emutos
diff --git a/app-emulation/aranym/aranym-0.9.16.ebuild b/app-emulation/aranym/aranym-0.9.16.ebuild
new file mode 100644
index 000000000000..90b503b29547
--- /dev/null
+++ b/app-emulation/aranym/aranym-0.9.16.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/aranym/aranym-0.9.16.ebuild,v 1.1 2014/07/05 13:49:29 zlogene Exp $
+
+EAPI=5
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Atari Running on Any Machine, a VM running Atari ST/TT/Falcon OS and TOS/GEM applications"
+HOMEPAGE="http://aranym.sourceforge.net/"
+SRC_URI="mirror://sourceforge/aranym/${P/-/_}.orig.tar.gz
+ mirror://sourceforge/aranym/afros812.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+fullmmu +lilo opengl usbhost X"
+
+RDEPEND="games-emulation/emutos
+ media-libs/libsdl
+ opengl? ( virtual/opengl )
+ X? ( media-libs/libsdl[X] )"
+DEPEND="${RDEPEND}
+ app-arch/unzip"
+
+src_configure() {
+ filter-flags -mpowerpc-gfxopt
+
+ local myconf=""
+ if [[ ${ARCH} == x86 ]]; then
+ myconf="${myconf} --enable-jit-compiler"
+ fi
+
+ if ! use X; then
+ myconf="${myconf} --disable-nfjpeg --disable-nfclipbrd"
+ fi
+
+ econf \
+ $(use_enable X gui) \
+ $(use_enable opengl) \
+ $(use_enable fullmmu) \
+ $(use_enable lilo) \
+ $(use_enable usbhost) \
+ ${myconf}
+}
+
+src_install() {
+ emake DESTDIR="${D}" INSTALL_PROGRAM="install" install
+
+ insinto /usr/share/${PN}
+ doins -r "${WORKDIR}"/afros
+
+ dodoc "${D}"/usr/share/doc/${PN}/*
+ rm -r "${D}"/usr/share/doc/${PN} || die
+}
+
+pkg_postinst() {
+ elog "To run ARAnyM with AFROS type: aranym --config /usr/share/aranym/afros/config"
+}
diff --git a/app-i18n/kimera/kimera-2.11-r1.ebuild b/app-i18n/kimera/kimera-2.11-r1.ebuild
index cdeed78d8311..a1109f882f3d 100644
--- a/app-i18n/kimera/kimera-2.11-r1.ebuild
+++ b/app-i18n/kimera/kimera-2.11-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/kimera/kimera-2.11-r1.ebuild,v 1.5 2013/03/02 19:27:40 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/kimera/kimera-2.11-r1.ebuild,v 1.6 2014/07/05 03:17:20 naota Exp $
EAPI=3
inherit qt4-r2 eutils multilib
@@ -15,6 +15,8 @@ KEYWORDS="amd64 x86"
IUSE="+anthy"
DEPEND="dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qt3support:4
anthy? ( app-i18n/anthy )
!anthy? ( app-i18n/canna )"
RDEPEND="${DEPEND}"
diff --git a/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild b/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild
index 005c9d9619fa..2c43ccfc5d39 100644
--- a/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild
+++ b/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild,v 1.4 2013/05/04 03:47:12 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild,v 1.5 2014/07/05 03:01:46 naota Exp $
-EAPI=2
+EAPI=5
inherit db-use eutils flag-o-matic multilib
DESCRIPTION="A simple and fast GB and BIG5 Chinese XIM server"
@@ -14,7 +14,9 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="debug"
-RDEPEND=">=sys-libs/db-4.1"
+RDEPEND=">=sys-libs/db-4.1
+ x11-libs/libX11
+ x11-libs/libXt"
DEPEND="${RDEPEND}
>=sys-apps/sed-4"
@@ -61,7 +63,7 @@ src_install() {
xsim_libp="${D}"usr/$(get_libdir)/xsim/plugins \
xsim_binp="${D}"/usr/bin \
xsim_etcp="${D}"/etc \
- install install-data || die
+ install install-data
dodoc ChangeLog KNOWNBUG README* TODO
}
diff --git a/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild b/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild
index fe62a29af7d3..2e61a8a38aa2 100644
--- a/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild
+++ b/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild,v 1.3 2013/10/02 09:49:30 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-monocle/lc-monocle-9999.ebuild,v 1.4 2014/07/05 12:29:17 maksbotan Exp $
EAPI="5"
@@ -10,19 +10,18 @@ DESCRIPTION="Monocle, the modular document viewer for LeechCraft"
SLOT="0"
KEYWORDS=""
-IUSE="debug +djvu doc +fb2 +pdf +spectre"
+IUSE="debug +djvu doc +fb2 +mobi +pdf +postscript"
-RDEPEND="~app-leechcraft/lc-core-${PV}
+REQUIRED_USE="postscript? ( pdf )"
+
+CDEPEND="~app-leechcraft/lc-core-${PV}
pdf? ( app-text/poppler[qt4] )
- djvu? ( app-text/djvu )
- spectre? (
- app-text/libspectre
- || (
- app-text/poppler[-lcms]
- leechcraft
diff --git a/app-office/texmacs/texmacs-1.0.7.21.ebuild b/app-office/texmacs/texmacs-1.0.7.21.ebuild
index 67d8ad45c024..864824ce9cba 100644
--- a/app-office/texmacs/texmacs-1.0.7.21.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.21.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.21.ebuild,v 1.2 2014/06/05 07:04:21 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.21.ebuild,v 1.3 2014/07/05 18:02:29 pacho Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/${MY_P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
IUSE="imlib jpeg netpbm qt4 svg spell"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
RDEPEND="
app-text/ghostscript-gpl
diff --git a/app-text/keepnote/keepnote-0.7.8-r1.ebuild b/app-text/keepnote/keepnote-0.7.8-r1.ebuild
index caa83641166b..d7d1d9628b8d 100644
--- a/app-text/keepnote/keepnote-0.7.8-r1.ebuild
+++ b/app-text/keepnote/keepnote-0.7.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/keepnote/keepnote-0.7.8-r1.ebuild,v 1.4 2013/12/03 19:56:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/keepnote/keepnote-0.7.8-r1.ebuild,v 1.5 2014/07/04 22:18:11 hasufell Exp $
EAPI=5
@@ -18,8 +18,8 @@ KEYWORDS="amd64 x86"
SLOT="0"
IUSE=""
-RDEPEND="dev-python/pygobject:2
- dev-python/pygtk:2
+RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
x11-misc/xdg-utils"
PATCHES=( "${FILESDIR}"/${P}-desktopfile.patch )
diff --git a/app-text/keepnote/keepnote-0.7.8.ebuild b/app-text/keepnote/keepnote-0.7.8.ebuild
deleted file mode 100644
index 5c1347bd37fd..000000000000
--- a/app-text/keepnote/keepnote-0.7.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/keepnote/keepnote-0.7.8.ebuild,v 1.2 2012/08/14 08:23:20 hasufell Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="sqlite xml"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
-
-inherit eutils gnome2-utils python distutils
-
-DESCRIPTION="A note taking application"
-HOMEPAGE="http://keepnote.org/"
-SRC_URI="http://keepnote.org/download-test/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/pygobject:2
- dev-python/pygtk:2
- x11-misc/xdg-utils"
-
-DOCS="CHANGES"
-
-src_prepare() {
- distutils_src_prepare
-
- epatch "${FILESDIR}"/${P}-desktopfile.patch
-}
-
-src_test() {
- testing() {
- PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" test/testing.py
- }
- python_execute_function testing
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
- gnome2_icon_cache_update
-
- einfo
- elog "optional dependencies:"
- elog " app-text/gtkspell:2 (spell checking)"
- einfo
-}
-
-pkg_postrm() {
- distutils_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/app-text/keepnote/keepnote-0.7.9-r2.ebuild b/app-text/keepnote/keepnote-0.7.9-r2.ebuild
index bb88f02ccb53..5af6213f9192 100644
--- a/app-text/keepnote/keepnote-0.7.9-r2.ebuild
+++ b/app-text/keepnote/keepnote-0.7.9-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/keepnote/keepnote-0.7.9-r2.ebuild,v 1.4 2013/12/03 19:56:55 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/keepnote/keepnote-0.7.9-r2.ebuild,v 1.6 2014/07/04 22:18:11 hasufell Exp $
EAPI=5
@@ -14,12 +14,12 @@ HOMEPAGE="http://keepnote.org/"
SRC_URI="http://keepnote.org/download-test/${P}.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
SLOT="0"
IUSE=""
-RDEPEND="dev-python/pygobject:2
- dev-python/pygtk:2
+RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
x11-misc/xdg-utils"
PATCHES=( "${FILESDIR}"/${PN}-0.7.8-desktopfile.patch )
diff --git a/app-text/keepnote/keepnote-0.7.9.ebuild b/app-text/keepnote/keepnote-0.7.9.ebuild
deleted file mode 100644
index 1eaf23ca6638..000000000000
--- a/app-text/keepnote/keepnote-0.7.9.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/keepnote/keepnote-0.7.9.ebuild,v 1.1 2012/08/14 08:23:19 hasufell Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="sqlite xml"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="2.[45] 3.*"
-
-inherit eutils gnome2-utils python distutils
-
-DESCRIPTION="A note taking application"
-HOMEPAGE="http://keepnote.org/"
-SRC_URI="http://keepnote.org/download-test/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-python/pygobject:2
- dev-python/pygtk:2
- x11-misc/xdg-utils"
-
-DOCS="CHANGES"
-
-src_prepare() {
- distutils_src_prepare
-
- epatch "${FILESDIR}"/${PN}-0.7.8-desktopfile.patch
-}
-
-src_test() {
- testing() {
- PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" test/testing.py
- }
- python_execute_function testing
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- distutils_pkg_postinst
- gnome2_icon_cache_update
-
- einfo
- elog "optional dependencies:"
- elog " app-text/gtkspell:2 (spell checking)"
- einfo
-}
-
-pkg_postrm() {
- distutils_pkg_postrm
- gnome2_icon_cache_update
-}
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index 57805be9fc16..03200a7b542b 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,2 +1,3 @@
DIST pelican-3.2.2.tar.gz 164313 SHA256 858ea2a887dd10c8bacb45ce0c6e61cab4988545ad31c14432f02033895f76d6 SHA512 1b989c857aaad4cdf633e13d6949fb5d677bcb631dbaf8cc8a7409a31f3c8df96d8a66c25a7f939d37f1e15929c0a5630be9e91b8dd4d3f5218ebb9ce0d0ee3c WHIRLPOOL 96e3d998688ee56b9e73f3baf7898b23ada959a43e09b6b76eda9f0bffc70a526967e99b248ca5666ced3a183487dcc6444da7371550febd2742c95a8fbdf323
DIST pelican-3.3.tar.gz 195721 SHA256 6c3edb48517259465cad1cee18c5db2b595e726ec6f4eb5e1c858c8ecfd1ed99 SHA512 22416c1c86e3c704ca23030320f32cfca09fba34e66a4343a297ab50ffee2177d5fde5746c19975f47add05957644520f0080ddd1b8007a52dc63d5ae8a98dc3 WHIRLPOOL 5f0ea80f7c6fef0b008417f8b5669a574293b9084d35e4a4cfe17eb3c6d3defcb8e1cfa41d384e28b37424a7be869d9ef42d1c703228c795a09a88ea58f38189
+DIST pelican-3.4.0.tar.gz 755768 SHA256 54f9b63f24db7db7cc2aae25b239707af3ec582fa585cf864d9f50dfd4ed1d93 SHA512 358563998eb1e333007f90f9d6f97ed842e42240966ab329dd08d1dcc2c70dd9793604745ed14369a1736a01268b55c101304ae265c6b5bf4179bb4363706a0b WHIRLPOOL 8e2f085fd956d4037372e30304874dea294b8237904ab44d0d70b01c1282f8849202790e194f3e2512af2460bc1da3a44146e50bd91cea20e0cbd804c74c43c9
diff --git a/app-text/pelican/pelican-3.4.0.ebuild b/app-text/pelican/pelican-3.4.0.ebuild
new file mode 100644
index 000000000000..15403836dd36
--- /dev/null
+++ b/app-text/pelican/pelican-3.4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pelican/pelican-3.4.0.ebuild,v 1.1 2014/07/05 08:01:40 djc Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text (or markdown) input files."
+HOMEPAGE="http://pelican.notmyidea.org/ http://pypi.python.org/pypi/pelican"
+SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples markdown"
+
+DEPEND="dev-python/feedgenerator[${PYTHON_USEDEP}]
+ >=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+ dev-python/docutils[${PYTHON_USEDEP}]
+ dev-python/pygments[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/unidecode[${PYTHON_USEDEP}]
+ dev-python/blinker[${PYTHON_USEDEP}]
+ >=dev-python/six-1.4[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+ markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
+ virtual/python-argparse[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+DOCS=( README.rst )
+
+python_install_all() {
+ use examples && local EXAMPLES=( samples/. )
+ distutils-r1_python_install_all
+}
+
+# no tests: tests/content not in tarball for 2.8.1
+# for 3.0, should be based on tox (refer to virtualenvwrapper)
+
+#python_test() {
+# esetup.py test
+#}
diff --git a/app-text/xdvik/xdvik-22.87.ebuild b/app-text/xdvik/xdvik-22.87.ebuild
index bd3a1d97e186..74a596b03721 100644
--- a/app-text/xdvik/xdvik-22.87.ebuild
+++ b/app-text/xdvik/xdvik-22.87.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.87.ebuild,v 1.2 2014/05/01 04:13:10 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/xdvik/xdvik-22.87.ebuild,v 1.3 2014/07/04 08:20:39 naota Exp $
EAPI=5
inherit eutils flag-o-matic elisp-common toolchain-funcs multilib
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
IUSE="motif neXt Xaw3d emacs"
RDEPEND="media-libs/freetype:2
+ x11-libs/libXi
x11-libs/libXmu
x11-libs/libXp
x11-libs/libXpm
diff --git a/app-xemacs/gnus/Manifest b/app-xemacs/gnus/Manifest
index 14326ea6bd5e..bd67715fbc04 100644
--- a/app-xemacs/gnus/Manifest
+++ b/app-xemacs/gnus/Manifest
@@ -1,2 +1,3 @@
DIST gnus-1.91-pkg.tar.gz 3495969 SHA256 c7b736365158aeb9165e664017bf334277b4a8e260c5583321eaeab075e9d73a SHA512 10cb6de2ddbbc4276b585b02f0076da141ed131f7287031625ba7c85a3c0dcfe8d66a12916218387e01c1431a5ef1215073a476dfd5b9ff16673f1f0f0fa6906 WHIRLPOOL 590d80a5583263211a3160cc6cc9f6398ac6faac42467194301984367ff2a19daa12bf1fbb4b0ad94b16f4c32e029cbd7ee6479a4c63efe39b05b8b9bc037cbd
DIST gnus-1.94-pkg.tar.gz 3495935 SHA256 8314bc716b51005aa816d9629131b88397cb5040c9d51e57012771b411f5fb5b SHA512 f5b8e548e6f7307c16d4703ccf23f0dd5e34bc8cfd1ac5d5be3e581b01e21aa578804ec5878801b61355bc726dd30e56e7642974a4962e1a802a471d5e5b0465 WHIRLPOOL a2a06391fc719022882e764d2d4381970e2beabb49262d8029d83d0f01f1d8750577b321b44e6c38947becba155973d28676f4750544add14a8cf1a7be74da50
+DIST gnus-1.99-pkg.tar.gz 3636886 SHA256 e513bf0c604552e94b42c5ebfe5c23dcfa66923798cec379307b610fa1b6249a SHA512 f938e77d2a93e29b7eb89db5b67d717a55ff36e827b7ba3ea1d114f59eda763e06933b645fe42d51a53c483f1e6fe74c669d595af36aa97b30cb97f5ca39db79 WHIRLPOOL 9d0cd9534831d7e8025c33926cf06dc37200921993cbe083e00d97a478ae9e5f65265fef7d183e130c2c4f269dce009ba3b28cdaf2e39d1c78901385a8235833
diff --git a/app-xemacs/gnus/gnus-1.99.ebuild b/app-xemacs/gnus/gnus-1.99.ebuild
new file mode 100644
index 000000000000..839b72311c6e
--- /dev/null
+++ b/app-xemacs/gnus/gnus-1.99.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/gnus/gnus-1.99.ebuild,v 1.2 2014/07/05 15:55:49 matsl Exp $
+
+SLOT="0"
+IUSE=""
+DESCRIPTION="The Gnus Newsreader and Mailreader."
+PKG_CAT="standard"
+
+EXPERIMENTAL=true
+
+RDEPEND="app-xemacs/mail-lib
+app-xemacs/xemacs-base
+app-xemacs/xemacs-eterm
+app-xemacs/sh-script
+app-xemacs/net-utils
+app-xemacs/os-utils
+app-xemacs/dired
+app-xemacs/mh-e
+app-xemacs/sieve
+app-xemacs/ps-print
+app-xemacs/w3
+app-xemacs/pgg
+app-xemacs/mailcrypt
+app-xemacs/ecrypto
+app-xemacs/sasl
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/mail-lib/Manifest b/app-xemacs/mail-lib/Manifest
index 211305ccc15b..e2ff15130444 100644
--- a/app-xemacs/mail-lib/Manifest
+++ b/app-xemacs/mail-lib/Manifest
@@ -1,2 +1,3 @@
DIST mail-lib-1.79-pkg.tar.gz 215370 SHA256 50a1e8c4e266b3bc70364ca60b26935f488af9f10dab1849dc9129900b1bf02b SHA512 f0ca0758b9b77f2004ed82c7ab7c87ffed6dc5cc21a1dad0fe7b5e11c5513653c2085ba6bba0e11e1eb95e906fd1a6daf95dcf01459df6c19efaa52dba2d5efb WHIRLPOOL 39bc78eaea2dd20e8b08b806fbba7a44c28c0c6c4362b087b3b2217373af2bafaec0cd9d5b5ab62fb391ccc2cbbdef81c58d28a69863d08b211196ac3e874acd
DIST mail-lib-1.80-pkg.tar.gz 215436 SHA256 17678d8a8203e4fec431217250e062c766ebc660ebb5a8b9661912178646769a SHA512 8c30453fba657322cb98d85bf80bd3261cc3edb038eb174262710d264be13d4349ea89ce9c3006ea89369ae99d1c266e8e29e77d3283eb90994c2d6f184a1c08 WHIRLPOOL f7dff35e556a8f015c171a897f34fe17b7032d720fc0f5ebf6babf2233315ff7ccd062473b5aed5f7067a9ae6b287439e9672266d14bb338005e554313eac1fb
+DIST mail-lib-1.83-pkg.tar.gz 211863 SHA256 a837fb8a6f46ae54e11cac2e1fcf040e33dea27051514ec36adfdca67d1964ef SHA512 498c7f39efcb835ebce2852c49f5ca3a95b60b43a07d924f475ce3a37218fc466dd33fc16911b8320b229935179864bb8ee33beff61102bfde60b8a826f1dd6e WHIRLPOOL 5d62adc83f7760fb24a06f9846a3f4090757dbde47726dcc12bf3632090a781e61b022087450b99ee406fa48e3db2059180abe588173f306e65846fe43c177b0
diff --git a/app-xemacs/mail-lib/mail-lib-1.83.ebuild b/app-xemacs/mail-lib/mail-lib-1.83.ebuild
new file mode 100644
index 000000000000..a071f4d76212
--- /dev/null
+++ b/app-xemacs/mail-lib/mail-lib-1.83.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/mail-lib/mail-lib-1.83.ebuild,v 1.2 2014/07/05 15:52:18 matsl Exp $
+
+SLOT="0"
+IUSE=""
+DESCRIPTION="Fundamental lisp files for providing email support."
+PKG_CAT="standard"
+
+EXPERIMENTAL=true
+
+RDEPEND="app-xemacs/xemacs-eterm
+app-xemacs/xemacs-base
+app-xemacs/fsf-compat
+app-xemacs/sh-script
+app-xemacs/ecrypto
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/app-xemacs/tramp/Manifest b/app-xemacs/tramp/Manifest
index f209d81d64b1..5be0138b1f14 100644
--- a/app-xemacs/tramp/Manifest
+++ b/app-xemacs/tramp/Manifest
@@ -1,2 +1,3 @@
DIST tramp-1.37-pkg.tar.gz 298584 SHA256 5f56b5312c41d4689c95fe43a9b22b3061876f8d488f4e8218f3684638e835c9 SHA512 ff44ef5d83be3e28f792f45b0c402d1aac02b2a8cec5ab3e275a3aef4e19c6d1171d71ba745e3e4561779dec59a79811024b28c146da7eb87a221c81e8297937 WHIRLPOOL ab8353defb38ff58789689f0ab41ed0c3754d30488b13cf1743c72446433227368264f2431a9d05bbf932f95978ece1a5be8ea79551fa4f46512a2d6e8ac68d3
DIST tramp-1.40-pkg.tar.gz 304372 SHA256 16355e4ee481c392e0a36a7020a8637a5a4c44fa014b9d75b7ae01262d00f80c SHA512 8303071862194578cd12c1305cc81f764bb342de4d1d24e48a5fca5057f875cc90ccf187fe0fe1236b5d4aa173c366d501e14138d6f17a4fcd789c847d1fae99 WHIRLPOOL 6be11298f161cfeafeb61264516a37ce940c184f821a063fd8644e5d56639cba24ff039009f489dc78fe2d5c0b43571c1d6220037cdb982e3fa4dc372fc7ed3f
+DIST tramp-1.52-pkg.tar.gz 396316 SHA256 e3185e7bd8e3dd7076c8d4009014a8a70cd1953dcf4102f4408d181b7c148383 SHA512 ce61fe02bf0803a845bf34df7d9c7c0f72a28bcc84e2ebbcd8b80b1a28a5304bcffd5756a5a61d297b537e79a7d90e60821ba857a4c06911d4c098f2694897c6 WHIRLPOOL 6a45807355081ebc25fd3da40bae5d178f44345d87be430a629310962c40d65ff9bb0a8d216260d6bc2963b65a3a169b6af912836bcf2687cac144c17359cac5
diff --git a/app-xemacs/tramp/tramp-1.52.ebuild b/app-xemacs/tramp/tramp-1.52.ebuild
new file mode 100644
index 000000000000..1383b7dc2046
--- /dev/null
+++ b/app-xemacs/tramp/tramp-1.52.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-xemacs/tramp/tramp-1.52.ebuild,v 1.2 2014/07/05 15:54:04 matsl Exp $
+
+SLOT="0"
+IUSE=""
+DESCRIPTION="Remote shell-based file editing."
+PKG_CAT="standard"
+
+EXPERIMENTAL=true
+
+RDEPEND="app-xemacs/xemacs-base
+app-xemacs/vc
+app-xemacs/efs
+app-xemacs/dired
+app-xemacs/mail-lib
+app-xemacs/gnus
+app-xemacs/ediff
+app-xemacs/sh-script
+app-xemacs/edebug
+"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+inherit xemacs-packages
diff --git a/dev-db/lmdb/lmdb-0.9.11.ebuild b/dev-db/lmdb/lmdb-0.9.11.ebuild
index c69ddac205e0..0ad310b122c6 100644
--- a/dev-db/lmdb/lmdb-0.9.11.ebuild
+++ b/dev-db/lmdb/lmdb-0.9.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.11.ebuild,v 1.3 2014/01/31 16:24:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/lmdb/lmdb-0.9.11.ebuild,v 1.4 2014/07/05 13:22:13 klausman Exp $
EAPI=5
inherit toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="https://gitorious.org/mdb/mdb/archive/aa3463ec7c5e979420b13c8f37caa377e
LICENSE="OPENLDAP"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~x86"
IUSE="static-libs"
DEPEND=""
diff --git a/dev-db/pgxnclient/pgxnclient-1.2.ebuild b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
similarity index 53%
rename from dev-db/pgxnclient/pgxnclient-1.2.ebuild
rename to dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
index a4b6c00ef882..320eca8f892e 100644
--- a/dev-db/pgxnclient/pgxnclient-1.2.ebuild
+++ b/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/pgxnclient/pgxnclient-1.2.ebuild,v 1.1 2013/01/17 07:36:31 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/pgxnclient/pgxnclient-1.2-r1.ebuild,v 1.1 2014/07/05 08:41:51 idella4 Exp $
EAPI="5"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-* *-jython"
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-inherit distutils eutils
+inherit distutils-r1
DESCRIPTION="PostgreSQL Extension Network Client"
HOMEPAGE="http://pgxnclient.projects.postgresql.org/ http://pypi.python.org/pypi/${PN}"
@@ -16,7 +15,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
LICENSE="BSD"
SLOT="0"
-IUSE=""
+IUSE="test"
RDEPEND=">=dev-db/postgresql-server-9.1"
-DEPEND="${RDEPEND}"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+ # suite written onlt for py2
+ pushd ${PN} > /dev/null
+ if ! python_is_python3; then
+ PYTHONPATH=../ "${PYTHON}" -m unittest discover || die "tests failed"
+ fi
+ popd > dev/null
+}
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index 9936a9ab4313..c3082d64f6d7 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -1,2 +1 @@
DIST libgdiplus-2.10.9.tar.bz2 2074317 SHA256 6ddeb6c327bada7cb6e06d1a20714f526a0c69520dfd42c12ddd032c3c5d964e SHA512 7f1944795c7ede5fd92a6d7e8d7d6cf2ef3c154e656b83e769b417f8f7195dd975084afe3c3cd1dda1ecb2c1167f76c0b5714cd16d549ff056add09763c6b26c WHIRLPOOL 0930cb2ad191c34b7ebd073f687536663bcfe9a44ed3296cf81bc9d43cfc7ee39d8f60f9b9f83f89847164b7366e514ee945737be50b82257209507c3b6e9c5d
-DIST libgdiplus-2.10.tar.bz2 1962898 SHA256 2d9e0397ef5583ed855eaafcdac8cabbe1d58463ed1e4b545be6dde5b63712a4 SHA512 b1e4b14dffabbe395873733e636fba4265d1a20e4cb5d90ddb90417996bc90c9e3e6a41a03d9367f9de0de8f675d637e97bd2fb182b20776e897782b85df8d2b WHIRLPOOL 2862d6bf7872c88e0391ebc47ed99adc59a22b9ab48d41871c323ed49121ee30af6d74bc5e100683cb7a4018a22b3398a274c8c6dac20c73f650cc135d2acc2b
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild
index 415d09773349..3cfcaed106f8 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild,v 1.4 2013/12/16 13:40:00 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r1.ebuild,v 1.6 2014/07/05 11:00:02 pacho Exp $
EAPI="5"
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.mono-project.com"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
IUSE="cairo"
@@ -25,7 +25,7 @@ RDEPEND=">=dev-libs/glib-2.16:2
x11-libs/libXt
>=x11-libs/cairo-1.8.4[X]
media-libs/libexif
- >=media-libs/giflib-4.2.3
+ >=media-libs/giflib-4.1.3
virtual/jpeg:0
media-libs/tiff:0
!cairo? ( >=x11-libs/pango-1.20 )"
@@ -35,7 +35,6 @@ RESTRICT="test"
PATCHES=("${FILESDIR}/${P}-gold.patch"
"${FILESDIR}/${PN}-2.10.1-libpng15.patch"
- "${FILESDIR}/${PN}-2.10.9-giflib-quantizebuffer.patch"
"${FILESDIR}/${PN}-2.10.9-freetype251.patch")
src_prepare() {
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild
new file mode 100644
index 000000000000..ca6af5d43c21
--- /dev/null
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.10.9-r2.ebuild,v 1.1 2014/07/05 10:59:00 pacho Exp $
+
+EAPI="5"
+
+inherit base eutils mono flag-o-matic
+
+DESCRIPTION="Library for using System.Drawing with mono"
+HOMEPAGE="http://www.mono-project.com"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+SRC_URI="http://download.mono-project.com/sources/${PN}/${P}.tar.bz2"
+
+IUSE="cairo"
+
+RDEPEND=">=dev-libs/glib-2.16:2
+ >=media-libs/freetype-2.3.7
+ >=media-libs/fontconfig-2.6
+ >=media-libs/libpng-1.4:0
+ x11-libs/libXrender
+ x11-libs/libX11
+ x11-libs/libXt
+ >=x11-libs/cairo-1.8.4[X]
+ media-libs/libexif
+ >=media-libs/giflib-4.2.3
+ virtual/jpeg:0
+ media-libs/tiff:0
+ !cairo? ( >=x11-libs/pango-1.20 )"
+DEPEND="${RDEPEND}"
+
+RESTRICT="test"
+
+PATCHES=("${FILESDIR}/${P}-gold.patch"
+ "${FILESDIR}/${PN}-2.10.1-libpng15.patch"
+ "${FILESDIR}/${PN}-2.10.9-giflib-quantizebuffer.patch"
+ "${FILESDIR}/${PN}-2.10.9-freetype251.patch")
+
+src_prepare() {
+ base_src_prepare
+ sed -i -e 's:ungif:gif:g' configure || die
+}
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ econf --disable-dependency-tracking \
+ --disable-static \
+ --with-cairo=system \
+ $(use !cairo && printf %s --with-pango)
+}
+
+src_compile() {
+ emake "$@"
+}
+
+src_install () {
+ emake -j1 DESTDIR="${D}" "$@" install #nowarn
+ mono_multilib_comply
+ local commondoc=( AUTHORS ChangeLog README TODO )
+ for docfile in "${commondoc[@]}"
+ do
+ [[ -e "${docfile}" ]] && dodoc "${docfile}"
+ done
+ if [[ "${DOCS[@]}" ]]
+ then
+ dodoc "${DOCS[@]}"
+ fi
+ prune_libtool_files
+}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.10.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.10.ebuild
deleted file mode 100644
index 4256498f6226..000000000000
--- a/dev-dotnet/libgdiplus/libgdiplus-2.10.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.10.ebuild,v 1.7 2013/08/27 15:59:50 kensington Exp $
-
-EAPI=2
-
-inherit eutils go-mono mono flag-o-matic
-
-DESCRIPTION="Library for using System.Drawing with mono"
-HOMEPAGE="http://www.mono-project.com"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cairo"
-
-RDEPEND=">=dev-libs/glib-2.16:2
- >=media-libs/freetype-2.3.7
- >=media-libs/fontconfig-2.6
- >=media-libs/libpng-1.4:0
- x11-libs/libXrender
- x11-libs/libX11
- x11-libs/libXt
- >=x11-libs/cairo-1.8.4[X]
- media-libs/libexif
- >=media-libs/giflib-4.1.3
- virtual/jpeg:0
- media-libs/tiff:0
- !cairo? ( >=x11-libs/pango-1.20 )"
-DEPEND="${RDEPEND}"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-2.10.1-libpng15.patch" )
-
-src_prepare() {
- go-mono_src_prepare
- sed -i -e 's:ungif:gif:g' configure || die
-}
-
-src_configure() {
- append-flags -fno-strict-aliasing
- go-mono_src_configure --with-cairo=system \
- $(use !cairo && printf %s --with-pango) \
- || die "configure failed"
-}
diff --git a/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild b/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild
index c11d2c722aa7..3803aca82e74 100644
--- a/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild
+++ b/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 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.9 2014/03/23 17:17:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/deepseq/deepseq-1.3.0.1.ebuild,v 1.10 2014/07/04 14:30:04 klausman Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+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.4:="
diff --git a/dev-haskell/hashable/hashable-1.2.1.0.ebuild b/dev-haskell/hashable/hashable-1.2.1.0.ebuild
index b88685da6f6c..c13357f8565b 100644
--- a/dev-haskell/hashable/hashable-1.2.1.0.ebuild
+++ b/dev-haskell/hashable/hashable-1.2.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashable/hashable-1.2.1.0.ebuild,v 1.4 2014/02/24 01:38:03 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/hashable/hashable-1.2.1.0.ebuild,v 1.5 2014/07/04 21:28:01 klausman Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="+sse2 sse4_1"
RDEPEND=">=dev-haskell/text-0.11.0.5:=[profile?]
diff --git a/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild b/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild
index 5a82f52cd4a1..37a9fcf373e1 100644
--- a/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild
+++ b/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild,v 1.7 2014/03/24 15:06:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/httpd-shed/httpd-shed-0.4-r1.ebuild,v 1.8 2014/07/05 12:48:57 klausman Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND="dev-haskell/network:=[profile?]
diff --git a/dev-haskell/primitive/primitive-0.5.1.0.ebuild b/dev-haskell/primitive/primitive-0.5.1.0.ebuild
index e5d119bd8968..b195d535950c 100644
--- a/dev-haskell/primitive/primitive-0.5.1.0.ebuild
+++ b/dev-haskell/primitive/primitive-0.5.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/primitive/primitive-0.5.1.0.ebuild,v 1.6 2014/03/19 13:39:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/primitive/primitive-0.5.1.0.ebuild,v 1.7 2014/07/05 12:57:15 klausman Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND=">=dev-lang/ghc-6.10.4:=
diff --git a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild
index 50ef2e32d529..908392970a01 100644
--- a/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild
+++ b/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild,v 1.7 2014/03/24 15:06:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework-quickcheck2/test-framework-quickcheck2-0.3.0.2.ebuild,v 1.8 2014/07/05 13:01:16 klausman Exp $
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
#hackport: ignore-flag base3 : we don't support base3
#hackport: ignore-flag base4 : we don't support base4
IUSE=""
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
index 8d0a9115d04f..d89c748211ad 100644
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.9.2.ebuild,v 1.6 2013/10/20 16:31:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.9.2.ebuild,v 1.7 2014/07/04 14:34:33 haubi Exp $
EAPI="5"
@@ -22,7 +22,7 @@ SRC_URI="mirror://apache/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=virtual/jdk-1.5
!dev-java/ant-tasks
diff --git a/dev-java/xjavac/xjavac-20110814.ebuild b/dev-java/xjavac/xjavac-20110814.ebuild
index 17e136d7ad9e..a728dbba8990 100644
--- a/dev-java/xjavac/xjavac-20110814.ebuild
+++ b/dev-java/xjavac/xjavac-20110814.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavac/xjavac-20110814.ebuild,v 1.9 2013/06/14 19:31:51 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xjavac/xjavac-20110814.ebuild,v 1.10 2014/07/04 14:21:13 haubi Exp $
EAPI="2"
inherit java-pkg-2 java-ant-2
@@ -12,7 +12,7 @@ IUSE=""
HOMEPAGE="http://cvs.apache.org/viewcvs.cgi/xml-xerces/java/tools/src/XJavac.java"
LICENSE="Apache-2.0"
SLOT="1"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=virtual/jdk-1.4"
RDEPEND=">=virtual/jdk-1.4
>=dev-java/ant-core-1.7"
diff --git a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
index 112ab5787d5b..d7cc94d2ea1e 100644
--- a/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
+++ b/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild,v 1.7 2013/06/14 19:22:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-external/xml-commons-external-1.4.01.ebuild,v 1.8 2014/07/04 14:17:27 haubi Exp $
EAPI=4
@@ -18,7 +18,7 @@ SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
LICENSE="Apache-2.0"
SLOT="1.4"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc source"
DEPEND=">=virtual/jdk-1.3"
diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild
index 157460b9f8b4..e0d434e6fce0 100644
--- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild
+++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild,v 1.14 2013/06/14 19:32:55 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-resolver/xml-commons-resolver-1.2.ebuild,v 1.15 2014/07/04 14:15:41 haubi Exp $
JAVA_PKG_IUSE="doc source"
@@ -13,7 +13,7 @@ DEPEND=">=virtual/jdk-1.3"
RDEPEND=">=virtual/jre-1.3"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
JAVA_PKG_BSFIX_NAME="resolver.xml"
diff --git a/dev-lang/blassic/blassic-0.10.2.ebuild b/dev-lang/blassic/blassic-0.10.2.ebuild
index f31af54ebb29..d9bc5c124c23 100644
--- a/dev-lang/blassic/blassic-0.10.2.ebuild
+++ b/dev-lang/blassic/blassic-0.10.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/blassic/blassic-0.10.2.ebuild,v 1.7 2012/11/03 13:25:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/blassic/blassic-0.10.2.ebuild,v 1.8 2014/07/04 08:29:33 mr_bones_ Exp $
-EAPI=2
+EAPI=5
inherit eutils
DESCRIPTION="classic Basic interpreter"
@@ -12,22 +12,20 @@ SRC_URI="http://blassic.org/bin/${P}.tgz"
LICENSE="GPL-2"
KEYWORDS="~amd64 hppa ppc x86 ~x86-linux ~ppc-macos ~x86-macos"
SLOT="0"
-IUSE="svga X"
+IUSE="X"
RDEPEND="sys-libs/ncurses
- X? ( x11-libs/libICE x11-libs/libX11 x11-libs/libSM )
- svga? ( media-libs/svgalib )"
+ X? ( x11-libs/libICE x11-libs/libX11 x11-libs/libSM )"
DEPEND="${RDEPEND}
X? ( x11-proto/xproto )"
src_configure() {
econf \
- --disable-dependency-tracking \
- $(use_with X x) \
- $(use_enable svga svgalib)
+ --disable-svgalib \
+ $(use_with X x)
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ emake DESTDIR="${D}" install
dodoc AUTHORS NEWS README THANKS TODO
}
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 129515f12d93..c68413396d21 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -1,12 +1,12 @@
DIST otp_doc_html_17.0.tar.gz 33168721 SHA256 4a9edba2e5b8ca2e35e5080c1c30a2674aafa39b51d7268383b6e326d397f8dd SHA512 f475d88d75009a409d65f0cd45f7bdbc918acd68b99238fd519166d713d4642fbf696efce30a8db8374358ad329bd85fc26b84145af9b9ffc7a2de7dd65edf19 WHIRLPOOL 47c00587d1568f48575abe4814debc8b3b7d8428bc770e3f18f3917a5528491a4f9748f264c8eaed3daf71d87ab3d2982f2901bfe5b59e6583b04242f42485de
+DIST otp_doc_html_17.1.tar.gz 33412455 SHA256 1f73751e32c63c86d11e0de9f8525b84287284970a73dcb9581f51e8770735be SHA512 bf218934332ae22a7d77c1493bab84c73a69078c2b24464d3d19466db73b6506555b1ee3508ca288e7d58bb35d3fdfd2a3f759c11fd93946c16faac415bd04dc WHIRLPOOL 4945229cff20e22b2df6f678bd98fd94a01ea64cee85426bc2b8be8c391bae375a68775119fc3cca8e1e6fd56264820100231d1c15e153d235ee8d370f83c260
DIST otp_doc_html_R15B03-1.tar.gz 30436303 SHA256 d06f580f11d1303217a5c1cf8d68a98d7e01c535be934dcd430ecdc254f7572e SHA512 8a22ad702d50f40162f7d6051dbbc0226af449f7a1dcfb087e952dd7eb7213257940933441cfb68f055746450e3e5aa2c5ed8107ac67af7c3a940afb195af8c7 WHIRLPOOL ac10f9ce0ffd4cbd98617e4018e5a4729ce83f0ace6a4db219e7beef2f3a626a8c9a419c7f7772c934ca50310f55486df7eb24955ba845a9230c69c93e183d33
-DIST otp_doc_html_R16B02.tar.gz 33241266 SHA256 2d54119b30c4d905b6b1298865309c3392fefb1580ad69725e997644bed04b7f SHA512 135557ee5ecd50487526712af52e3523317ce6cf0e6ea26d8c1bfcd11d55c113d378a64e6867fcc5fe45f9d02aa60d2de2839b904e6ec8909f050752207b63d9 WHIRLPOOL e0fa173a64800a268b4bac59137819cd241efe8aee72d857cddbf3270c57a6d3e810f64691961a8eb6569a4ec281de4c7e28233a6a97f25990b0b8d476462d4b
DIST otp_doc_html_R16B03-1.tar.gz 33294165 SHA256 5381d4ffe654e3e943f004e2b91870bd83f0e46e261bb405c1cdf7de81bc0507 SHA512 8f13bdda6a6732c5bee292b4f378539e5fc707be8822e660be9f851faff483b1fc06e612a5eaa843d71c22cec45943bd14aa20ad2323b8683861904d78aec403 WHIRLPOOL 163d2f5b7bac6363ad6ae5c1a083d8894a990f056b6cb27f3cc9923965fd2f0202a2de2248a2ed0fe6fc4afb1d6b096d94c2c141573f0c9439a5e19d5abe5dcb
DIST otp_doc_man_17.0.tar.gz 1353215 SHA256 acf72b5876c6f505191a3fb57b7e672733f911141929c4cef050111cf8f8b399 SHA512 a4b0e4503ef0c31636bc6d24cf09f5e61245d1ddf261e1515a6083df8379336335bc003a1e2d89b38049cf7299e1e2e0e7bce8924a1fd3429634f735ed2dd7ff WHIRLPOOL 95eda4570c58a8e6ffc4c4223f28e902a7d154e6ab8f61ffaea326595564cc068e9cc73a64bd48f01942580fcaa2a714bbf7e8783b08ff0a844f6c1ebea442b4
+DIST otp_doc_man_17.1.tar.gz 1354653 SHA256 4a230277f135e3730593e7bffdd5ca92596568340f02a5b3134f1d083b34eaab SHA512 32fe1e4f9bab8979e4b38952602c4757daeb6a0bebf8249ee540ed9cad4bdd2d94ccc05c56a93d0dcf5db1c973fe5495f8cb071b95d0ebdbb0750e67514295f1 WHIRLPOOL 7972da093c9d280cf09d9825458caae775e89806b6b11c1abf306c7c0aff384bc1c8b2ecc10aa12a433500f9be9589d0e885f25709074d7b21f044a550ce7c12
DIST otp_doc_man_R15B03-1.tar.gz 1305001 SHA256 07980d8014c7cf8194b7078c137353f5083992add4663ced3dcba2ff91f228d8 SHA512 eb07552c83a942c1e7f1960b45edfab97b0628a1e08c7c827a07d77797901b4b60a6719b35d0f92a49eb04ada924e9263df70968a5920efc6ccf8e4e966933c6 WHIRLPOOL 764495a8bb67e2c67493452c83ff890d959aa5cd3bd711fce75b3c756dbacb913e50f7d92aab14dc33d6839daaac5a37dc7bcc11fc6392af11dd506a8d99076c
-DIST otp_doc_man_R16B02.tar.gz 1318271 SHA256 b79ceb0383415088b5f040f2f3705632b425cb3f29c3955ef2219556abec5789 SHA512 958fa91c9fd59f4cf5c08e9b1cab433e53e9a267d7078e5a6603d6e9f68bcd36a1fb50ab12e29c958dc0673c370b191cbb5114d7a9ea0ff91de56bc13f053736 WHIRLPOOL eebe34bb53bb942f9e2145ee2c7756ec3059f4706fd157b275056a594e7a1d2aca2ccf457b9201b9bb9c8a1dfc7dc61b0eb3e70b172c5e18f8694742845bb684
DIST otp_doc_man_R16B03-1.tar.gz 1322516 SHA256 0f31bc7d7215aa4b6834b1a565cd7d6e3173e3b392fb870254bae5136499c39d SHA512 b54771e853d2580be6303cdf20e17348360b60359e6e2b3d98a109f892088fb0071a245649afaca48dd98fe00ce9bb8bf3030535132db842e9a7d7c11880c155 WHIRLPOOL 53d12fa03905698b027e4df2e2a28b3f0df0adc41d6d98c4389cea8d9bf84f7de54ef2f8f00603141e68e65bf071890fd24e442bacab6790e62356cdedb4ee59
DIST otp_src_17.0.tar.gz 66640875 SHA256 297f2baaa65e5ed1c2492c500fe191bff852217ad57af5da2470a3218c9acadb SHA512 deddadac35ff10b1441c5a96b0ae776b3989b952f1d2ea33796d4c0300f00538ad5effb099750b41ce8111bb15ccab5479a25b105722ed54daf8c2b05759274e WHIRLPOOL fd5ea04779d143a1a51671b7185b8f158bf24107ce81ebe63f083c48dc749a4aa4094b52da4349d5154773fa286fcb8fd974d7ff47b6cb4e0ebe6f93d78f9cb2
+DIST otp_src_17.1.tar.gz 66912681 SHA256 b806f5b2b5cc2d0c0d5dd1a65657c21c10dc3a0535ef60adecdac9cd73b9c356 SHA512 5e80d706bec175a955d4497ba17c5c24961e3a0b29eaf43f3f24fd9366066106c1e57119064a2621e55e1b359ddd504219687f2c81e118057c2071a5f60a28e8 WHIRLPOOL 04ae8a263c4a36ad71e5561be7be36a7dcb8e9afde46e34a0e41b1f44eb794466f3ab55b38af10860c592d01edd1ea822c3ec2fedcf0b96391cfad56432dc0d9
DIST otp_src_R15B03-1.tar.gz 76123810 SHA256 4bccac86dd76aec050252e44276a0283a0df9218e6470cf042a9b9f9dfc9476c SHA512 baa8f388bd56bbdf1d3818802d011970fb51d38d14434532b1e4f04c1b8203e5a0cd9cc870f93a993cce750cd1af6e4b7df40dffc44e455353bce9d7c46c8e34 WHIRLPOOL ce76d01dfd17e0bc70e3daa7eab218000d1e802f55b0892e2e9654d2ea262f214f3bd006c0988885e787a1cfe782e8b61d5d1ee3a1d05cbced465b5a28e2de2e
-DIST otp_src_R16B02.tar.gz 66023455 SHA256 6ab8ad1df8185345554a4b80e10fd8be06c4f2b71b69dcfb8528352787b32f85 SHA512 35c4dfe4f7de04a44cc4e2eabd796b53fa3c4104ced144f0b2060a66adf1e400b65eb1c94c19c5f83baa7f1f31bdc73b36f2ac1df9dfac7cc6e253b52702287d WHIRLPOOL fcb4e90874d2eabfa025786ed6e98ab7e1f1932b75f5d72fe7291c96ee955bc62c0faca2a3f7e51e24e2c74ca4b82e43b89f7bb0e430b6aa8c8b0d599d9ad506
DIST otp_src_R16B03-1.tar.gz 66253556 SHA256 17ce53459bc5ceb34fc2da412e15ac8c23835a15fbd84e62c8d1852704747ee7 SHA512 c2d26d6e1ae85abb8195c7171a0693388b507be760710f3afdfbcfa776e31508ab9e2a58010d55a95ba4a5075edc1e7c18fcefa196129fa672ccc40a945f7e44 WHIRLPOOL c6e1e6bfef7249e3350ff0e3c5cbad40cb2ef80fff774ca46871a37943d8f4e92af8a5e0c3eaa3a97c18fc47b87ace9477536cf0a251d325165bea869d26b85f
diff --git a/dev-lang/erlang/erlang-16.2-r1.ebuild b/dev-lang/erlang/erlang-16.2-r1.ebuild
deleted file mode 100644
index 9db04fc918e5..000000000000
--- a/dev-lang/erlang/erlang-16.2-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-16.2-r1.ebuild,v 1.1 2014/02/08 20:53:24 djc Exp $
-
-EAPI=3
-WX_GTK_VER="2.8"
-
-inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-MY_VER=($(get_version_components))
-MY_MAJ="${MY_VER[0]}"
-MY_MIN="${MY_VER[1]:+0}${MY_VER[1]}"
-MY_MIC="${MY_VER[2]:+-}${MY_VER[2]}"
-MY_PV="R${MY_MAJ}B${MY_MIN}${MY_MIC}"
-
-DESCRIPTION="Erlang programming language, runtime environment, and large collection of libraries"
-HOMEPAGE="http://www.erlang.org/"
-SRC_URI="http://www.erlang.org/download/otp_src_${MY_PV}.tar.gz
- http://erlang.org/download/otp_doc_man_${MY_PV}.tar.gz
- doc? ( http://erlang.org/download/otp_doc_html_${MY_PV}.tar.gz )"
-
-LICENSE="ErlPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="compat-ethread doc emacs halfword hipe java kpoll odbc smp sctp ssl tk wxwidgets"
-
-RDEPEND=">=dev-lang/perl-5.6.1
- ssl? ( >=dev-libs/openssl-0.9.7d )
- emacs? ( virtual/emacs )
- java? ( >=virtual/jdk-1.2 )
- odbc? ( dev-db/unixODBC )"
-DEPEND="${RDEPEND}
- wxwidgets? ( x11-libs/wxGTK:2.8[X,opengl] virtual/glu )
- sctp? ( net-misc/lksctp-tools )
- tk? ( dev-lang/tk )"
-
-S="${WORKDIR}/otp_src_${MY_PV}"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
- if use halfword ; then
- use amd64 || die "halfword support is limited to amd64"
- fi
-}
-
-src_prepare() {
- use odbc || sed -i 's: odbc : :' lib/Makefile
-
- # bug 263129, don't ignore LDFLAGS, reported upstream
- sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in || die
-
- # don't ignore LDFLAGS, reported upstream
- sed -e 's:LDFLAGS = \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in || die
-
- if ! use wxwidgets; then
- sed -i 's: wx : :' lib/Makefile
- rm -rf lib/wx
- fi
-
- # Nasty workaround, reported upstream
- cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in || die
-
- # bug 383697
- sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c || die
- epatch "${FILESDIR}/${PV}-tinfo.patch" || die
- cd erts && eautoreconf || die
-}
-
-src_configure() {
- use java || export JAVAC=false
-
- econf \
- --enable-threads \
- --enable-shared-zlib \ \
- $(use_enable sctp) \
- $(use_enable halfword halfword-emulator) \
- $(use_enable hipe) \
- $(use_with ssl ssl "${EPREFIX}"/usr) \
- $(use_enable ssl dynamic-ssl-lib) \
- $(use_enable kpoll kernel-poll) \
- $(use_enable smp smp-support) \
- $(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
- $(use x64-macos && echo "--enable-darwin-64bit") \
- || die
-}
-
-src_compile() {
- use java || export JAVAC=false
- emake || die
-
- if use emacs ; then
- pushd lib/tools/emacs
- elisp-compile *.el || die
- popd
- fi
-}
-
-extract_version() {
- sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
-}
-
-src_install() {
- local ERL_LIBDIR=/usr/$(get_libdir)/erlang
- local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
- local ERL_ERTS_VER=$(extract_version erts VSN)
-
- emake INSTALL_PREFIX="${D}" install || die
- dodoc AUTHORS README.md
-
- dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
- dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
- dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
- dosym \
- "${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
- /usr/bin/erl_call
- dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
- use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
-
- ## Remove ${D} from the following files
- sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/erl" || die
- sed -e "s:${D}::g" -i "${ED}${ERL_LIBDIR}/bin/start" || die
- grep -rle "${D}" "${ED}/${ERL_LIBDIR}/erts-${ERL_ERTS_VER}" | xargs sed -i -e "s:${D}::g"
-
- ## Clean up the no longer needed files
- rm "${ED}/${ERL_LIBDIR}/Install"||die
-
- for i in "${WORKDIR}"/man/man* ; do
- dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
- done
- for file in "${WORKDIR}"/man/man*/*.[1-9]; do
- # doman sucks so we can't use it
- cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
- done
- # extend MANPATH, so the normal man command can find it
- # see bug 189639
- dodir /etc/env.d/
- echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
-
- if use doc ; then
- dohtml -A README,erl,hrl,c,h,kwc,info -r \
- "${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
- fi
-
- if use emacs ; then
- pushd "${S}"
- elisp-install erlang lib/tools/emacs/*.{el,elc}
- sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
- "${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
- elisp-site-file-install "${T}"/${SITEFILE}
- popd
- fi
-
- newinitd "${FILESDIR}"/epmd.init epmd || die
- systemd_dounit "${FILESDIR}"/epmd.service ||die
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
- elog
- elog "If you need a symlink to one of Erlang's binaries,"
- elog "please open a bug on http://bugs.gentoo.org/"
- elog
- elog "Gentoo's versioning scheme differs from the author's, so please refer to this version as ${MY_PV}"
- elog
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/erlang-17.0.ebuild b/dev-lang/erlang/erlang-17.1.ebuild
similarity index 96%
rename from dev-lang/erlang/erlang-17.0.ebuild
rename to dev-lang/erlang/erlang-17.1.ebuild
index fa0824939820..bd41cc22bb29 100644
--- a/dev-lang/erlang/erlang-17.0.ebuild
+++ b/dev-lang/erlang/erlang-17.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-17.0.ebuild,v 1.2 2014/04/24 11:34:28 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/erlang/erlang-17.1.ebuild,v 1.1 2014/07/05 08:10:52 djc Exp $
EAPI=4
WX_GTK_VER="2.8"
@@ -19,7 +19,7 @@ SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
LICENSE="ErlPL-1.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="compat-ethread doc emacs halfword hipe java kpoll odbc smp sctp ssl tk wxwidgets"
+IUSE="compat-ethread doc emacs halfword hipe java kpoll odbc smp sctp ssl systemd tk wxwidgets"
RDEPEND=">=dev-lang/perl-5.6.1
ssl? ( >=dev-libs/openssl-0.9.7d )
@@ -69,6 +69,7 @@ src_configure() {
econf \
--enable-threads \
$(use_enable sctp) \
+ $(use_enable systemd) \
$(use_enable halfword halfword-emulator) \
$(use_enable hipe) \
$(use_with ssl ssl "${EPREFIX}"/usr) \
diff --git a/dev-lang/ghc/ghc-7.6.3-r1.ebuild b/dev-lang/ghc/ghc-7.6.3-r1.ebuild
index d2fd97b8b7cc..56f8302fcd95 100644
--- a/dev-lang/ghc/ghc-7.6.3-r1.ebuild
+++ b/dev-lang/ghc/ghc-7.6.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.11 2014/06/27 09:54:02 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-7.6.3-r1.ebuild,v 1.12 2014/07/05 15:40:40 slyfox Exp $
# Brief explanation of the bootstrap logic:
#
@@ -603,8 +603,13 @@ src_compile() {
# ghc massively parallel make: #409631, #409873
# but let users screw it by setting 'I_DEMAND_MY_CORES_LOADED'
# 4 parallel jobs usually does not break
- emake $(limit_jobs 4) all
- emake all V=1
+
+ # 1. build compiler binary(+wrapper) first
+ emake $(limit_jobs 4) inplace/bin/ghc-stage2 V=1
+ # 2. pax-mark (bug #516430)
+ pax-mark -m inplace/lib/ghc-stage2
+ # 3. and then all the rest
+ emake $(limit_jobs 4) all V=1
if is_crosscompile; then
# runghc does not work for a stage1 compiler, we can build it anyway
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index 000f3e4b6604..34049434a96e 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,5 +1,3 @@
DIST lua-5.1.4.tar.gz 216679 SHA256 b038e225eaf2a5b57c9bcc35cd13aa8c6c8288ef493d52970c9545074098af3a SHA512 bc542fe8535826ac1e49b03a8f238cf049724b02c14718f8162cfeaf735a5e6c58412ff18dbe7a38e4cc4433f3d1e702554e9b24b5f021634b4280880980f40f WHIRLPOOL 2d8fdf77e31314eed68d8ace368a62a608a58114bea5c8797a2e2d327ca870dd4450ede494733d49c97bb447c97adf08610027df3206999a35fb49cde77448fd
DIST lua-5.1.5.tar.gz 221213 SHA256 2640fc56a795f29d28ef15e13c34a47e223960b0240e8cb0a82d9b0738695333 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9 WHIRLPOOL 9dac93b73b9ad1ef6c69e0aa11fb53d5efe89274b65c55a1ac30bab23e8a255851b0e44306db54212b1d481e658cecd38e5ff22a25e1fa974858b7b03fb45b75
-DIST lua-5.2.0.tar.gz 246377 SHA256 cabe379465aa8e388988073d59b69e76ba0025429d2c1da80821a252cdf6be0d SHA512 48c4a35323309c983a785a320b9a5058401c8b6cc0a4296ace66ab13ecb435d5274fdbaa28498f232619bda3bdee6eae9d264421406a83e55a418e2a6e95388a WHIRLPOOL d14eeaa0322b611a65d698faf94e00611e3c4942363e2db068891838f6f7abab9b2ca509b6e3791b0f734ee69e41e07ac63a372d0bee60c9e8ffcc5a0f693909
-DIST lua-5.2.1.tar.gz 249882 SHA256 64304da87976133196f9e4c15250b70f444467b6ed80d7cfd7b3b982b5177be5 SHA512 d0548d2cc2aa4fb4b5ae19d0ff675027370e3ee22d6e1ba448651c6f1f6f5e6b6214c81b760a23954f1e270936248bc021b9594a75191de4c1921e73d1ae48fb WHIRLPOOL 2a8d3d3c6ae37307bd667ab0619f7992f12ad4fb6c2709c2b4ee797b33d6eebee2d0298b7cb1b1a62d6140d3f9563ed7479c508da55234148981e57fe159e842
DIST lua-5.2.3.tar.gz 251195 SHA256 13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d SHA512 264bb7c8db2f190ef0ca38584ec81999ab588f54e03119c5214c40bb8925b0eb407fac483a03e40cc8a220f6748ddff7d3a7392da3803418276b0d263b866449 WHIRLPOOL d278a1e38416bcf7f82eb3e7fd5fb423e60ccb69e9d57a937070516ff8be2d19a98bbfdaf37ec6fd6fb3ef2d625900977ca0cb47e46cb0ede5ebd5d37a9454ef
diff --git a/dev-lang/lua/lua-5.2.0-r1.ebuild b/dev-lang/lua/lua-5.2.0-r1.ebuild
deleted file mode 100644
index 500e9db87559..000000000000
--- a/dev-lang/lua/lua-5.2.0-r1.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.0-r1.ebuild,v 1.2 2012/05/29 15:04:25 aballier Exp $
-
-EAPI=4
-
-inherit eutils autotools multilib portability toolchain-funcs versionator
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="http://www.lua.org/"
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+deprecated emacs readline static"
-
-RDEPEND="readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-PDEPEND="emacs? ( app-emacs/lua-mode )"
-
-src_prepare() {
- local PATCH_PV=$(get_version_component_range 1-2)
-
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch
-
- EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
-
- sed -i \
- -e 's:\(LUA_ROOT\s*\).*:\1"/usr/":' \
- -e "s:\(LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
- src/luaconf.h \
- || die "failed patching luaconf.h"
-
- # correct lua versioning
- sed -i -e 's/\(LIB_VERSION = \)6:1:1/\17:0:2/' src/Makefile
-
- sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
-
- if ! use readline ; then
- sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h
- fi
-
- # Using dynamic linked lua is not recommended for performance
- # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
- # Mainly, this is of concern if your arch is poor with GPRs, like x86
- # Note that this only affects the interpreter binary (named lua), not the lua
- # compiler (built statically) nor the lua libraries (both shared and static
- # are installed)
- if use static ; then
- sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile
- fi
-
- # upstream does not use libtool, but we do (see bug #336167)
- cp "${FILESDIR}/configure.in" "${S}"
- eautoreconf
-}
-
-src_compile() {
- tc-export CC
-
- # what to link to liblua
- liblibs="-lm"
- liblibs="${liblibs} $(dlopen_lib)"
-
- # what to link to the executables
- mylibs=
- use readline && mylibs="-lreadline"
-
- cd src
-
- local legacy=""
- use deprecated && legacy="-DLUA_COMPAT_ALL"
-
- emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${legacy} ${CFLAGS}" \
- SYSLDFLAGS="${LDFLAGS}" \
- RPATH="${EPREFIX}/usr/$(get_libdir)/" \
- LUA_LIBS="${mylibs}" \
- LIB_LIBS="${liblibs}" \
- V=${PV} \
- gentoo_all || die "emake failed"
-}
-
-src_install() {
- local PATCH_PV=$(get_version_component_range 1-2)
-
- emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
- V=${PV} gentoo_install \
- || die "emake install gentoo_install failed"
-
- dodoc README
- dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
-
- doman doc/lua.1 doc/luac.1
-
- # We want packages to find our things...
- cp "${FILESDIR}/lua.pc" "${WORKDIR}"
- sed -i \
- -e "s:^V=.*:V= ${PATCH_PV}:" \
- -e "s:^R=.*:R= ${PV}:" \
- -e "s:/,lib,:/$(get_libdir):g" \
- "${WORKDIR}/lua.pc"
-
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins "${WORKDIR}/lua.pc"
-}
diff --git a/dev-lang/lua/lua-5.2.0.ebuild b/dev-lang/lua/lua-5.2.0.ebuild
deleted file mode 100644
index a92ccf07111b..000000000000
--- a/dev-lang/lua/lua-5.2.0.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.0.ebuild,v 1.4 2012/05/29 15:04:25 aballier Exp $
-
-EAPI=4
-
-inherit eutils autotools multilib portability toolchain-funcs versionator
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="http://www.lua.org/"
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+deprecated emacs readline static"
-
-RDEPEND="readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-PDEPEND="emacs? ( app-emacs/lua-mode )"
-
-src_prepare() {
- local PATCH_PV=$(get_version_component_range 1-2)
-
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch
-
- sed -i \
- -e 's:\(LUA_ROOT\s*\).*:\1"/usr/":' \
- -e "s:\(LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
- src/luaconf.h \
- || die "failed patching luaconf.h"
-
- # correct lua versioning
- sed -i -e 's/\(LIB_VERSION = \)6:1:1/\17:0:2/' src/Makefile
-
- sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
-
- if ! use readline ; then
- sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h
- fi
-
- # Using dynamic linked lua is not recommended for performance
- # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
- # Mainly, this is of concern if your arch is poor with GPRs, like x86
- # Note that this only affects the interpreter binary (named lua), not the lua
- # compiler (built statically) nor the lua libraries (both shared and static
- # are installed)
- if use static ; then
- sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile
- fi
-
- # upstream does not use libtool, but we do (see bug #336167)
- cp "${FILESDIR}/configure.in" "${S}"
- eautoreconf
-}
-
-src_compile() {
- tc-export CC
-
- # what to link to liblua
- liblibs="-lm"
- liblibs="${liblibs} $(dlopen_lib)"
-
- # what to link to the executables
- mylibs=
- use readline && mylibs="-lreadline"
-
- cd src
-
- local legacy=""
- use deprecated && legacy="-DLUA_COMPAT_ALL"
-
- emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${legacy} ${CFLAGS}" \
- SYSLDFLAGS="${LDFLAGS}" \
- RPATH="${EPREFIX}/usr/$(get_libdir)/" \
- LUA_LIBS="${mylibs}" \
- LIB_LIBS="${liblibs}" \
- V=${PV} \
- gentoo_all || die "emake failed"
-}
-
-src_install() {
- local PATCH_PV=$(get_version_component_range 1-2)
-
- emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
- V=${PV} gentoo_install \
- || die "emake install gentoo_install failed"
-
- dodoc README
- dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
-
- doman doc/lua.1 doc/luac.1
-
- # We want packages to find our things...
- cp "${FILESDIR}/lua.pc" "${WORKDIR}"
- sed -i \
- -e "s:^V=.*:V= ${PATCH_PV}:" \
- -e "s:^R=.*:R= ${PV}:" \
- -e "s:/,lib,:/$(get_libdir):g" \
- "${WORKDIR}/lua.pc"
-
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins "${WORKDIR}/lua.pc"
-}
diff --git a/dev-lang/lua/lua-5.2.1.ebuild b/dev-lang/lua/lua-5.2.1.ebuild
deleted file mode 100644
index 89b05e139a3c..000000000000
--- a/dev-lang/lua/lua-5.2.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/lua/lua-5.2.1.ebuild,v 1.3 2013/05/26 16:55:34 mabi Exp $
-
-EAPI=4
-
-inherit eutils autotools multilib portability toolchain-funcs versionator
-
-DESCRIPTION="A powerful light-weight programming language designed for extending applications"
-HOMEPAGE="http://www.lua.org/"
-SRC_URI="http://www.lua.org/ftp/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="+deprecated emacs readline static"
-
-RDEPEND="readline? ( sys-libs/readline )"
-DEPEND="${RDEPEND}
- sys-devel/libtool"
-PDEPEND="emacs? ( app-emacs/lua-mode )"
-
-src_prepare() {
- local PATCH_PV=$(get_version_component_range 1-2)
-
- epatch "${FILESDIR}"/${PN}-${PATCH_PV}-make.patch
-
- [ -d "${FILESDIR}/${PV}" ] && \
- EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="upstream.patch" epatch
-
- sed -i \
- -e 's:\(define LUA_ROOT\s*\).*:\1"'${EPREFIX}'/usr/":' \
- -e "s:\(define LUA_CDIR\s*LUA_ROOT \"\)lib:\1$(get_libdir):" \
- src/luaconf.h \
- || die "failed patching luaconf.h"
-
- # correct lua versioning
- sed -i -e 's/\(LIB_VERSION = \)6:1:1/\17:0:2/' src/Makefile
-
- sed -i -e 's:\(/README\)\("\):\1.gz\2:g' doc/readme.html
-
- if ! use readline ; then
- sed -i -e '/#define LUA_USE_READLINE/d' src/luaconf.h
- fi
-
- # Using dynamic linked lua is not recommended for performance
- # reasons. http://article.gmane.org/gmane.comp.lang.lua.general/18519
- # Mainly, this is of concern if your arch is poor with GPRs, like x86
- # Note that this only affects the interpreter binary (named lua), not the lua
- # compiler (built statically) nor the lua libraries (both shared and static
- # are installed)
- if use static ; then
- sed -i -e 's:\(-export-dynamic\):-static \1:' src/Makefile
- fi
-
- # upstream does not use libtool, but we do (see bug #336167)
- cp "${FILESDIR}/configure.in" "${S}"
- eautoreconf
-}
-
-src_compile() {
- tc-export CC
-
- # what to link to liblua
- liblibs="-lm"
- liblibs="${liblibs} $(dlopen_lib)"
-
- # what to link to the executables
- mylibs=
- use readline && mylibs="-lreadline"
-
- cd src
-
- local legacy=""
- use deprecated && legacy="-DLUA_COMPAT_ALL"
-
- emake CC="${CC}" CFLAGS="-DLUA_USE_LINUX ${legacy} ${CFLAGS}" \
- SYSLDFLAGS="${LDFLAGS}" \
- RPATH="${EPREFIX}/usr/$(get_libdir)/" \
- LUA_LIBS="${mylibs}" \
- LIB_LIBS="${liblibs}" \
- V=${PV} \
- gentoo_all || die "emake failed"
-}
-
-src_install() {
- local PATCH_PV=$(get_version_component_range 1-2)
-
- emake INSTALL_TOP="${ED}/usr" INSTALL_LIB="${ED}/usr/$(get_libdir)" \
- V=${PV} gentoo_install \
- || die "emake install gentoo_install failed"
-
- dodoc README
- dohtml doc/*.html doc/*.png doc/*.css doc/*.gif
-
- doman doc/lua.1 doc/luac.1
-
- # We want packages to find our things...
- cp "${FILESDIR}/lua.pc" "${WORKDIR}"
- sed -i \
- -e "s:^V=.*:V= ${PATCH_PV}:" \
- -e "s:^R=.*:R= ${PV}:" \
- -e "s:/,lib,:/$(get_libdir):g" \
- "${WORKDIR}/lua.pc"
-
- insinto "/usr/$(get_libdir)/pkgconfig"
- doins "${WORKDIR}/lua.pc"
-}
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index e2df8d884df3..aeb36c1aba97 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,5 +1,3 @@
-DIST perl-5.12.4-1.tar.bz2 8045 SHA256 a5b0a7385773da5e716d74c5f9a46c63d93de96e9e7e60899f40363bd9fe6823 SHA512 73ca51e54f4273dc72c0c891643bd842d2f69b20a7cecf409e9eb790bd82cb0c9b61279555fe9f1930f914218c3055470a9d97e1f94e45d7f148a3100a426579 WHIRLPOOL 1e28cded49c92f29908ac6ba5bbbc4e5579cc373ae3b13a009cc503bfa0b0305cf439fdb722e5ebab2c971163163f50f808baf1bbce76cb4a7c0b49de70fbc96
-DIST perl-5.12.4.tar.bz2 12350353 SHA256 c920fa01a34b7752e8cbbc99c6921b908df60611d84a29c4377e4a798604767e SHA512 3dc0250496a2fd6adc639a63d777079d6fa5ba4a1d1c730350fd51752be2c7459ab65d622e99b853a3eea7ccecaf1f5f0b5a0f013efcb6554d6952f47aebf8d0 WHIRLPOOL 40677a8b690a6253609fe1b88bc95d9f8018d167ca4ab6753cba60cc5f5078a4953585a6face4f7e94222cacaca0348093cad6201e1e8c00c4f5a94cce065e49
DIST perl-5.16.3-1.tar.bz2 16842 SHA256 e88c413f6491aaa76cfb730af5873d710906df84d486019ad34b8c976ed9279e SHA512 337fbe5b3f447d2bb7f1edb18df973efbf99582448bcc6d3099ec6a91a43071cbbde3419a642e69602d6526f0d2c83d1ce8c7315e51362937c76bf3dc93f3f84 WHIRLPOOL c5be2872341e2bffe4f83b3f77314ed60b078f0977b11aa89d24a25fffa5ad9a761945d6518872c92a156065b58a3c456b71f98a8939a9cfd748e3a2d98a2264
DIST perl-5.16.3.tar.bz2 13724906 SHA256 bb7bc735e6813b177dcfccd480defcde7eddefa173b5967eac11babd1bfa98e8 SHA512 c30cda0af9463942e40b5d70a95e69b0640bf0b79d9d9dfa1a61d9d8b9ee05f553fd240be4c8b3c60a1def66c80453e49e865c27d3dd0b686f5c004e1ff58d92 WHIRLPOOL 241141d9a04095abbc08f29853cc2a348b04550c7e9330c65a1aa111620b61166d2516a619a3afbf8b7bae4208bae7114bfff153c9303c00158a0153c3388526
DIST perl-5.18.2-patches-2.tar.bz2 17153 SHA256 2d203611d9df9d63ed972a37db4927e5d04e80f1abd9724519ac9fc6600d7dbb SHA512 9efacaa44447dc605e69dd68886b41a263726158e98cdb9293678a77311eb197fbc86591db6209ad4614e8a8491758fa24f10c189e5a75dc8ec8c9a1335cafbc WHIRLPOOL 4d69c24e773b51a62e4a223a6846698b207a4ee71f16e58692634a750f25372e602c6902d3ec9859ec21fbf32acdef12817eb1ff285cdba37c404636ced16332
diff --git a/dev-lang/perl/perl-5.12.4-r1.ebuild b/dev-lang/perl/perl-5.12.4-r1.ebuild
deleted file mode 100644
index 2d1245ffc257..000000000000
--- a/dev-lang/perl/perl-5.12.4-r1.ebuild
+++ /dev/null
@@ -1,634 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.12.4-r1.ebuild,v 1.8 2012/01/02 22:52:21 zmedico Exp $
-
-EAPI=4
-
-inherit eutils alternatives flag-o-matic toolchain-funcs multilib
-
-PATCH_VER=1
-
-PERL_OLDVERSEN="5.12.3 5.12.2 5.12.1 5.12.0"
-
-SHORT_PV="${PV%.*}"
-MY_P="perl-${PV/_rc/-RC}"
-MY_PV="${PV%_rc*}"
-
-DESCRIPTION="Larry Wall's Practical Extraction and Report Language"
-
-SRC_URI="
- mirror://cpan/src/${MY_P}.tar.bz2
- mirror://cpan/authors/id/L/LB/LBROCARD/${MY_P}.tar.bz2
- mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2
- http://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${PN}/${MY_P}-${PATCH_VER}.tar.bz2"
-# mirror://cpan/src/${MY_P}.tar.bz2
-# mirror://gentoo/${MY_P}-${PATCH_VER}.tar.bz2
-HOMEPAGE="http://www.perl.org/"
-
-LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="berkdb build debug doc gdbm ithreads"
-
-COMMON_DEPEND="berkdb? ( sys-libs/db )
- gdbm? ( >=sys-libs/gdbm-1.8.3 )
- >=sys-devel/libperl-5.10.1
- !!=app-admin/perl-cleaner-2.5"
-
-S="${WORKDIR}/${MY_P}"
-
-dual_scripts() {
- src_remove_dual_scripts perl-core/Archive-Tar 1.54 ptar ptardiff
- src_remove_dual_scripts perl-core/Digest-SHA 5.47 shasum
- src_remove_dual_scripts perl-core/CPAN 1.945.600 cpan
- src_remove_dual_scripts perl-core/CPANPLUS 0.900.0 cpanp cpan2dist cpanp-run-perl
- src_remove_dual_scripts perl-core/Encode 2.39 enc2xs piconv
- src_remove_dual_scripts perl-core/ExtUtils-MakeMaker 6.56 instmodsh
- src_remove_dual_scripts perl-core/ExtUtils-ParseXS 2.210.0 xsubpp
- src_remove_dual_scripts perl-core/Module-Build 0.3603 config_data
- src_remove_dual_scripts perl-core/Module-CoreList 2.500.0 corelist
- src_remove_dual_scripts perl-core/PodParser 1.370.0 pod2usage podchecker podselect
- src_remove_dual_scripts perl-core/Test-Harness 3.17 prove
- src_remove_dual_scripts perl-core/podlators 2.3.1 pod2man pod2text
-}
-
-pkg_setup() {
- case ${CHOST} in
- *-freebsd*) osname="freebsd" ;;
- *-dragonfly*) osname="dragonfly" ;;
- *-netbsd*) osname="netbsd" ;;
- *-openbsd*) osname="openbsd" ;;
- *-darwin*) osname="darwin" ;;
- *) osname="linux" ;;
- esac
-
- if use ithreads ; then
- mythreading="-multi"
- myarch="${CHOST%%-*}-${osname}-thread"
- else
- myarch="${CHOST%%-*}-${osname}"
- fi
- if use debug ; then
- myarch="${myarch}-debug"
- fi
-
- LIBPERL="libperl$(get_libname ${MY_PV} )"
- PRIV_LIB="/usr/$(get_libdir)/perl5/${MY_PV}"
- ARCH_LIB="/usr/$(get_libdir)/perl5/${MY_PV}/${myarch}${mythreading}"
- SITE_LIB="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}"
- SITE_ARCH="/usr/$(get_libdir)/perl5/site_perl/${MY_PV}/${myarch}${mythreading}"
- VENDOR_LIB="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}"
- VENDOR_ARCH="/usr/$(get_libdir)/perl5/vendor_perl/${MY_PV}/${myarch}${mythreading}"
-
- if use ithreads ; then
- echo ""
- ewarn "THREADS WARNING:"
- ewarn "PLEASE NOTE: You are compiling ${MY_P} with"
- ewarn "interpreter-level threading enabled."
- ewarn "Threading is not supported by all applications "
- ewarn "that compile against perl. You use threading at "
- ewarn "your own discretion. "
- fi
- if has_version " "${S}/cpan/Compress-Raw-Zlib/config.in"
- BUILD_ZLIB = False
- INCLUDE = /usr/include
- LIB = /usr/$(get_libdir)
-
- OLD_ZLIB = False
- GZIP_OS_CODE = AUTO_DETECT
- EOF
-
- # allow either gdbm to provide ndbm (in ) or db1
-
- myndbm='U'
- mygdbm='U'
- mydb='U'
-
- if use gdbm ; then
- mygdbm='D'
- myndbm='D'
- fi
- if use berkdb ; then
- mydb='D'
- has_version '=sys-libs/db-1*' && myndbm='D'
- fi
-
- myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db"
-
- if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then
- ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
- myconf -Ui_db -Ui_ndbm
- fi
-
- use ithreads && myconf -Dusethreads
-
- if use debug ; then
- append-cflags "-g"
- myconf -DDEBUGGING
- elif [[ ${CFLAGS} == *-g* ]] ; then
- myconf -DDEBUGGING=-g
- else
- myconf -DDEBUGGING=none
- fi
-
- if [[ -n ${PERL_OLDVERSEN} ]] ; then
- local inclist=$(for v in ${PERL_OLDVERSEN}; do echo -n "${v}/${myarch}${mythreading} ${v} "; done )
- myconf -Dinc_version_list="$inclist"
- fi
-
- [[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a"
-
- if [[ $(get_libdir) != "lib" ]] ; then
- # We need to use " and not ', as the written config.sh use ' ...
- myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)"
- fi
-
- sh Configure \
- -des \
- -Duseshrplib \
- -Darchname="${myarch}" \
- -Dcc="$(tc-getCC)" \
- -Doptimize="${CFLAGS}" \
- -Dldflags="${LDFLAGS}" \
- -Dprefix='/usr' \
- -Dsiteprefix='/usr' \
- -Dvendorprefix='/usr' \
- -Dscriptdir='/usr/bin' \
- -Dprivlib="${PRIV_LIB}" \
- -Darchlib="${ARCH_LIB}" \
- -Dsitelib="${SITE_LIB}" \
- -Dsitearch="${SITE_ARCH}" \
- -Dvendorlib="${VENDOR_LIB}" \
- -Dvendorarch="${VENDOR_ARCH}" \
- -Dman1dir=/usr/share/man/man1 \
- -Dman3dir=/usr/share/man/man3 \
- -Dsiteman1dir=/usr/share/man/man1 \
- -Dsiteman3dir=/usr/share/man/man3 \
- -Dvendorman1dir=/usr/share/man/man1 \
- -Dvendorman3dir=/usr/share/man/man3 \
- -Dman1ext='1' \
- -Dman3ext='3pm' \
- -Dlibperl="${LIBPERL}" \
- -Dlocincpth=' ' \
- -Duselargefiles \
- -Dd_semctl_semun \
- -Dcf_by='Gentoo' \
- -Dmyhostname='localhost' \
- -Dperladmin='root@localhost' \
- -Dinstallusrbinperl='n' \
- -Ud_csh \
- -Uusenm \
- "${myconf[@]}" || die "Unable to configure"
-}
-
-src_compile() {
- # bug 331113
- emake -j1 || die "emake failed"
-}
-
-src_test() {
- if [[ ${EUID} == 0 ]] ; then
- ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..."
- return 0
- fi
- use elibc_uclibc && export MAKEOPTS+=" -j1"
- TEST_JOBS=$(echo -j1 ${MAKEOPTS} | sed -r 's/.*(-j[[:space:]]*|--jobs=)([[:digit:]]+).*/\2/' ) \
- make test_harness || die "test failed"
-}
-
-src_install() {
- local i
- local coredir="${ARCH_LIB}/CORE"
-
-# # Fix for "stupid" modules and programs
-# dodir ${SITE_ARCH} ${SITE_LIB}
-# keepdir "${VENDOR_ARCH}" #338802 for enc2xs
-
- local installtarget=install
- if use build ; then
- installtarget=install.perl
- fi
- make DESTDIR="${D}" ${installtarget} || die "Unable to make ${installtarget}"
-
- rm -f "${D}"/usr/bin/perl
- ln -s perl${MY_PV} "${D}"/usr/bin/perl
-
- dolib.so "${D}"/${coredir}/${LIBPERL} || die
- dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die
- dosym ${LIBPERL} /usr/$(get_libdir)/libperl$(get_libname) || die
- rm -f "${D}"/${coredir}/${LIBPERL}
- dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/${LIBPERL}
- dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname ${SHORT_PV})
- dosym ../../../../../$(get_libdir)/${LIBPERL} ${coredir}/libperl$(get_libname)
-
- rm -rf "${D}"/usr/share/man/man3 || die "Unable to remove module man pages"
-
-# # A poor fix for the miniperl issues
-# dosed 's:./miniperl:/usr/bin/perl:' /usr/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
-# fperms 0444 /usr/$(get_libdir)/perl5/${MY_PV}/ExtUtils/xsubpp
-# dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
-# fperms 0755 /usr/bin/xsubpp
-
- # This removes ${D} from Config.pm
- for i in $(find "${D}" -iname "Config.pm" ) ; do
- einfo "Removing ${D} from ${i}..."
- sed -i -e "s:${D}::" "${i}" || die "Sed failed"
- done
-
- find "${D}" -type f -name .packlist -delete || die
-
- # Note: find out from psm why we would need/want this.
- # ( use berkdb && has_version '=sys-libs/db-1*' ) ||
- # find "${D}" -name "*NDBM*" | xargs rm -f
-
- dodoc Changes* README AUTHORS || die
-
- if use doc ; then
- # HTML Documentation
- # We expect errors, warnings, and such with the following.
-
- dodir /usr/share/doc/${PF}/html
- LD_LIBRARY_PATH=. ./perl installhtml \
- --podroot='.' \
- --podpath='lib:ext:pod:vms' \
- --recurse \
- --htmldir="${D}/usr/share/doc/${PF}/html" \
- --libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
- fi
-
- if use build ; then
- src_remove_extra_files
- fi
-
- dual_scripts
-}
-
-pkg_postinst() {
- dual_scripts
-
- if [[ "${ROOT}" = "/" ]] ; then
- local INC DIR file
- INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${MY_PV}'|etc|local|perl$/; print "$line\n" }')
- einfo "Removing old .ph files"
- for DIR in ${INC} ; do
- if [[ -d "${DIR}" ]] ; then
- for file in $(find "${DIR}" -name "*.ph" -type f ) ; do
- rm -f "${file}"
- einfo "<< ${file}"
- done
- fi
- done
- # Silently remove the now empty dirs
- for DIR in ${INC} ; do
- if [[ -d "${DIR}" ]] ; then
- find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
- fi
- done
- if ! use build ; then
- ebegin "Generating ConfigLocal.pm (ignore any error)"
- enc2xs -C
- fi
-
- einfo "Converting C header files to the corresponding Perl format (ignore any error)"
- pushd /usr/include >/dev/null
- h2ph -Q -a -d ${ARCH_LIB} \
- asm/termios.h syscall.h syslimits.h syslog.h sys/ioctl.h \
- sys/socket.h sys/time.h wait.h sysexits.h
- popd >/dev/null
-
-# This has been moved into a function because rumor has it that a future release
-# of portage will allow us to check what version was just removed - which means
-# we will be able to invoke this only as needed :)
- # Tried doing this via -z, but $INC is too big...
- #if [[ "${INC}x" != "x" ]]; then
- # cleaner_msg
- #fi
- fi
-}
-
-pkg_postrm(){
- dual_scripts
-
-# if [[ -e ${ARCH_LIB}/Encode/ConfigLocal.pm ]] ; then
-# ebegin "Removing ConfigLocal.pm"
-# rm "${ARCH_LIB}/Encode/ConfigLocal.pm"
-# fi
-}
-
-cleaner_msg() {
- eerror "You have had multiple versions of perl. It is recommended"
- eerror "that you run perl-cleaner now. perl-cleaner will"
- eerror "assist with this transition. This script is capable"
- eerror "of cleaning out old .ph files, rebuilding modules for "
- eerror "your new version of perl, as well as re-emerging"
- eerror "applications that compiled against your old libperl$(get_libname)"
- eerror
- eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
- eerror "Part of the rebuilding of applications compiled against "
- eerror "your old libperl involves temporarily unmerging"
- eerror "them - interruptions could leave you with unmerged"
- eerror "packages before they can be remerged."
- eerror ""
- eerror "If you have run perl-cleaner and a package still gives"
- eerror "you trouble, and re-emerging it fails to correct"
- eerror "the problem, please check http://bugs.gentoo.org/"
- eerror "for more information or to report a bug."
- eerror ""
-}
-
-src_remove_dual_scripts() {
-
- local i pkg ver ff
- pkg="$1"
- ver="$2"
- shift 2
- if has "${EBUILD_PHASE:-none}" "postinst" "postrm" ;then
- for i in "$@" ; do
- alternatives_auto_makesym "/usr/bin/${i}" "/usr/bin/${i}-[0-9]*"
- if [[ ${i} != cpanp-run-perl ]] ; then
- ff=`echo ${ROOT}/usr/share/man/man1/${i}-${ver}-${P}.1*`
- ff=${ff##*.1}
- alternatives_auto_makesym "/usr/share/man/man1/${i}.1${ff}" "/usr/share/man/man1/${i}-[0-9]*"
- fi
- done
- elif has "${EBUILD_PHASE:-none}" "setup" ; then
- for i in "$@" ; do
- if [[ -f ${ROOT}/usr/bin/${i} && ! -h ${ROOT}/usr/bin/${i} ]] ; then
- has_version ${pkg} && ewarn "You must reinstall $pkg !"
- break
- fi
- done
- else
- for i in "$@" ; do
- if ! [[ -f "${D}"/usr/bin/${i} ]] ; then
- use build || ewarn "/usr/bin/${i} does not exist!"
- continue
- fi
- mv "${D}"/usr/bin/${i}{,-${ver}-${P}} || die
- if [[ -f ${D}/usr/share/man/man1/${i}.1 ]] ; then
- mv "${D}"/usr/share/man/man1/${i}{.1,-${ver}-${P}.1} || die
- else
- echo "/usr/share/man/man1/${i}.1 does not exist!"
- fi
- done
- fi
-}
-
-src_remove_extra_files() {
- local prefix="./usr" # ./ is important
- local bindir="${prefix}/bin"
- local libdir="${prefix}/$(get_libdir)"
-
- # I made this list from the Mandr*, Debian and ex-Connectiva perl-base list
- # Then, I added several files to get GNU autotools running
- # FIXME: should this be in a separated file to be sourced?
- local MINIMAL_PERL_INSTALL="
- ${bindir}/h2ph
- ${bindir}/perl
- ${bindir}/perl${MY_PV}
- ${bindir}/pod2man
- ${libdir}/${LIBPERL}
- ${libdir}/libperl$(get_libname)
- ${libdir}/libperl$(get_libname ${SHORT_PV})
- .${PRIV_LIB}/AutoLoader.pm
- .${PRIV_LIB}/B/Deparse.pm
- .${PRIV_LIB}/Carp.pm
- .${PRIV_LIB}/Carp/Heavy.pm
- .${PRIV_LIB}/Class/Struct.pm
- .${PRIV_LIB}/DirHandle.pm
- .${PRIV_LIB}/Exporter.pm
- .${PRIV_LIB}/Exporter/Heavy.pm
- .${PRIV_LIB}/ExtUtils/Command.pm
- .${PRIV_LIB}/ExtUtils/Command/MM.pm
- .${PRIV_LIB}/ExtUtils/Constant.pm
- .${PRIV_LIB}/ExtUtils/Constant/Base.pm
- .${PRIV_LIB}/ExtUtils/Constant/Utils.pm
- .${PRIV_LIB}/ExtUtils/Constant/XS.pm
- .${PRIV_LIB}/ExtUtils/Embed.pm
- .${PRIV_LIB}/ExtUtils/Install.pm
- .${PRIV_LIB}/ExtUtils/Installed.pm
- .${PRIV_LIB}/ExtUtils/Liblist.pm
- .${PRIV_LIB}/ExtUtils/Liblist/Kid.pm
- .${PRIV_LIB}/ExtUtils/MM.pm
- .${PRIV_LIB}/ExtUtils/MM_Any.pm
- .${PRIV_LIB}/ExtUtils/MM_MacOS.pm
- .${PRIV_LIB}/ExtUtils/MM_Unix.pm
- .${PRIV_LIB}/ExtUtils/MY.pm
- .${PRIV_LIB}/ExtUtils/MakeMaker.pm
- .${PRIV_LIB}/ExtUtils/Manifest.pm
- .${PRIV_LIB}/ExtUtils/Miniperl.pm
- .${PRIV_LIB}/ExtUtils/Mkbootstrap.pm
- .${PRIV_LIB}/ExtUtils/Mksymlists.pm
- .${PRIV_LIB}/ExtUtils/Packlist.pm
- .${PRIV_LIB}/ExtUtils/testlib.pm
- .${PRIV_LIB}/File/Basename.pm
- .${PRIV_LIB}/File/Compare.pm
- .${PRIV_LIB}/File/Copy.pm
- .${PRIV_LIB}/File/Find.pm
- .${PRIV_LIB}/File/Path.pm
- .${PRIV_LIB}/File/stat.pm
- .${PRIV_LIB}/FileHandle.pm
- .${PRIV_LIB}/Getopt/Long.pm
- .${PRIV_LIB}/Getopt/Std.pm
- .${PRIV_LIB}/IPC/Open2.pm
- .${PRIV_LIB}/IPC/Open3.pm
- .${PRIV_LIB}/PerlIO.pm
- .${PRIV_LIB}/Pod/InputObjects.pm
- .${PRIV_LIB}/Pod/Man.pm
- .${PRIV_LIB}/Pod/ParseLink.pm
- .${PRIV_LIB}/Pod/Parser.pm
- .${PRIV_LIB}/Pod/Select.pm
- .${PRIV_LIB}/Pod/Text.pm
- .${PRIV_LIB}/Pod/Usage.pm
- .${PRIV_LIB}/SelectSaver.pm
- .${PRIV_LIB}/Symbol.pm
- .${PRIV_LIB}/Text/ParseWords.pm
- .${PRIV_LIB}/Text/Tabs.pm
- .${PRIV_LIB}/Text/Wrap.pm
- .${PRIV_LIB}/Tie/Hash.pm
- .${PRIV_LIB}/Time/Local.pm
- .${PRIV_LIB}/XSLoader.pm
- .${PRIV_LIB}/autouse.pm
- .${PRIV_LIB}/base.pm
- .${PRIV_LIB}/bigint.pm
- .${PRIV_LIB}/bignum.pm
- .${PRIV_LIB}/bigrat.pm
- .${PRIV_LIB}/blib.pm
- .${PRIV_LIB}/bytes.pm
- .${PRIV_LIB}/bytes_heavy.pl
- .${PRIV_LIB}/charnames.pm
- .${PRIV_LIB}/constant.pm
- .${PRIV_LIB}/diagnostics.pm
- .${PRIV_LIB}/fields.pm
- .${PRIV_LIB}/filetest.pm
- .${PRIV_LIB}/if.pm
- .${PRIV_LIB}/integer.pm
- .${PRIV_LIB}/less.pm
- .${PRIV_LIB}/locale.pm
- .${PRIV_LIB}/open.pm
- .${PRIV_LIB}/overload.pm
- .${PRIV_LIB}/sigtrap.pm
- .${PRIV_LIB}/sort.pm
- .${PRIV_LIB}/stat.pl
- .${PRIV_LIB}/strict.pm
- .${PRIV_LIB}/subs.pm
- .${PRIV_LIB}/unicore/To/Fold.pl
- .${PRIV_LIB}/unicore/To/Lower.pl
- .${PRIV_LIB}/unicore/To/Upper.pl
- .${PRIV_LIB}/utf8.pm
- .${PRIV_LIB}/utf8_heavy.pl
- .${PRIV_LIB}/vars.pm
- .${PRIV_LIB}/vmsish.pm
- .${PRIV_LIB}/warnings
- .${PRIV_LIB}/warnings.pm
- .${PRIV_LIB}/warnings/register.pm
- .${ARCH_LIB}/B.pm
- .${ARCH_LIB}/CORE/libperl$(get_libname)
- .${ARCH_LIB}/Config.pm
- .${ARCH_LIB}/Config_heavy.pl
- .${ARCH_LIB}/Cwd.pm
- .${ARCH_LIB}/Data/Dumper.pm
- .${ARCH_LIB}/DynaLoader.pm
- .${ARCH_LIB}/Errno.pm
- .${ARCH_LIB}/Fcntl.pm
- .${ARCH_LIB}/File/Glob.pm
- .${ARCH_LIB}/File/Spec.pm
- .${ARCH_LIB}/File/Spec/Unix.pm
- .${ARCH_LIB}/IO.pm
- .${ARCH_LIB}/IO/File.pm
- .${ARCH_LIB}/IO/Handle.pm
- .${ARCH_LIB}/IO/Pipe.pm
- .${ARCH_LIB}/IO/Seekable.pm
- .${ARCH_LIB}/IO/Select.pm
- .${ARCH_LIB}/IO/Socket.pm
- .${ARCH_LIB}/IO/Socket/INET.pm
- .${ARCH_LIB}/IO/Socket/UNIX.pm
- .${ARCH_LIB}/List/Util.pm
- .${ARCH_LIB}/NDBM_File.pm
- .${ARCH_LIB}/POSIX.pm
- .${ARCH_LIB}/Scalar/Util.pm
- .${ARCH_LIB}/Socket.pm
- .${ARCH_LIB}/Storable.pm
- .${ARCH_LIB}/attributes.pm
- .${ARCH_LIB}/auto/Cwd/Cwd$(get_libname)
- .${ARCH_LIB}/auto/Data/Dumper/Dumper$(get_libname)
- .${ARCH_LIB}/auto/DynaLoader/dl_findfile.al
- .${ARCH_LIB}/auto/Fcntl/Fcntl$(get_libname)
- .${ARCH_LIB}/auto/File/Glob/Glob$(get_libname)
- .${ARCH_LIB}/auto/IO/IO$(get_libname)
- .${ARCH_LIB}/auto/POSIX/POSIX$(get_libname)
- .${ARCH_LIB}/auto/POSIX/autosplit.ix
- .${ARCH_LIB}/auto/POSIX/fstat.al
- .${ARCH_LIB}/auto/POSIX/load_imports.al
- .${ARCH_LIB}/auto/POSIX/stat.al
- .${ARCH_LIB}/auto/POSIX/tmpfile.al
- .${ARCH_LIB}/auto/Socket/Socket$(get_libname)
- .${ARCH_LIB}/auto/Storable/Storable$(get_libname)
- .${ARCH_LIB}/auto/Storable/_retrieve.al
- .${ARCH_LIB}/auto/Storable/_store.al
- .${ARCH_LIB}/auto/Storable/autosplit.ix
- .${ARCH_LIB}/auto/Storable/retrieve.al
- .${ARCH_LIB}/auto/Storable/store.al
- .${ARCH_LIB}/auto/re/re$(get_libname)
- .${ARCH_LIB}/encoding.pm
- .${ARCH_LIB}/lib.pm
- .${ARCH_LIB}/ops.pm
- .${ARCH_LIB}/re.pm
- .${ARCH_LIB}/threads.pm
-"
-
- pushd "${D}" > /dev/null
- # Remove cruft
- einfo "Removing files that are not in the minimal install"
- echo "${MINIMAL_PERL_INSTALL}"
- for f in $(find . -type f ) ; do
- has "${f}" ${MINIMAL_PERL_INSTALL} || rm -f "${f}"
- done
- # Remove empty directories
- find . -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null
- #for f in ${MINIMAL_PERL_INSTALL} ; do
- # [[ -e $f ]] || ewarn "$f unused in MINIMAL_PERL_INSTALL"
- #done
- popd > /dev/null
-}
diff --git a/dev-lang/php/php-5.4.30.ebuild b/dev-lang/php/php-5.4.30.ebuild
index 90aebf0aa800..8be47b1707af 100644
--- a/dev-lang/php/php-5.4.30.ebuild
+++ b/dev-lang/php/php-5.4.30.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.30.ebuild,v 1.4 2014/06/29 18:55:07 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.30.ebuild,v 1.10 2014/07/05 11:29:09 ago Exp $
EAPI=5
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
function php_get_uri ()
{
diff --git a/dev-lang/php/php-5.5.14.ebuild b/dev-lang/php/php-5.5.14.ebuild
index d38e46921632..e783cdf7315c 100644
--- a/dev-lang/php/php-5.5.14.ebuild
+++ b/dev-lang/php/php-5.5.14.ebuild
@@ -1,12 +1,12 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.14.ebuild,v 1.4 2014/06/29 18:55:39 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.5.14.ebuild,v 1.10 2014/07/05 11:29:09 ago Exp $
EAPI=5
inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
function php_get_uri ()
{
diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest
index 1cd352264027..03e2e1de9eb6 100644
--- a/dev-libs/libburn/Manifest
+++ b/dev-libs/libburn/Manifest
@@ -1,2 +1,3 @@
DIST libburn-1.3.4.tar.gz 953939 SHA256 60244606ebf7d150a5498863e7b8fc695d80b39a4404741e8d601af3312da919 SHA512 070ef744831156db2c603395205ce51bc5db3517a88ec4485caea1c4165a3393d8cc019e06aa323e2cdd8624d2fbc874d30fda39e558a53fe4d35c05d98e0a62 WHIRLPOOL ea75fa703c0698f26752469a1836872a728855ebfbdb8d7a416e9f26aea719d81f165a7c719e91b8229f1a26521656c9b336021a352e29fbce5e0e60049dd18b
DIST libburn-1.3.6.tar.gz 964875 SHA256 cdbe9ba1d0bd3ad80864eb1b8c1d7c368321fa52d65b92cdf15241586fb72350 SHA512 f09a13c3e66b3d6ce2340a42d401406e3c5e5d6d8b2ed114ed9bd5dbc63c28cf5c9149a4e95cd27a22e22cbcbb75ef274a75e6b45da1382b2de2411e04b63714 WHIRLPOOL e57cc4cbdcaf31ef78ffcd200b54856a6e2304a975cbf55ef344f661423219c558ff78ce256956b490b2edd9bd56369671bbb7d3589915c63d5c775147b2ca57
+DIST libburn-1.3.8.tar.gz 967404 SHA256 46266bdd4b37ca9700a44bbd8dbfbf3526423ede25751fd2f0211b2b5ce29283 SHA512 4f279319b49bc5f5d42751fcab16bfe949e14e6e1018f9138bcc9f8e10a298ecf9795780d5f8807c5c2bf1cc0332f931b709f1fb5809f30abb8054297370f3c6 WHIRLPOOL a814ab1c88b70b03788d490c1d6f9305878613d529fdd58df65a13bc683cf2e6c4e877192f85ffca07474a866115a34ef3932e838097e88db08d73554ed2ad3c
diff --git a/dev-libs/libburn/libburn-1.3.8.ebuild b/dev-libs/libburn/libburn-1.3.8.ebuild
new file mode 100644
index 000000000000..4fdc0acb9f17
--- /dev/null
+++ b/dev-libs/libburn/libburn-1.3.8.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libburn/libburn-1.3.8.ebuild,v 1.1 2014/07/05 17:42:59 billie Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Libburn is an open-source library for reading, mastering and writing optical discs."
+HOMEPAGE="http://libburnia-project.org"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="cdio debug static-libs track-src-odirect"
+
+RDEPEND="cdio? ( >=dev-libs/libcdio-0.83 )"
+DEPEND="$RDEPEND
+ virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable track-src-odirect) \
+ --enable-pkg-check-modules \
+ $(use_enable cdio libcdio) \
+ --disable-ldconfig-at-install \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+
+ dodoc CONTRIBUTORS doc/{comments,*.txt}
+
+ docinto cdrskin
+ dodoc cdrskin/{*.txt,README}
+ docinto cdrskin/html
+ dohtml cdrskin/cdrskin_eng.html
+
+ prune_libtool_files --all
+}
diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest
index 1f06d9bfc83d..a309d627528f 100644
--- a/dev-libs/libisoburn/Manifest
+++ b/dev-libs/libisoburn/Manifest
@@ -1,2 +1,3 @@
DIST libisoburn-1.3.4.tar.gz 1401299 SHA256 93da0f9361b2075da9a6151a919df53f6f0c939abecdebc29efe5da0be559046 SHA512 24866d2d116a2a5d352262f9c84c635289a89dc263629136d96c63479f2be29333186bde4a42c59d0f9cabd06d2c872c54beb61381efe0f4d13950a44950115d WHIRLPOOL 770279ae9edcbd4cb2979ef0295abeddd7d76ed546d0080c69e53ceb74efaa48087183b61b720c743533f51e7d5e66bc0901d59c03ef09a84314dab8edca18e9
DIST libisoburn-1.3.6.tar.gz 1410805 SHA256 74836f0ffc54c7bfc4766e09f7691ebed40e4a3242ed65ff03a45d26b6227a96 SHA512 8656be972392141c59a1417aec5bacf0dc0e896c9b7bc9e82ed99bbbbea09e153cf75ae206ace7bc4279cd3576c3a4ff2f5413c64c3aebc477df859d77e4fc23 WHIRLPOOL 913f78f960aa9bfdc95bc7dbefd2b663bd65c4fb07e1ce926d4a1d507da50cd5a2645769889be763efca7ff07d71404465e040b2231c3bca7791b411f3d6d2d0
+DIST libisoburn-1.3.8.tar.gz 1429974 SHA256 b75c9a7f17faab5280ddc34ea6610c4e8bcf630762ee386d10bc52c4b50f6806 SHA512 369299e491a379e048038d8a46040feb628b6b9dfb6d6ffac01808b6814e6ca936bb7e4fe75f904ce755e9957011403a5d38bff9f37901086d284f5c1014deb7 WHIRLPOOL 3dc40ab34838bb3d79f0cbb08b16480106de16b2c8401859c52fa139eb8a555f4182402dacf51ee481ec8f490a33a2e09cfc4ec3ba63db9fc876854c80f4dd12
diff --git a/dev-libs/libisoburn/libisoburn-1.3.8.ebuild b/dev-libs/libisoburn/libisoburn-1.3.8.ebuild
new file mode 100644
index 000000000000..56090de57eb0
--- /dev/null
+++ b/dev-libs/libisoburn/libisoburn-1.3.8.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisoburn/libisoburn-1.3.8.ebuild,v 1.1 2014/07/05 17:47:52 billie Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Enables creation and expansion of ISO-9660 filesystems on all CD/DVD media supported by libburn"
+HOMEPAGE="http://libburnia-project.org/"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="acl cdio debug external-filters external-filters-setuid frontend-optional
+ launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib"
+
+REQUIRED_USE="frontend-optional? ( || ( launch-frontend launch-frontend-setuid ) )"
+
+RDEPEND=">=dev-libs/libburn-1.3.8
+ >=dev-libs/libisofs-1.3.8
+ readline? ( sys-libs/readline )
+ !readline? ( libedit? ( dev-libs/libedit ) )
+ acl? ( virtual/acl )
+ xattr? ( sys-apps/attr )
+ zlib? ( sys-libs/zlib )
+ cdio? ( >=dev-libs/libcdio-0.83 )
+ launch-frontend? ( dev-lang/tcl:0 dev-lang/tk:0 )
+ launch-frontend-setuid? ( dev-lang/tcl:0 dev-lang/tk:0 )
+ frontend-optional? ( dev-tcltk/bwidget )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable readline libreadline) \
+ $(usex readline --disable-libedit $(use_enable libedit)) \
+ $(use_enable acl libacl) \
+ $(use_enable xattr) \
+ $(use_enable zlib) \
+ --disable-libjte \
+ $(use_enable cdio libcdio) \
+ $(use_enable external-filters) \
+ $(use_enable external-filters-setuid) \
+ $(use_enable launch-frontend) \
+ $(use_enable launch-frontend-setuid) \
+ --disable-ldconfig-at-install \
+ --enable-pkg-check-modules \
+ $(use_enable debug)
+}
+
+src_install() {
+ default
+
+ dodoc CONTRIBUTORS doc/{comments,*.wiki,startup_file.txt}
+
+ docinto frontend
+ dodoc frontend/README-tcltk
+ docinto xorriso
+ dodoc xorriso/{changelog.txt,README_gnu_xorriso}
+ docinto xorriso/html
+
+ prune_libtool_files --all
+}
diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest
index 7b9d8fdae550..badf6ad1c79e 100644
--- a/dev-libs/libisofs/Manifest
+++ b/dev-libs/libisofs/Manifest
@@ -1,2 +1,3 @@
DIST libisofs-1.3.4.tar.gz 770418 SHA256 fd1b23cc855b2c62384106dffa5ae9e779ed9bce1702b9687b2b64bb623c19f4 SHA512 44df0017e29ebc31a0c84eedf107ead2bb287a51a7986a0ccee4bbbbc8ac87d8609905d3a3fe2a5956392cb4dc527ab931900d422434530ed67c8b467d5f30be WHIRLPOOL 58982f89e9d3cc6c16a3e8aba17aa408e3b02cff7c6eda6a399620383f152b4b6969ccc93100facfbdfb11119bbb82d1838882e8457c02df6463e5142eab9015
DIST libisofs-1.3.6.tar.gz 780651 SHA256 9ffff0fa1827ac3c246783306fe98035ff8e4e251b5191984611a351f358350c SHA512 2e95f2da7ca9bb960f6dfbdf077717e306e95195aa0e71a4b3b633105da213cb58fb996478afb69c3c0ed09a316cfe4062227a40c1c41a9a828e01b4395c7cb0 WHIRLPOOL 27863beb1e352fee0f862719c8aa73241aff2428b560b8fca98f82e34949550fc91b887a9aa686ac4bab315211e533569df57590e059f8391bf7907632250aa6
+DIST libisofs-1.3.8.tar.gz 802154 SHA256 acd7bf42d5d1d5c277f4aad46e5b96229045a38a0fb7d43cfd7841ee3268fda5 SHA512 7e078a4070741d975234ac10ed6cd2a0366724e9fa440e7063c64f91a60c9454c6828e2b7737d6105f36067008495bfcba8327e56892ccb0962027dc78e251ce WHIRLPOOL 660f2cba77e8b83306fe4d40e34f0e94ecc18a8defd0375cadc84c0d964d6c868b2965329e51e3b5139c88e7cb20ee78f817004cb141e8be5528aa00a25d5647
diff --git a/dev-libs/libisofs/libisofs-1.3.8.ebuild b/dev-libs/libisofs/libisofs-1.3.8.ebuild
new file mode 100644
index 000000000000..948f90bacb18
--- /dev/null
+++ b/dev-libs/libisofs/libisofs-1.3.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libisofs/libisofs-1.3.8.ebuild,v 1.1 2014/07/05 17:46:22 billie Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="libisofs is an open-source library for reading, mastering and writing optical discs."
+HOMEPAGE="http://libburnia-project.org/"
+SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl debug static-libs verbose-debug xattr zlib"
+
+RDEPEND="acl? ( virtual/acl )
+ xattr? ( sys-apps/attr )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable debug) \
+ $(use_enable verbose-debug) \
+ $(use_enable acl libacl) \
+ $(use_enable xattr) \
+ $(use_enable zlib) \
+ --disable-libjte \
+ --disable-ldconfig-at-install
+}
+
+src_install() {
+ default
+
+ dodoc Roadmap doc/{*.txt,Tutorial}
+
+ prune_libtool_files --all
+}
diff --git a/dev-libs/liblouis/liblouis-2.5.3.ebuild b/dev-libs/liblouis/liblouis-2.5.3.ebuild
index c2252eb43b9a..8cec5120c6cd 100644
--- a/dev-libs/liblouis/liblouis-2.5.3.ebuild
+++ b/dev-libs/liblouis/liblouis-2.5.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblouis/liblouis-2.5.3.ebuild,v 1.3 2014/01/28 14:41:13 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblouis/liblouis-2.5.3.ebuild,v 1.4 2014/07/04 13:03:42 klausman Exp $
EAPI="5"
@@ -15,7 +15,7 @@ SRC_URI="http://liblouis.googlecode.com/files/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~x86"
IUSE="python"
RDEPEND="python? ( ${PYTHON_DEPS} )"
DEPEND="${RDEPEND}"
diff --git a/dev-libs/libmix/files/libmix-2.05-gentoo.patch b/dev-libs/libmix/files/libmix-2.05-gentoo.patch
deleted file mode 100644
index a013bd7cc6de..000000000000
--- a/dev-libs/libmix/files/libmix-2.05-gentoo.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-Fix install paths, respect user flags, build shared libs with -fPIC,
-make static libs optional, convert use "--with/without-net2" instead
-"--without-no-net2"
-
-http://bugs.gentoo.org/show_bug.cgi?id=268444
-
-Thanks to Doktor Notor
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1,16 +1,16 @@
--INSTALL_INCLUDES_IN = /usr/include
--INSTALL_LIBRARY_IN = /usr/lib
--INSTALL_MANPAGE_IN = /usr/local/man
--
--# Compiler to produce C/C++ libraries with (autodetected)
--GCC = @CCAUTO@
--GPP = @CXAUTO@
-+includedir = /usr/@includedir@
-+libdir = @libdir@
-+mandir = @mandir@
-+BUILD_STATIC = @BUILD_STATIC@
-
- RANLIB = @RANLIB@
- AR = @AR@
- INSTALL = @INSTALL@
-
- CFLAGS = @CFLAGS@
-+CXXFLAGS = @CXXFLAGS@
-+LDFLAGS = @LDFLAGS@
-+CCOPTS = @CCOPTS@
- CLIB = @CLIB@
-
- AESOBJ = aes/aes.o aes/cast-256.o aes/mars.o aes/saferp.o aes/twofish.o aes/rijndael.o aes/md5.o
-@@ -21,120 +19,80 @@
- NETOBJPP = net/net++.o net/net2++.o
- MISCOBJPP = misc/misc++.o misc/exclude++.o
-
--all: libmix.a libmix.so libmix++.a libmix++.so
-+OBJS_C = $(AESOBJ) $(NETOBJ) $(MISCOBJ)
-+OBJS_PP = $(AESOBJPP) $(NETOBJPP) $(MISCOBJPP)
-+
-+OBJS_C_A = $(OBJS_C:%.o=%.lo)
-+OBJS_PP_A = $(OBJS_PP:%.o=%.lo)
-+
-+TARGETS = libmix.so libmix++.so
-+ifdef BUILD_STATIC
-+TARGETS += libmix.a libmix++.a
-+endif
-+
-+all: $(TARGETS)
- @echo ""
- @echo Check the install location in the Makefile, and type 'make install'.
- @echo You may also want to run './libtest' to see all functions work reliably.
- @echo "Attention: libmix for C++ is now called libmix++[.so|.a]. The original libmix.[so|.a] name will be a plain C library."
- @echo ""
-
--libmix.so: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}
-- ${GCC} ${CFLAGS} -shared ${AESOBJ} ${NETOBJ} ${MISCOBJ} -o libmix.so ${CLIB}
-+libmix.so: mix/net.h $(OBJS_C)
-+ $(CC) $(CFLAGS) $(LDFLAGS) -shared $(OBJS_C) -o libmix.so -Wl,-soname,libmix.so.0 $(CLIB)
-
--libmix.a: mix/net.h ${AESOBJ} ${NETOBJ} ${MISCOBJ}
-- ${AR} -cr libmix.a ${AESOBJ} ${NETOBJ} ${MISCOBJ}
-+libmix.a: mix/net.h $(OBJS_C_A)
-+ ${AR} -cr libmix.a $(OBJS_C_A)
- ${RANLIB} libmix.a
-
--libmix++.so: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
-- ${GPP} ${CFLAGS} -shared ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} -o libmix++.so ${CLIB}
-+libmix++.so: mix/net.h $(OBJS_PP)
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJ_PP) -o libmix++.so -Wl,-soname,libmix++.so.0 $(CLIB)
-
--libmix++.a: mix/net.h ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
-- ${AR} -cr libmix++.a ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP}
-+libmix++.a: mix/net.h $(OBJS_PP_A)
-+ ${AR} -cr libmix++.a $(OBJS_PP_A)
- ${RANLIB} libmix++.a
-
- libtest: libtest.o
-- ${GPP} ${CFLAGS} -static -I. -L. libtest++.o -o libtest -lmix++ @LIBS@ ${CLIB}
-+ $(CXX) $(CXXFLAGS) $(CCOPTS) -static -I. -L. libtest++.o -o libtest -lmix++ ${CLIB}
-
- libtest.o:
-- ${GPP} ${CFLAGS} -c libtest.c -o libtest.o
-- ${GPP} ${CFLAGS} -c libtest.c -o libtest++.o
--
--aes/aes++.o:
-- ${GPP} ${CFLAGS} -c aes/aes.c -o aes/aes++.o
--
--aes/cast-256++.o:
-- ${GPP} ${CFLAGS} -c aes/cast-256.c -o aes/cast-256++.o
--
--aes/mars++.o:
-- ${GPP} ${CFLAGS} -c aes/mars.c -o aes/mars++.o
--
--aes/saferp++.o:
-- ${GPP} ${CFLAGS} -c aes/saferp.c -o aes/saferp++.o
--
--aes/twofish++.o:
-- ${GPP} ${CFLAGS} -c aes/twofish.c -o aes/twofish++.o
--
--aes/rijndael++.o:
-- ${GPP} ${CFLAGS} -c aes/rijndael.c -o aes/rijndael++.o
--
--aes/md5++.o:
-- ${GPP} ${CFLAGS} -c aes/md5.c -o aes/md5++.o
--
--net/net++.o:
-- ${GPP} ${CFLAGS} -c net/net.c -o net/net++.o
--
--net/net2++.o:
-- ${GPP} ${CFLAGS} -c net/net2.c -o net/net2++.o
--
--misc/misc++.o:
-- ${GPP} ${CFLAGS} -c misc/misc.c -o misc/misc++.o
--
--misc/exclude++.o:
-- ${GPP} ${CFLAGS} -c misc/exclude.c -o misc/exclude++.o
--
--aes/aes.o:
-- ${GCC} ${CFLAGS} -c aes/aes.c -o aes/aes.o
--
--aes/cast-256.o:
-- ${GCC} ${CFLAGS} -c aes/cast-256.c -o aes/cast-256.o
--
--aes/mars.o:
-- ${GCC} ${CFLAGS} -c aes/mars.c -o aes/mars.o
--
--aes/saferp.o:
-- ${GCC} ${CFLAGS} -c aes/saferp.c -o aes/saferp.o
--
--aes/twofish.o:
-- ${GCC} ${CFLAGS} -c aes/twofish.c -o aes/twofish.o
--
--aes/rijndael.o:
-- ${GCC} ${CFLAGS} -c aes/rijndael.c -o aes/rijndael.o
--
--aes/md5.o:
-- ${GCC} ${CFLAGS} -c aes/md5.c -o aes/md5.o
--
--net/net.o:
-- ${GCC} ${CFLAGS} -c net/net.c -o net/net.o
--
--net/net2.o:
-- ${GCC} ${CFLAGS} -c net/net2.c -o net/net2.o
-+ $(CC) $(CCOPTS) $(CFLAGS) -c libtest.c -o libtest.o
-+ $(CXX) $(CCOPTS) $(CXXFLAGS) -c libtest.c -o libtest++.o
-
--misc/misc.o:
-- ${GCC} ${CFLAGS} -c misc/misc.c -o misc/misc.o
-
--misc/exclude.o:
-- ${GCC} ${CFLAGS} -c misc/exclude.c -o misc/exclude.o
-+%++.o: %.c
-+ $(CXX) $(CCOPTS) $(CXXFLAGS) -fPIC -c $< -o $@
-
--install: mix/mix.h mix/net.h mix/aes.h mix/misc.h libmix.so libmix.a
-- ${INSTALL} -d ${INSTALL_INCLUDES_IN}/mix/
-- ${INSTALL} -d ${INSTALL_LIBRARY_IN}/
-- ${INSTALL} -d ${INSTALL_MANPAGE_IN}/man3/
-- ${INSTALL} -m 0644 libmix.3 ${INSTALL_MANPAGE_IN}/man3/libmix.3
-- ${INSTALL} -m 0644 mix/misc.h ${INSTALL_INCLUDES_IN}/mix/misc.h
-- ${INSTALL} -m 0644 mix/net.h ${INSTALL_INCLUDES_IN}/mix/net.h
-- ${INSTALL} -m 0644 mix/aes.h ${INSTALL_INCLUDES_IN}/mix/aes.h
-- ${INSTALL} -m 0644 mix/mix.h ${INSTALL_INCLUDES_IN}/mix/mix.h
-- ${INSTALL} -m 0644 mix/lmconfig.h ${INSTALL_INCLUDES_IN}/mix/lmconfig.h
-- ${INSTALL} -m 0755 libmix.so ${INSTALL_LIBRARY_IN}/libmix.so
-- ${INSTALL} -m 0755 libmix.a ${INSTALL_LIBRARY_IN}/libmix.a
-- ${INSTALL} -m 0755 libmix++.so ${INSTALL_LIBRARY_IN}/libmix++.so
-- ${INSTALL} -m 0755 libmix++.a ${INSTALL_LIBRARY_IN}/libmix++.a
-+%++.lo: %.c
-+ $(CXX) $(CCOPTS) $(CXXFLAGS) -c $< -o $@
-+
-+%.o: %.c
-+ $(CC) $(CCOPTS) $(CFLAGS) -fPIC -c $< -o $@
-+
-+%.lo: %.c
-+ $(CC) $(CCOPTS) $(CFLAGS) -c $< -o $@
-+
-+install: mix/mix.h mix/net.h mix/aes.h mix/misc.h $(TARGETS)
-+ ${INSTALL} -d $(DESTDIR)/$(includedir)/mix/
-+ ${INSTALL} -d $(DESTDIR)/$(libdir)/
-+ ${INSTALL} -d $(DESTDIR)/$(mandir)/man3/
-+ ${INSTALL} -m 0644 libmix.3 $(DESTDIR)/$(mandir)/man3/libmix.3
-+ ${INSTALL} -m 0644 mix/misc.h $(DESTDIR)/$(includedir)/mix/misc.h
-+ ${INSTALL} -m 0644 mix/net.h $(DESTDIR)/$(includedir)/mix/net.h
-+ ${INSTALL} -m 0644 mix/aes.h $(DESTDIR)/$(includedir)/mix/aes.h
-+ ${INSTALL} -m 0644 mix/mix.h $(DESTDIR)/$(includedir)/mix/mix.h
-+ ${INSTALL} -m 0644 mix/lmconfig.h $(DESTDIR)/$(includedir)/mix/lmconfig.h
-+ ${INSTALL} -m 0755 libmix.so $(DESTDIR)/$(libdir)/libmix.so
-+ ${INSTALL} -m 0755 libmix++.so $(DESTDIR)/$(libdir)/libmix++.so
-+ifdef BUILD_STATIC
-+ ${INSTALL} -m 0755 libmix.a $(DESTDIR)/$(libdir)/libmix.a
-+ ${INSTALL} -m 0755 libmix++.a $(DESTDIR)/$(libdir)/libmix++.a
-+endif
- @echo ""
- @echo "Installation complete."
- @echo ""
-
- uninstall:
-- rm -fr /usr/include/mix /usr/lib/libmix* /usr/local/man/man3/libmix.3
-+ rm -fr $(includedir)/mix $(libdir)/libmix* $(mandir)/man3/libmix.3
-
- cleanobj:
- rm -f ${AESOBJPP} ${NETOBJPP} ${MISCOBJPP} ${AESOBJ} ${NETOBJ} ${MISCOBJ} */core */*~ core *~ *.o libtest
---- a/configure.in
-+++ b/configure.in
-@@ -4,7 +4,6 @@
- AC_CONFIG_HEADER(mix/lmconfig.h)
-
- compileas="0"
--net2="1"
-
- dnl AC_ARG_WITH(libraries-as-c,
- dnl [ --with-libraries-as-c Generate LibMix binaries with GCC ],
-@@ -24,30 +23,33 @@
- dnl ]
- dnl )
-
--AC_ARG_WITH(no-net2,
-- [ --with-no-net2 Don't use net2 functions, don't require libnet/libpcap.],
-- [
-- if test "x$withval" != "$xno" ; then
-- net2="0"
-- fi
-- ]
--)
-+AC_ARG_WITH([net2],
-+ AS_HELP_STRING([--with-net2], [Use net2 functions from libnet/libpcap.]))
-+AS_IF([test "x$with_net2" = "xyes"], [
-+ AC_DEFINE(LM_USE_NET2)
-+ CLIB="-lnet-1.0 -lpcap"
-+])
-+
-+AC_ARG_ENABLE([static],
-+ AS_HELP_STRING([--enable-static], [Build static libs]))
-+AS_IF([test "x$enable_static" = "xyes"], [
-+ BUILD_STATIC=1
-+ AC_SUBST(BUILD_STATIC)
-+])
-
- AC_PROG_CC
- AC_MSG_CHECKING(accepted compiler flags)
- if test $ac_cv_prog_gcc = yes; then
-- CCOPTS='-I. -Wall -O3 -funroll-loops -ansi -D_LIBMIX_'
-+ CCOPTS='-I. -Wall -ansi -D_LIBMIX_'
- AC_MSG_RESULT(GNU CC/ANSI (good))
- else
- CCOPTS='-I. -D_LIBMIX_'
- AC_MSG_RESULT(crappy :P)
- fi
-- CFLAGS="$CCOPTS"
-
- AC_PROG_CXX
-
- CXAUTO="null"
--CLIB=""
-
- CCAUTO=$CC
- CXAUTO=$CXX
-@@ -60,10 +62,6 @@
- dnl CXAUTO=$CXX
- dnl fi
-
--if test $net2 = "1"; then
-- AC_DEFINE(LM_USE_NET2)
-- CLIB="-lnet -lpcap"
--fi
-
- if test $CXAUTO = "null"; then
- AC_MSG_ERROR( *** Please use either ./configure --with-libraries-as-c
-@@ -74,6 +72,11 @@
- AC_SUBST(CXAUTO)
- AC_SUBST(AR)
- AC_SUBST(CLIB)
-+AC_SUBST(LDFLAGS)
-+AC_SUBST(libdir)
-+AC_SUBST(mandir)
-+AC_SUBST(includedir)
-+AC_SUBST(CCOPTS)
- AC_CHECK_PROGS(AR, ar, @true)
- AC_PROG_RANLIB
- AC_PROG_INSTALL
diff --git a/dev-libs/libmix/files/libmix-2.05-gentoo2.patch b/dev-libs/libmix/files/libmix-2.05-gentoo2.patch
deleted file mode 100644
index 41efcc56eca2..000000000000
--- a/dev-libs/libmix/files/libmix-2.05-gentoo2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 434b8e5..a384b50 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -54,7 +54,7 @@ libmix++.a: mix/net.h $(OBJS_PP_A)
- ${RANLIB} libmix++.a
-
- libtest: libtest.o
-- $(CXX) $(CXXFLAGS) $(CCOPTS) -static -I. -L. libtest++.o -o libtest -lmix++ ${CLIB}
-+ $(CXX) $(CXXFLAGS) $(CCOPTS) -static -I. -L. libtest++.o -o libtest -lmix++ $(CLIB)
-
- libtest.o:
- $(CC) $(CCOPTS) $(CFLAGS) -c libtest.c -o libtest.o
-diff --git a/configure.in b/configure.in
-index 55fb7dd..e9bd924 100644
---- a/configure.in
-+++ b/configure.in
-@@ -28,7 +28,7 @@ AC_ARG_WITH([net2],
- AS_IF([test "x$with_net2" = "xyes"], [
- AC_DEFINE(LM_USE_NET2)
- CLIB="-lnet-1.0 -lpcap"
--])
-+], [CLIB=""])
-
- AC_ARG_ENABLE([static],
- AS_HELP_STRING([--enable-static], [Build static libs]))
diff --git a/dev-libs/libmix/libmix-2.05-r7.ebuild b/dev-libs/libmix/libmix-2.05-r7.ebuild
new file mode 100644
index 000000000000..a249884eb40d
--- /dev/null
+++ b/dev-libs/libmix/libmix-2.05-r7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libmix/libmix-2.05-r7.ebuild,v 1.1 2014/07/05 15:58:15 jer Exp $
+
+EAPI=5
+inherit autotools base multilib toolchain-funcs
+
+DESCRIPTION="Programs Crypto/Network/Multipurpose Library"
+HOMEPAGE="http://mixter.void.ru/"
+SRC_URI="http://mixter.void.ru/${P/.}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="static-libs"
+
+S=${WORKDIR}/${PN}-v${PV}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-pattern.patch
+ "${FILESDIR}"/${P}-gentoo-r1.patch
+ "${FILESDIR}"/${P}-libnet.patch
+)
+
+DOCS=( CHANGES )
+
+src_prepare() {
+ base_src_prepare
+
+ sed -i \
+ -e 's/expf/libmix_expf/g' \
+ -e 's/logf/libmix_logf/g' \
+ aes/saferp.c || die
+
+ eautoreconf
+}
+
+src_configure() {
+ tc-export CC CXX
+ econf \
+ $(use_enable static-libs static) \
+ --without-net2
+}
diff --git a/dev-libs/libpcre/libpcre-8.35.ebuild b/dev-libs/libpcre/libpcre-8.35.ebuild
index c7653749758a..5209f0043c06 100644
--- a/dev-libs/libpcre/libpcre-8.35.ebuild
+++ b/dev-libs/libpcre/libpcre-8.35.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.35.ebuild,v 1.5 2014/05/22 07:15:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.35.ebuild,v 1.6 2014/07/05 14:03:25 jer Exp $
EAPI="4"
@@ -19,7 +19,7 @@ fi
LICENSE="BSD"
SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
REQUIRED_USE="readline? ( !libedit )
libedit? ( !readline )"
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.3-r1.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.3-r1.ebuild
index 8c11fe0a4201..f353a71557cc 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.3-r1.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpthread-stubs/libpthread-stubs-0.3-r1.ebuild,v 1.11 2014/06/15 00:38:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpthread-stubs/libpthread-stubs-0.3-r1.ebuild,v 1.12 2014/07/04 14:13:27 haubi Exp $
EAPI=5
@@ -10,7 +10,7 @@ inherit xorg-2
DESCRIPTION="Pthread functions stubs for platforms missing them"
SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
RDEPEND=""
diff --git a/dev-libs/librelp/files/librelp-1.2.7-prevent-segfault-with-keepalive.patch b/dev-libs/librelp/files/librelp-1.2.7-prevent-segfault-with-keepalive.patch
new file mode 100644
index 000000000000..2f9803d0d8a8
--- /dev/null
+++ b/dev-libs/librelp/files/librelp-1.2.7-prevent-segfault-with-keepalive.patch
@@ -0,0 +1,32 @@
+From 0ca7f807958e8365b2fd2f3fd833814c83594bdc Mon Sep 17 00:00:00 2001
+From: Tomas Heinrich
+Date: Sun, 1 Jun 2014 16:44:59 +0200
+Subject: [PATCH] Reorder code, prevent access of uninitialized data
+
+---
+ src/tcp.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/tcp.c b/src/tcp.c
+index 1e0fd11..e21db51 100644
+--- a/src/tcp.c
++++ b/src/tcp.c
+@@ -713,12 +713,12 @@ relpTcpAcceptConnReq(relpTcp_t **ppThis, int sock, relpSrv_t *pSrv)
+ ABORT_FINALIZE(RELP_RET_ACCEPT_ERR);
+ }
+
+- if(pSrv->bKeepAlive)
+- EnableKeepAlive(pThis, pSrv, iNewSock);
+-
+ /* construct our object so that we can use it... */
+ CHKRet(relpTcpConstruct(&pThis, pEngine, RELP_SRV_CONN, pSrv));
+
++ if(pSrv->bKeepAlive)
++ EnableKeepAlive(pThis, pSrv, iNewSock);
++
+ /* TODO: obtain hostname, normalize (callback?), save it */
+ CHKRet(relpTcpSetRemHost(pThis, (struct sockaddr*) &addr));
+ pThis->pEngine->dbgprint("remote host is '%s', ip '%s'\n", pThis->pRemHostName, pThis->pRemHostIP);
+--
+1.9.3
+
diff --git a/dev-libs/librelp/librelp-1.2.7-r1.ebuild b/dev-libs/librelp/librelp-1.2.7-r1.ebuild
new file mode 100644
index 000000000000..5a62a5b0393e
--- /dev/null
+++ b/dev-libs/librelp/librelp-1.2.7-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/librelp/librelp-1.2.7-r1.ebuild,v 1.1 2014/07/05 08:02:24 dev-zero Exp $
+
+EAPI=5
+
+inherit autotools-utils
+
+DESCRIPTION="An easy to use library for the RELP protocol."
+HOMEPAGE="http://www.librelp.com/"
+SRC_URI="http://download.rsyslog.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 doc? ( FDL-1.3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~sparc ~x86"
+IUSE="debug doc +ssl static-libs"
+
+RDEPEND="
+ ssl? ( >=net-libs/gnutls-2.12.23-r1 )
+"
+
+DEPEND="
+ >=net-libs/gnutls-2.12.23-r1
+ virtual/pkgconfig
+"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+PATCHES=( "${FILESDIR}/${P}-prevent-segfault-with-keepalive.patch" )
+
+src_configure() {
+ # gnutls-headers are always required (in src/tcp.h) despite the flag, bug #513754
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable ssl tls)
+ )
+
+ autotools-utils_src_configure
+}
+
+src_install() {
+ use doc && HTML_DOCS=( doc/relp.html )
+ autotools-utils_src_install
+}
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 9b89bcf32c9e..45b4c7f6f1d7 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -1,2 +1,3 @@
DIST libsodium-0.4.5.tar.gz 540467 SHA256 7ad5202df53eeac0eb29b064ae5d05b65d82b2fc1c082899c9c6a09b0ee1ac32 SHA512 6105bb91982e040420312f042bb71547f0208ed9b2928b1740a68134b82dd4566f18c0761b8959a85d13b6770edbd977d989bc74eabc9bfa5e0000f5ab5c7b32 WHIRLPOOL 6496ec0f167dfa1fd7d774ad2c7142e58904d6d12274a22763a610b5f0be06ebd1c68926bc47046412c6d745e81ff38ff6821ac0da448a11302c196656c00f32
DIST libsodium-0.5.0.tar.gz 1526787 SHA256 3ca0a0619199a2adb3449eb7f1bf6e1f4fb2ef8514da9133f7f043b8b5cdf9f0 SHA512 6a483a4699daaa9f047fd362b405b21eb058c44e240f0f910fbd2167239f51bc092e807f875fc971a1e70decc6fa861b6904bef86156b27790960aba88ce253a WHIRLPOOL 801046b454faaad2fd94a60d86449b4984518c97b9714b7df55bc65b75daa0ba339af93e687b109b5c6f970ebd3bd9193f0fd1c790a26b39f1840758efb35ec4
+DIST libsodium-0.6.0.tar.gz 1546246 SHA256 84cdb6bf8ae3384f3ef78636f93bc689df748c1d36f87d4b6ab1e31c2d4dd145 SHA512 3a47468d3db1447fcb223de330ee3ffd11394ecd31440bfd2d89999003bdf01f85c0644b6075d73d670bf94ab9ea2162417a0dcd290ad2a9a46ae76cd467fc85 WHIRLPOOL ed27dfd9185139004a87058fcee74149c9f552b3fab3f925c045c721aea3f3aebbddc7c0d0d8d84d3ad90de8a468f5b93e36069f3b02fcc1697fbc8f51a775f2
diff --git a/dev-libs/libsodium/libsodium-0.6.0.ebuild b/dev-libs/libsodium/libsodium-0.6.0.ebuild
new file mode 100644
index 000000000000..dcb90c28e008
--- /dev/null
+++ b/dev-libs/libsodium/libsodium-0.6.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libsodium/libsodium-0.6.0.ebuild,v 1.1 2014/07/04 23:59:47 mrueg Exp $
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="A portable fork of NaCl, a higher-level cryptographic library"
+HOMEPAGE="https://github.com/jedisct1/libsodium"
+SRC_URI="http://download.libsodium.org/${PN}/releases/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/10.1"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+asm static-libs +urandom"
+
+src_configure() {
+ econf \
+ $(use_enable asm) \
+ $(use_enable !urandom blocking-random) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/dev-libs/libtasn1/libtasn1-3.6.ebuild b/dev-libs/libtasn1/libtasn1-3.6.ebuild
index 4e060e80a431..f9128ba6c09a 100644
--- a/dev-libs/libtasn1/libtasn1-3.6.ebuild
+++ b/dev-libs/libtasn1/libtasn1-3.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtasn1/libtasn1-3.6.ebuild,v 1.9 2014/06/23 15:23:00 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libtasn1/libtasn1-3.6.ebuild,v 1.13 2014/07/05 12:55:55 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3 LGPL-2.1"
SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos"
IUSE="doc static-libs"
DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r1.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r1.ebuild
index eb0d21bd7380..712b6a4019ec 100644
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r1.ebuild
+++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lockdev/lockdev-1.0.3.1.2-r1.ebuild,v 1.6 2014/06/22 13:49:08 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lockdev/lockdev-1.0.3.1.2-r1.ebuild,v 1.7 2014/07/04 12:41:39 klausman Exp $
EAPI="2"
@@ -22,7 +22,7 @@ SRC_URI="
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 x86"
IUSE="perl"
DEPEND="
diff --git a/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild b/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild
index c576d9f72ef9..1eb7c2e4afc1 100644
--- a/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild
+++ b/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild,v 1.5 2014/06/22 13:49:08 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lockdev/lockdev-1.0.3.1.2-r2.ebuild,v 1.6 2014/07/04 12:50:40 klausman Exp $
EAPI=5
@@ -22,7 +22,7 @@ SRC_URI="
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~x86"
IUSE="perl"
DEPEND=""
diff --git a/dev-libs/lzo/lzo-2.08.ebuild b/dev-libs/lzo/lzo-2.08.ebuild
index ce0531c7d2bc..e16243ad88e1 100644
--- a/dev-libs/lzo/lzo-2.08.ebuild
+++ b/dev-libs/lzo/lzo-2.08.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-2.08.ebuild,v 1.2 2014/06/30 14:44:28 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-2.08.ebuild,v 1.9 2014/07/05 12:56:08 ago Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples static-libs"
RDEPEND="abi_x86_32? (
diff --git a/dev-libs/nspr/nspr-4.10.6.ebuild b/dev-libs/nspr/nspr-4.10.6.ebuild
index 58f937fc2733..a4aa277129ca 100644
--- a/dev-libs/nspr/nspr-4.10.6.ebuild
+++ b/dev-libs/nspr/nspr-4.10.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6.ebuild,v 1.5 2014/06/19 18:04:04 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.10.6.ebuild,v 1.10 2014/07/05 12:57:47 ago Exp $
EAPI=5
WANT_AUTOCONF="2.5"
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="debug"
src_prepare() {
diff --git a/dev-libs/nss/nss-3.16.1.ebuild b/dev-libs/nss/nss-3.16.1.ebuild
index 2a8822d057d5..38998371e4be 100644
--- a/dev-libs/nss/nss-3.16.1.ebuild
+++ b/dev-libs/nss/nss-3.16.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.1.ebuild,v 1.1 2014/07/03 19:43:09 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.1.ebuild,v 1.2 2014/07/04 19:51:37 axs Exp $
EAPI=5
inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
@@ -108,20 +108,23 @@ nssarch() {
}
nssbits() {
- local cc="${1}CC" cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+ local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+ if [[ ${1} == BUILD_ ]]; then
+ cc=$(tc-getBUILD_CC)
+ else
+ cc=$(tc-getCC)
+ fi
echo > "${T}"/test.c || die
- ${!cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}"/${cc}-test.o || die
- case $(file "${T}"/${cc}-test.o) in
+ ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+ case $(file "${T}/${1}test.o") in
*32-bit*x86-64*) echo USE_X32=1;;
*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
*32-bit*|*ppc*|*i386*) ;;
- *) die "Failed to detect whether ${cc} is 64bits or 32bits, disable distcc if you're using it, please";;
+ *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
esac
}
multilib_src_compile() {
- tc-export AR RANLIB {BUILD_,}{CC,PKG_CONFIG}
-
# use ABI to determine bit'ness, or fallback if unset
local buildbits mybits
case "${ABI}" in
@@ -136,16 +139,16 @@ multilib_src_compile() {
fi
local makeargs=(
- CC="${CC}"
- AR="${AR} rc \$@"
- RANLIB="${RANLIB}"
+ CC="$(tc-getCC)"
+ AR="$(tc-getAR) rc \$@"
+ RANLIB="$(tc-getRANLIB)"
OPTIMIZER=
${mybits}
)
# Take care of nspr settings #436216
- local myCPPFLAGS="${CPPFLAGS} $(${PKG_CONFIG} nspr --cflags)"
- local myLDFLAGS="${LDFLAGS} $(${PKG_CONFIG} nspr --libs-only-L)"
+ local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+ local myLDFLAGS="${LDFLAGS} $($(tc-getPKG_CONFIG) nspr --libs-only-L)"
unset NSPR_INCLUDE_DIR
# Do not let `uname` be used.
@@ -171,7 +174,7 @@ multilib_src_compile() {
XCFLAGS="${BUILD_CFLAGS}" \
NSPR_LIB_DIR="${T}/fake-dir" \
emake -j1 -C coreconf \
- CC="${BUILD_CC}" \
+ CC="$(tc-getBUILD_CC)" \
${buildbits:-${mybits}}
makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
diff --git a/dev-libs/nss/nss-3.16.ebuild b/dev-libs/nss/nss-3.16.ebuild
index 16597d1c939c..00cf99a42f3c 100644
--- a/dev-libs/nss/nss-3.16.ebuild
+++ b/dev-libs/nss/nss-3.16.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.ebuild,v 1.9 2014/03/31 17:11:39 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.16.ebuild,v 1.11 2014/07/05 12:57:51 ago Exp $
EAPI=5
inherit eutils flag-o-matic multilib toolchain-funcs
@@ -19,7 +19,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cacert +nss-pem utils"
DEPEND="virtual/pkgconfig
diff --git a/dev-libs/openssl/openssl-0.9.8z_p1-r1.ebuild b/dev-libs/openssl/openssl-0.9.8z_p1-r1.ebuild
index 2d6d58b3604b..cf642c8a65a2 100644
--- a/dev-libs/openssl/openssl-0.9.8z_p1-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8z_p1-r1.ebuild,v 1.6 2014/06/24 19:16:22 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8z_p1-r1.ebuild,v 1.10 2014/07/05 12:45:20 ago Exp $
# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat
@@ -18,7 +18,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
LICENSE="openssl"
SLOT="0.9.8"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="bindist gmp kerberos sse2 test zlib"
RDEPEND="gmp? ( dev-libs/gmp )
diff --git a/dev-libs/openssl/openssl-1.0.0m.ebuild b/dev-libs/openssl/openssl-1.0.0m.ebuild
index ccfd72a5ad7b..7cfe76677553 100644
--- a/dev-libs/openssl/openssl-1.0.0m.ebuild
+++ b/dev-libs/openssl/openssl-1.0.0m.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0m.ebuild,v 1.5 2014/06/24 19:16:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0m.ebuild,v 1.9 2014/07/05 12:45:20 ago Exp $
EAPI="4"
@@ -14,7 +14,7 @@ SRC_URI="mirror://openssl/source/${P}.tar.gz
LICENSE="openssl"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test zlib"
# Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/dev-libs/starpu/starpu-1.1.2.ebuild b/dev-libs/starpu/starpu-1.1.2.ebuild
index 2b788d8c4305..c64839a0962b 100644
--- a/dev-libs/starpu/starpu-1.1.2.ebuild
+++ b/dev-libs/starpu/starpu-1.1.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/starpu/starpu-1.1.2.ebuild,v 1.1 2014/06/20 18:33:04 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/starpu/starpu-1.1.2.ebuild,v 1.2 2014/07/04 14:36:27 bicatali Exp $
EAPI=5
@@ -28,7 +28,7 @@ RDEPEND="
fftw? ( sci-libs/fftw:3.0= )
mpi? ( virtual/mpi )
opencl? ( virtual/opencl )
- opengl? ( virtual/opengl )
+ opengl? ( media-libs/freeglut:0= )
qt4? ( >=dev-qt/qtgui-4.7:4
>=dev-qt/qtopengl-4.7:4
>=dev-qt/qtsql-4.7:4
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
index 99519029eab8..e49bb32d4453 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild,v 1.2 2014/06/19 08:16:35 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luaexpat/luaexpat-1.3.0-r1.ebuild,v 1.3 2014/07/05 09:32:08 jer Exp $
EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="http://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
IUSE=""
RDEPEND=">=dev-lang/lua-5.1.5-r2[deprecated,${MULTILIB_USEDEP}]
diff --git a/dev-lua/luaexpat/luaexpat-1.3.0.ebuild b/dev-lua/luaexpat/luaexpat-1.3.0.ebuild
index 7d71f11409a9..cef6c5c88e96 100644
--- a/dev-lua/luaexpat/luaexpat-1.3.0.ebuild
+++ b/dev-lua/luaexpat/luaexpat-1.3.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lua/luaexpat/luaexpat-1.3.0.ebuild,v 1.1 2014/04/17 00:15:37 zx2c4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luaexpat/luaexpat-1.3.0.ebuild,v 1.2 2014/07/05 09:32:08 jer Exp $
EAPI=4
@@ -12,7 +12,7 @@ SRC_URI="http://matthewwild.co.uk/projects/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
IUSE=""
RDEPEND=">=dev-lang/lua-5.1[deprecated]
diff --git a/perl-core/Class-ISA/Class-ISA-0.36.ebuild b/dev-perl/Class-ISA/Class-ISA-0.36.ebuild
similarity index 62%
rename from perl-core/Class-ISA/Class-ISA-0.36.ebuild
rename to dev-perl/Class-ISA/Class-ISA-0.36.ebuild
index 2ce39cc1b95d..d2b583ac5104 100644
--- a/perl-core/Class-ISA/Class-ISA-0.36.ebuild
+++ b/dev-perl/Class-ISA/Class-ISA-0.36.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/perl-core/Class-ISA/Class-ISA-0.36.ebuild,v 1.7 2011/04/24 16:01:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-ISA/Class-ISA-0.36.ebuild,v 1.1 2014/07/05 12:30:55 dilfridge Exp $
EAPI=2
diff --git a/dev-perl/Class-ISA/Manifest b/dev-perl/Class-ISA/Manifest
new file mode 100644
index 000000000000..e793267c7f4d
--- /dev/null
+++ b/dev-perl/Class-ISA/Manifest
@@ -0,0 +1 @@
+DIST Class-ISA-0.36.tar.gz 6056 SHA256 8816f34e9a38e849a10df756030dccf9fe061a196c11ac3faafd7113c929b964 SHA512 49171bc0f78bd8aa74271d2f9eb1f2e535e69c6774f47557b07df011c9b8f44f960ec3c162acd256218944e866666731af27520d1e66cf560f065995b7658416 WHIRLPOOL fced5c57c9583c6135a89a41932ae5b33abcdc430d506722a2c73fbac12e6c8e3e8b5629be4ba33a30f1a26c3a8c4fef8c3bd4fae2b447ab04cf8524060eeccb
diff --git a/perl-core/Class-ISA/metadata.xml b/dev-perl/Class-ISA/metadata.xml
similarity index 100%
rename from perl-core/Class-ISA/metadata.xml
rename to dev-perl/Class-ISA/metadata.xml
diff --git a/dev-perl/Class-Virtual/Class-Virtual-0.60.0.ebuild b/dev-perl/Class-Virtual/Class-Virtual-0.60.0.ebuild
index e73034705756..9e6bee0b2bb3 100644
--- a/dev-perl/Class-Virtual/Class-Virtual-0.60.0.ebuild
+++ b/dev-perl/Class-Virtual/Class-Virtual-0.60.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Virtual/Class-Virtual-0.60.0.ebuild,v 1.2 2011/09/03 21:04:42 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Class-Virtual/Class-Virtual-0.60.0.ebuild,v 1.3 2014/07/05 12:35:07 dilfridge Exp $
EAPI=4
@@ -16,7 +16,7 @@ IUSE=""
RDEPEND="dev-perl/Class-Data-Inheritable
dev-perl/Carp-Assert
- perl-core/Class-ISA"
+ dev-perl/Class-ISA"
DEPEND="${RDEPEND}"
SRC_TEST="do"
diff --git a/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0.ebuild b/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0.ebuild
index d783bc0d2f46..5501071184f2 100644
--- a/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0.ebuild
+++ b/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0.ebuild,v 1.6 2014/01/30 23:12:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-Builder/DateTime-Format-Builder-0.810.0.ebuild,v 1.7 2014/07/04 14:52:15 klausman Exp $
EAPI=4
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Create DateTime parser classes and objects"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
IUSE="test"
RDEPEND="dev-perl/DateTime
diff --git a/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.80.0.ebuild b/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.80.0.ebuild
index 4ab5c27bd946..ba9303fb6b60 100644
--- a/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.80.0.ebuild
+++ b/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.80.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.80.0.ebuild,v 1.7 2014/01/30 23:12:59 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-ISO8601/DateTime-Format-ISO8601-0.80.0.ebuild,v 1.9 2014/07/04 14:52:09 klausman Exp $
EAPI=4
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Parses ISO8601 formats"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 x86 ~x86-fbsd"
IUSE="test"
RDEPEND="dev-perl/DateTime
diff --git a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.540.0.ebuild b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.540.0.ebuild
index c7ee9d956b14..a012b08640a7 100644
--- a/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.540.0.ebuild
+++ b/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.540.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.540.0.ebuild,v 1.6 2014/01/30 23:10:46 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/DateTime-Format-Strptime/DateTime-Format-Strptime-1.540.0.ebuild,v 1.7 2014/07/04 14:52:35 klausman Exp $
EAPI=4
@@ -12,7 +12,7 @@ DESCRIPTION="Parse and Format DateTimes using Strptime"
LICENSE="Artistic-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 x86 ~ppc-aix ~x86-fbsd ~x64-macos ~x86-solaris"
IUSE=""
RDEPEND="
diff --git a/dev-perl/File-Find-Rule/File-Find-Rule-0.330.0.ebuild b/dev-perl/File-Find-Rule/File-Find-Rule-0.330.0.ebuild
index 506270fb72bd..6ee052b674c2 100644
--- a/dev-perl/File-Find-Rule/File-Find-Rule-0.330.0.ebuild
+++ b/dev-perl/File-Find-Rule/File-Find-Rule-0.330.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Find-Rule/File-Find-Rule-0.330.0.ebuild,v 1.11 2014/01/30 23:11:52 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-Find-Rule/File-Find-Rule-0.330.0.ebuild,v 1.12 2014/07/04 14:52:23 klausman Exp $
EAPI=4
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Alternative interface to File::Find"
SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 ~mips ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
RDEPEND="virtual/perl-File-Spec
diff --git a/dev-perl/HTML-Tree/HTML-Tree-5.30.0.ebuild b/dev-perl/HTML-Tree/HTML-Tree-5.30.0.ebuild
index 6bad210008c9..163a8a75e3f9 100644
--- a/dev-perl/HTML-Tree/HTML-Tree-5.30.0.ebuild
+++ b/dev-perl/HTML-Tree/HTML-Tree-5.30.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Tree/HTML-Tree-5.30.0.ebuild,v 1.3 2013/02/19 02:36:00 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/HTML-Tree/HTML-Tree-5.30.0.ebuild,v 1.5 2014/07/04 14:52:03 klausman Exp $
EAPI=4
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.310.0.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.310.0.ebuild
index 2e5dc453c3ef..c9ee6bf67023 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.310.0.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-3.310.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-3.310.0.ebuild,v 1.2 2014/06/29 15:15:25 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-3.310.0.ebuild,v 1.3 2014/07/05 12:37:17 dilfridge Exp $
EAPI=5
@@ -28,6 +28,7 @@ SLOT="0"
IUSE="debug +xpression"
RDEPEND="
+ dev-perl/Class-ISA
dev-perl/Clone
dev-perl/Exception-Class
dev-perl/Hook-LexWrap
@@ -41,7 +42,6 @@ RDEPEND="
dev-perl/yaml
perl-core/Switch
sci-visualization/gnuplot
- virtual/perl-Class-ISA
virtual/perl-Data-Dumper
virtual/perl-Encode
virtual/perl-Time-HiRes
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.320.0.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.320.0.ebuild
index 241cb0811825..f83928d41a1b 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-3.320.0.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-3.320.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-3.320.0.ebuild,v 1.2 2014/06/29 15:15:25 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-3.320.0.ebuild,v 1.3 2014/07/05 12:37:17 dilfridge Exp $
EAPI=5
@@ -28,6 +28,7 @@ SLOT="0"
IUSE="debug +xpression"
RDEPEND="
+ dev-perl/Class-ISA
dev-perl/Clone
dev-perl/Exception-Class
dev-perl/Hook-LexWrap
@@ -41,7 +42,6 @@ RDEPEND="
dev-perl/yaml
perl-core/Switch
sci-visualization/gnuplot
- virtual/perl-Class-ISA
virtual/perl-Data-Dumper
virtual/perl-Encode
virtual/perl-Time-HiRes
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
index 4d8018521e10..075cea4a0a35 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild,v 1.13 2014/06/29 15:15:25 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild,v 1.14 2014/07/05 12:37:17 dilfridge Exp $
EAPI=5
@@ -28,6 +28,7 @@ SLOT="0"
IUSE="debug +xpression"
RDEPEND="
+ dev-perl/Class-ISA
dev-perl/Clone
dev-perl/Exception-Class
dev-perl/Hook-LexWrap
@@ -41,7 +42,6 @@ RDEPEND="
dev-perl/yaml
perl-core/Switch
sci-visualization/gnuplot
- virtual/perl-Class-ISA
virtual/perl-Data-Dumper
virtual/perl-Encode
virtual/perl-Time-HiRes
diff --git a/dev-perl/MediaWiki-API/MediaWiki-API-0.390.0.ebuild b/dev-perl/MediaWiki-API/MediaWiki-API-0.390.0.ebuild
index 27d34db4259c..06db38542c70 100644
--- a/dev-perl/MediaWiki-API/MediaWiki-API-0.390.0.ebuild
+++ b/dev-perl/MediaWiki-API/MediaWiki-API-0.390.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/MediaWiki-API/MediaWiki-API-0.390.0.ebuild,v 1.6 2014/05/04 15:14:40 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/MediaWiki-API/MediaWiki-API-0.390.0.ebuild,v 1.8 2014/07/04 14:51:54 klausman Exp $
EAPI=5
@@ -12,7 +12,7 @@ DESCRIPTION="A OO interface to the Mediawiki API"
LICENSE="|| ( Artistic GPL-1 GPL-2 GPL-3 )"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~x86 ~x86-fbsd"
IUSE=""
RDEPEND="
diff --git a/dev-perl/Net-Telnet/Net-Telnet-3.30.0.ebuild b/dev-perl/Net-Telnet/Net-Telnet-3.30.0.ebuild
index e02a5e689f0f..3051918f0a75 100644
--- a/dev-perl/Net-Telnet/Net-Telnet-3.30.0.ebuild
+++ b/dev-perl/Net-Telnet/Net-Telnet-3.30.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Telnet/Net-Telnet-3.30.0.ebuild,v 1.3 2012/11/23 13:17:44 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Net-Telnet/Net-Telnet-3.30.0.ebuild,v 1.4 2014/07/04 14:10:49 haubi Exp $
EAPI=4
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="A Telnet Perl Module"
SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
RDEPEND=">=virtual/perl-libnet-1.0703"
diff --git a/dev-perl/Test-Distribution/Test-Distribution-2.0.0.ebuild b/dev-perl/Test-Distribution/Test-Distribution-2.0.0.ebuild
index 4ae7d08d8b9e..d5ec64233bd2 100644
--- a/dev-perl/Test-Distribution/Test-Distribution-2.0.0.ebuild
+++ b/dev-perl/Test-Distribution/Test-Distribution-2.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Distribution/Test-Distribution-2.0.0.ebuild,v 1.6 2014/01/30 23:12:36 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Test-Distribution/Test-Distribution-2.0.0.ebuild,v 1.7 2014/07/04 14:52:29 klausman Exp $
EAPI=4
@@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="perform tests on all modules of a distribution"
SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 x86 ~x86-fbsd"
IUSE=""
RDEPEND=">=dev-perl/Pod-Coverage-0.20
diff --git a/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r1.ebuild b/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r1.ebuild
index 3ae7078f8034..9561e60b06fa 100644
--- a/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r1.ebuild
+++ b/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r1.ebuild,v 1.1 2014/06/27 10:08:34 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0-r1.ebuild,v 1.2 2014/07/05 09:31:01 zlogene Exp $
EAPI=5
@@ -14,7 +14,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ia64 ~ppc ~sparc x86"
IUSE=""
RDEPEND="
diff --git a/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0.ebuild b/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0.ebuild
deleted file mode 100644
index e2c248c48219..000000000000
--- a/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/gtk2-trayicon/gtk2-trayicon-0.60.0.ebuild,v 1.2 2012/05/04 04:10:56 jdhore Exp $
-
-EAPI=3
-
-MODULE_AUTHOR=BORUP
-MODULE_VERSION=0.06
-MY_PN=Gtk2-TrayIcon
-inherit perl-module
-
-DESCRIPTION="Perl wrappers for the egg cup Gtk2::TrayIcon utilities."
-HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 ~ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="
- >=dev-perl/glib-perl-1.012
- >=dev-perl/gtk2-perl-1.012
- gnome-base/libglade:2.0
- x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
- dev-perl/extutils-depends
- dev-perl/extutils-pkgconfig
- virtual/pkgconfig"
diff --git a/dev-php/pecl-uuid/pecl-uuid-1.0.3.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.0.3-r1.ebuild
similarity index 73%
rename from dev-php/pecl-uuid/pecl-uuid-1.0.3.ebuild
rename to dev-php/pecl-uuid/pecl-uuid-1.0.3-r1.ebuild
index 47a8c652946e..9ef98d677566 100644
--- a/dev-php/pecl-uuid/pecl-uuid-1.0.3.ebuild
+++ b/dev-php/pecl-uuid/pecl-uuid-1.0.3-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-uuid/pecl-uuid-1.0.3.ebuild,v 1.1 2012/08/24 09:01:07 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/pecl-uuid/pecl-uuid-1.0.3-r1.ebuild,v 1.1 2014/07/04 14:59:33 dev-zero Exp $
-EAPI="4"
+EAPI="5"
PHP_EXT_NAME="uuid"
PHP_EXT_INIT="yes"
PHP_EXT_ZENDEXT="no"
DOCS="CREDITS"
-USE_PHP="php5-3 php5-4"
+USE_PHP="php5-3 php5-4 php5-5"
inherit php-ext-pecl-r2
diff --git a/dev-python/bottle/bottle-0.11.7.ebuild b/dev-python/bottle/bottle-0.11.7.ebuild
index d3cad5b8afbd..57e42af28b5a 100644
--- a/dev-python/bottle/bottle-0.11.7.ebuild
+++ b/dev-python/bottle/bottle-0.11.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bottle/bottle-0.11.7.ebuild,v 1.1 2014/06/06 15:44:16 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bottle/bottle-0.11.7.ebuild,v 1.8 2014/07/05 12:56:04 ago Exp $
EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
IUSE=""
DEPEND=""
diff --git a/dev-python/bpython/bpython-0.13.ebuild b/dev-python/bpython/bpython-0.13.ebuild
index 3c076080d745..8a3080d924b6 100644
--- a/dev-python/bpython/bpython-0.13.ebuild
+++ b/dev-python/bpython/bpython-0.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/bpython-0.13.ebuild,v 1.1 2014/06/05 08:35:31 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bpython/bpython-0.13.ebuild,v 1.3 2014/07/05 06:28:04 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3} )
@@ -28,7 +28,9 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS CHANGELOG TODO sample-config sample.theme light.theme )
-PATCHES=( "${FILESDIR}"/${PN}-desktop.patch )
+PATCHES=( "${FILESDIR}"/${PN}-desktop.patch
+ "${FILESDIR}"/${P}-test_repl.patch )
+
# Req'd for clean build by each impl
DISTUTILS_IN_SOURCE_BUILD=1
@@ -52,11 +54,8 @@ python_test() {
pushd build/lib > /dev/null
# https://bitbucket.org/bobf/bpython/issue/289/test-failures-in-latest-release-py27-py33
sed -e s':test_enter:_&:' -i bpython/test/test_repl.py || die
- if python_is_python3; then
- sed -e s':test_fuzzy_global_complete:_&:' \
- -i bpython/test/test_repl.py || die
- fi
- "${PYTHON}" -m unittest discover || die "dud"
+
+ "${PYTHON}" -m unittest discover ||
popd > /dev/null
}
diff --git a/dev-python/bpython/files/bpython-0.13-test_repl.patch b/dev-python/bpython/files/bpython-0.13-test_repl.patch
new file mode 100644
index 000000000000..b71cfbea3440
--- /dev/null
+++ b/dev-python/bpython/files/bpython-0.13-test_repl.patch
@@ -0,0 +1,34 @@
+https://bitbucket.org/thomasballinger/bpython-for-clean-patch/commits/94c4664c1303
+# HG changeset patch
+# User Thomas Ballinger
+# Date 1404088731 14400
+# Branch 0.13-bugfix
+# Node ID 94c4664c130303b1ae53629d6ebcff04f5d5d7ae
+# Parent 106c49981f5e2db325d543d24c063f9c38013023
+simplest possible fix for test that changes in py3.3
+
+diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
+--- a/bpython/test/test_repl.py
++++ b/bpython/test/test_repl.py
+@@ -1,4 +1,5 @@
+ import os
++import sys
+ import unittest
+ from itertools import islice
+ from mock import Mock
+@@ -280,8 +281,12 @@
+
+ self.assertTrue(self.repl.complete())
+ self.assertTrue(hasattr(self.repl.completer,'matches'))
+- self.assertEqual(self.repl.completer.matches,
+- ['UnboundLocalError(', '__doc__'])
++ if sys.version_info[0] == 3 and sys.version_info[1] >= 3:
++ self.assertEqual(self.repl.completer.matches,
++ ['ChildProcessError(', 'UnboundLocalError(', '__doc__'])
++ else:
++ self.assertEqual(self.repl.completer.matches,
++ ['UnboundLocalError(', '__doc__'])
+
+ # 2. Attribute tests
+ def test_simple_attribute_complete(self):
+
diff --git a/dev-python/defusedxml/defusedxml-0.4.1.ebuild b/dev-python/defusedxml/defusedxml-0.4.1.ebuild
index 5f248e884f17..2bf287013f14 100644
--- a/dev-python/defusedxml/defusedxml-0.4.1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/defusedxml/defusedxml-0.4.1.ebuild,v 1.4 2014/06/29 02:56:02 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/defusedxml/defusedxml-0.4.1.ebuild,v 1.5 2014/07/05 14:02:11 jer Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy )
@@ -10,7 +10,7 @@ inherit distutils-r1
DESCRIPTION="XML bomb protection for Python stdlib modules, an xml serialiser"
HOMEPAGE="https://bitbucket.org/tiran/defusedxml"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
IUSE="examples"
LICENSE="PSF-2"
diff --git a/dev-python/disqus-python/disqus-python-0.4.2.ebuild b/dev-python/disqus-python/disqus-python-0.4.2.ebuild
index 1b386f053ab2..45e3a1acc773 100644
--- a/dev-python/disqus-python/disqus-python-0.4.2.ebuild
+++ b/dev-python/disqus-python/disqus-python-0.4.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/disqus-python/disqus-python-0.4.2.ebuild,v 1.1 2013/08/31 15:41:59 ercpe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/disqus-python/disqus-python-0.4.2.ebuild,v 1.2 2014/07/04 11:35:42 idella4 Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 vcs-snapshot
@@ -17,8 +17,8 @@ LICENSE="Apache-2.0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
+DEPEND="dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/setuptools[${PYTHON_USEDEP}]
test? (
dev-python/mock[${PYTHON_USEDEP}]
)"
diff --git a/dev-python/ecdsa/ecdsa-0.10.ebuild b/dev-python/ecdsa/ecdsa-0.10.ebuild
index acf3bfeff6f2..96a8c4423b51 100644
--- a/dev-python/ecdsa/ecdsa-0.10.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ecdsa/ecdsa-0.10.ebuild,v 1.12 2014/03/17 09:21:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ecdsa/ecdsa-0.10.ebuild,v 1.13 2014/07/04 12:00:12 klausman Exp $
EAPI=5
@@ -15,5 +15,5 @@ SRC_URI="https://github.com/warner/python-${PN}/tarball/python-${P} -> ${P}.tar.
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ~s390 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~s390 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
IUSE=""
diff --git a/dev-python/paramiko/paramiko-1.12.2.ebuild b/dev-python/paramiko/paramiko-1.12.2.ebuild
index ffa83a6f50b5..794629115fa6 100644
--- a/dev-python/paramiko/paramiko-1.12.2.ebuild
+++ b/dev-python/paramiko/paramiko-1.12.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.12.2.ebuild,v 1.1 2014/02/14 19:03:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/paramiko/paramiko-1.12.2.ebuild,v 1.2 2014/07/04 11:59:57 klausman Exp $
EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~sh ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~sh ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
IUSE="doc examples"
RDEPEND=">=dev-python/pycrypto-2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild b/dev-python/pycurl/pycurl-7.19.0-r4.ebuild
similarity index 97%
rename from dev-python/pycurl/pycurl-7.19.0-r3.ebuild
rename to dev-python/pycurl/pycurl-7.19.0-r4.ebuild
index 5d33374fe71b..f97b80a73036 100644
--- a/dev-python/pycurl/pycurl-7.19.0-r3.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.0-r4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r3.ebuild,v 1.14 2014/06/15 15:22:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.0-r4.ebuild,v 1.1 2014/07/04 20:42:33 floppym Exp $
EAPI=5
diff --git a/dev-python/pycurl/pycurl-7.19.3.1.ebuild b/dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild
similarity index 97%
rename from dev-python/pycurl/pycurl-7.19.3.1.ebuild
rename to dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild
index 387f3a602bae..0807304fc30d 100644
--- a/dev-python/pycurl/pycurl-7.19.3.1.ebuild
+++ b/dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1.ebuild,v 1.6 2014/06/28 18:04:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycurl/pycurl-7.19.3.1-r1.ebuild,v 1.1 2014/07/04 20:42:33 floppym Exp $
EAPI=5
# The selftests fail with pypy, and urlgrabber segfaults for me.
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
index 7c6d57c56c68..6e2b3805a886 100644
--- a/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
+++ b/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild,v 1.13 2014/03/31 21:10:59 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyftpdlib/pyftpdlib-1.0.1-r1.ebuild,v 1.14 2014/07/05 13:10:59 klausman Exp $
EAPI=5
PYTHON_COMPAT=( python2_{6,7} pypy pypy2_0 )
@@ -15,7 +15,7 @@ SRC_URI="http://pyftpdlib.googlecode.com/files/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="examples ssl"
DEPEND="ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )"
diff --git a/dev-python/six/six-1.6.1.ebuild b/dev-python/six/six-1.6.1.ebuild
index c70f6e42fdcc..d2217d59408e 100644
--- a/dev-python/six/six-1.6.1.ebuild
+++ b/dev-python/six/six-1.6.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.6.1.ebuild,v 1.4 2014/04/02 20:49:16 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/six/six-1.6.1.ebuild,v 1.5 2014/07/05 14:08:47 jer Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy pypy2_0 )
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="doc test"
DEPEND="doc? ( dev-python/sphinx )
diff --git a/dev-python/soappy/Manifest b/dev-python/soappy/Manifest
index 31773ee01f05..6b965e099013 100644
--- a/dev-python/soappy/Manifest
+++ b/dev-python/soappy/Manifest
@@ -1,3 +1,4 @@
DIST SOAPpy-0.12.0.tar.gz 176199 SHA256 2d1fdacc9ca74412e2b1b1c44310679b7bcd23edb0a84359b2803e90e3e54009 SHA512 1c631634506ac41fbceddaff265ae2226c2be2c7e1c8c6ef28801dadbe594ee76c968188353b9ef905c4c9c036c4f71bd440a87a78bd03c501510d2dd59ff6ea WHIRLPOOL 771438fb8b23c1be4d720d2442d114c9a301464bb7e959cd5fad037083eb4519a3a05ee9db5623b361a7b98218528ab5316d385a0246939f555c81fda81f86cd
DIST SOAPpy-0.12.20.zip 172192 SHA256 ed42ee76a1f1c6ce767296d67ef482059e32eb66cdcbc3ed6b6b9c3922444277 SHA512 f4140327295d0d301093aa13ae35ebc1faabd4aafc259b9866072d57da82bc7742fc852904bddc978792f97cb577afc97e35d47f350c9e5f1426a4928aeb8351 WHIRLPOOL a5568ba25f9e3b22310f447c35f612038f32fc60b20b28aa292b4db7239bb9247772a1192eb2ec1e2f51429c1c1f99dc54ac37b6aae9b4d1418841ae07072f28
+DIST SOAPpy-0.12.22.zip 172855 SHA256 e70845906bb625144ae6a8df4534d66d84431ff8e21835d7b401ec6d8eb447a5 SHA512 d75d0bf8e88c8ecae57f51a201f9ab6f24fc41856ee2093e7e2e73e5d8618c9a766a69140df28a24b6d8493b53555c09502684c6d2fd78e90a3c53bba52f388b WHIRLPOOL 8ac248d98f9da45bcbdd9a9bf55bb7fd4b83de097ca641453c7cf18833c4dc5cd5b4e09e3e5bce3cf4be0c6c09e4e10638aa6a5244afc6cc791996b63a1c3d5e
DIST SOAPpy-0.12.5.tar.gz 153106 SHA256 8d8e3bf304f5669432d58cc0c2870766096ef5e4e89889aa1bce6d7a68994ef7 SHA512 cee6a4556beac20c68c3bcfe14454b9911655f78987c6fe9a6ce5f08090ded7bbf71a067d848368cf20101ff374e0992f34428b48b9a451eb67a925e92a149a9 WHIRLPOOL 2ba4b0a7cacbf132ca824a1703c811ecba19f852c88b9ac994feba10cce5e9f98769f284cc080c4a6dfd1cba3db7c2d1d69a258bdd3c3f1aeadb11b4cbfbc137
diff --git a/dev-python/soappy/soappy-0.12.22.ebuild b/dev-python/soappy/soappy-0.12.22.ebuild
new file mode 100644
index 000000000000..90411756af32
--- /dev/null
+++ b/dev-python/soappy/soappy-0.12.22.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soappy/soappy-0.12.22.ebuild,v 1.2 2014/07/05 14:02:39 jer Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl?,xml"
+
+inherit distutils-r1
+
+MY_PN="SOAPpy"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SOAP Services for Python"
+HOMEPAGE="http://pywebsvcs.sourceforge.net/ http://pypi.python.org/pypi/SOAPpy"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+
+IUSE="examples ssl"
+
+RDEPEND="dev-python/wstools[${PYTHON_USEDEP}]
+ dev-python/defusedxml[${PYTHON_USEDEP}]
+ ssl? ( dev-python/m2crypto[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CHANGES.txt README.txt docs/. )
+
+python_install_all() {
+ if use examples; then
+ docinto examples
+ dodoc -r bid contrib tools validate
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/tvdb_api/Manifest b/dev-python/tvdb_api/Manifest
index 0f60eb6037c3..81f91771606f 100644
--- a/dev-python/tvdb_api/Manifest
+++ b/dev-python/tvdb_api/Manifest
@@ -1 +1 @@
-DIST tvdb_api-1.8.2.tar.gz 32107 SHA256 3bbe468b9af5d8c27dde4264b3b85888d718c06dc8906d86706a4ad291e07878 SHA512 1be54c63ffac1687f33345c90d83f91f20412fcedd46f81426514b65381f1026cde485029421f3ad2c93125bbe3623670226670af9b71c544bbd069e24f385f2 WHIRLPOOL cf1a90e614478a79fb5c6b5a508b5a2b13fc6afe501146fc98416053555da936bf22fbf5876a00a9cf919c93d1db23e1859a4257a15588aaaf4e8206c33fbaeb
+DIST tvdb_api-1.9.tar.gz 32429 SHA256 516bd5f9150f7fcb1df11cd73b2af0e155eb8282e49c197449df295cd0e0f873 SHA512 6ce13f47275eb3f37897da1b9bfb2d101184e3797abeec965c170d9b007661c3e0745396bc93bf365d6a1552fb461a2fd7b33777b4a67e58281c8ac3efb788df WHIRLPOOL 596c680383fe43f4575e968358c6a839d070c1eb1561e7a7f673516d1fb445bc0f9927c22eecf2762be5d0fe5fd63c840ba95ff08779a218c1389b3d66ea8668
diff --git a/dev-python/tvdb_api/tvdb_api-1.8.2.ebuild b/dev-python/tvdb_api/tvdb_api-1.9.ebuild
similarity index 71%
rename from dev-python/tvdb_api/tvdb_api-1.8.2.ebuild
rename to dev-python/tvdb_api/tvdb_api-1.9.ebuild
index 5842cef60d41..bf25ec1bde84 100644
--- a/dev-python/tvdb_api/tvdb_api-1.8.2.ebuild
+++ b/dev-python/tvdb_api/tvdb_api-1.9.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/tvdb_api/tvdb_api-1.8.2.ebuild,v 1.1 2013/01/10 18:10:16 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/tvdb_api/tvdb_api-1.9.ebuild,v 1.1 2014/07/05 14:59:47 thev00d00 Exp $
-EAPI=4
+EAPI=5
-inherit distutils vcs-snapshot
+PYTHON_COMPAT="python2_7"
+inherit distutils-r1 vcs-snapshot
SRC_URI="https://github.com/dbr/${PN}/tarball/${PV} -> ${P}.tar.gz"
DESCRIPTION="Python interface to thetvdb.com API"
diff --git a/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.ebuild b/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.ebuild
index bb4746562b82..2f75bcb67005 100644
--- a/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.ebuild
+++ b/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.ebuild,v 1.2 2014/06/29 09:26:43 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/virtualenvwrapper/virtualenvwrapper-4.3.ebuild,v 1.3 2014/07/05 13:44:19 idella4 Exp $
EAPI=5
@@ -23,6 +23,7 @@ RDEPEND="dev-python/virtualenv[${PYTHON_USEDEP}]
dev-python/virtualenv-clone[${PYTHON_USEDEP}]"
DEPEND="${DEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-python/pbr[${PYTHON_USEDEP}]
test? ( dev-python/tox[${PYTHON_USEDEP}] )"
src_prepare() {
diff --git a/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild b/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
index 65cd21e5617a..23112e7b5d75 100644
--- a/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
+++ b/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild,v 1.2 2014/05/23 07:33:25 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgiproxy2/wsgiproxy2-0.4.1.ebuild,v 1.4 2014/07/05 02:48:00 idella4 Exp $
EAPI=5
@@ -23,7 +23,8 @@ RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
dev-python/webob[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( ${RDEPEND}
dev-python/webtest[${PYTHON_USEDEP}]
dev-python/socketpool[${PYTHON_USEDEP}]
dev-python/restkit[$(python_gen_usedep python2_7)] )"
diff --git a/dev-ruby/activesupport/activesupport-3.2.18.ebuild b/dev-ruby/activesupport/activesupport-3.2.18.ebuild
index da92e5e48ab4..d712c004cd76 100644
--- a/dev-ruby/activesupport/activesupport-3.2.18.ebuild
+++ b/dev-ruby/activesupport/activesupport-3.2.18.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.2.18.ebuild,v 1.1 2014/05/06 18:50:41 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.2.18.ebuild,v 1.2 2014/07/05 09:10:23 mrueg Exp $
EAPI=5
@@ -58,10 +58,6 @@ all_ruby_prepare() {
each_ruby_prepare() {
case ${RUBY} in
- *ruby18)
- # Skip failing ruby18 tests related to JSON serialization
- rm test/message_encryptor_test.rb test/message_verifier_test.rb || die
- ;;
*jruby)
# Ignore failing tests on jruby in the interest of a security update
sed -i -e '/test_not_allowed_to_expand_parameter_entities_to_files/,/^ end/ s:^:#:' \
diff --git a/dev-ruby/activesupport/activesupport-3.2.19.ebuild b/dev-ruby/activesupport/activesupport-3.2.19.ebuild
index f19ad6a32015..cbbdbad1b410 100644
--- a/dev-ruby/activesupport/activesupport-3.2.19.ebuild
+++ b/dev-ruby/activesupport/activesupport-3.2.19.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.2.19.ebuild,v 1.1 2014/07/03 05:37:33 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.2.19.ebuild,v 1.2 2014/07/05 09:10:23 mrueg Exp $
EAPI=5
@@ -58,10 +58,6 @@ all_ruby_prepare() {
each_ruby_prepare() {
case ${RUBY} in
- *ruby18)
- # Skip failing ruby18 tests related to JSON serialization
- rm test/message_encryptor_test.rb test/message_verifier_test.rb || die
- ;;
*jruby)
# Ignore failing tests on jruby in the interest of a security update
sed -i -e '/test_not_allowed_to_expand_parameter_entities_to_files/,/^ end/ s:^:#:' \
diff --git a/dev-ruby/facter/facter-1.7.6.ebuild b/dev-ruby/facter/facter-1.7.6.ebuild
index 33277b40af29..08019f829cf8 100644
--- a/dev-ruby/facter/facter-1.7.6.ebuild
+++ b/dev-ruby/facter/facter-1.7.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.7.6.ebuild,v 1.1 2014/06/22 18:59:29 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/facter/facter-1.7.6.ebuild,v 1.3 2014/07/05 12:59:23 ago Exp $
EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="+dmi +pciutils"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc x86"
CDEPEND="
sys-apps/net-tools
diff --git a/dev-ruby/fcgi/Manifest b/dev-ruby/fcgi/Manifest
index d0a8418482a7..7e88ecd606b9 100644
--- a/dev-ruby/fcgi/Manifest
+++ b/dev-ruby/fcgi/Manifest
@@ -1,2 +1 @@
-DIST fcgi-0.8.8.gem 13312 SHA256 7e6b5850d6c7b3c22777f3006467e28daaaa8cbb134e36d36d98c740f8d64d03 SHA512 d46a36cd564e87e3c9fbfce08f5e8d8820a0d67681450daa0c44988063a318c5198f1fcdc24b36fc93776e5073d96696fb3385133f55205c159c913980561afd WHIRLPOOL 2de26b537f52269a2e333774aa81a1bd459f0e0ccce65930c2fecc12cebea2611af3bb7793dc89704028bcc2e161e9375086ba4376cd95a96593399657c49908
DIST fcgi-0.9.2.1.gem 15872 SHA256 f5e18b6769dfea1760e3da1dae1df7ade140cd5c1394e9318e36d9834f13ca1e SHA512 1ffdd429ce4f2bbac771b7ac2368a5194015a7327b8b43b803914257edc174235573df6bb41a53fb71db0bf179fc24ce2392b244b5b55563d67e045c47da8579 WHIRLPOOL 722307e332bc6e584a144a5a5ca667f960edcadcf730aef4a91bde6caaf4d65d1f64028c067d82418dd7e1276f053196fa8a15c0a7b2f7616e9ca796a9239757
diff --git a/dev-ruby/fcgi/fcgi-0.8.8-r2.ebuild b/dev-ruby/fcgi/fcgi-0.8.8-r2.ebuild
deleted file mode 100644
index 5878d6e8da54..000000000000
--- a/dev-ruby/fcgi/fcgi-0.8.8-r2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fcgi/fcgi-0.8.8-r2.ebuild,v 1.6 2014/06/12 16:06:15 mrueg Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ree18 jruby"
-
-RUBY_FAKEGEM_TASK_TEST=""
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README README.signals ChangeLog"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="FastCGI library for Ruby"
-HOMEPAGE="http://rubyforge.org/projects/fcgi/"
-
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-LICENSE="Ruby"
-
-DEPEND+=" dev-libs/fcgi"
-RDEPEND+=" dev-libs/fcgi"
-
-IUSE=""
-SLOT="0"
-
-each_ruby_configure() {
- case ${RUBY} in
- *ruby18|*rubyee18)
- ${RUBY} -C ext/fcgi extconf.rb || die "extconf failed"
- ;;
- esac
-}
-
-each_ruby_compile() {
- case ${RUBY} in
- *ruby18|*rubyee18)
- emake -C ext/fcgi
- cp ext/fcgi/fcgi$(get_modname) lib || die
- ;;
- esac
-}
diff --git a/dev-ruby/fcgi/fcgi-0.9.2.1.ebuild b/dev-ruby/fcgi/fcgi-0.9.2.1.ebuild
index a4c837e6f703..1e1b53d85a32 100644
--- a/dev-ruby/fcgi/fcgi-0.9.2.1.ebuild
+++ b/dev-ruby/fcgi/fcgi-0.9.2.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fcgi/fcgi-0.9.2.1.ebuild,v 1.9 2014/07/01 14:08:02 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/fcgi/fcgi-0.9.2.1.ebuild,v 1.10 2014/07/05 12:51:27 ago Exp $
EAPI=5
USE_RUBY="ruby19 ruby20 jruby"
@@ -15,7 +15,7 @@ inherit multilib ruby-fakegem
DESCRIPTION="FastCGI library for Ruby"
HOMEPAGE="http://github.com/alphallc/ruby-fcgi-ng"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
LICENSE="Ruby"
DEPEND+=" dev-libs/fcgi"
diff --git a/dev-ruby/kramdown/kramdown-0.14.2.ebuild b/dev-ruby/kramdown/kramdown-0.14.2.ebuild
index 851e23c5aada..fe53a5f68de0 100644
--- a/dev-ruby/kramdown/kramdown-0.14.2.ebuild
+++ b/dev-ruby/kramdown/kramdown-0.14.2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/kramdown/kramdown-0.14.2.ebuild,v 1.4 2014/04/09 14:21:03 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/kramdown/kramdown-0.14.2.ebuild,v 1.5 2014/07/05 13:30:05 mrueg Exp $
EAPI=5
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby19 jruby"
RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc"
RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS ChangeLog CONTRIBUTERS"
diff --git a/dev-ruby/msgpack/Manifest b/dev-ruby/msgpack/Manifest
index d9effdceb7f0..635f8adf8a3b 100644
--- a/dev-ruby/msgpack/Manifest
+++ b/dev-ruby/msgpack/Manifest
@@ -1,2 +1 @@
-DIST msgpack-0.5.7.gem 37376 SHA256 99f21f99187eb24bfee8283e7e16328c0479f27b64dc5475cfbc672cb3df982f SHA512 b195dcb15dde4e5fa7847f9a5b06f4304126d289e55f32aceef5d5303841df485133e6856355e089128ae88ce46a5dcc922f70fb6e033e2d658d3bdc8b62fc6a WHIRLPOOL 84fddc6f7f7ab9aae0617df92cb6d83e32bef63dbd4e57a85a6a403afdfef560f5fd902f2f31d624679711481023904968e54209984d832d2bc3c3aa5c3503f9
DIST msgpack-0.5.8.gem 37888 SHA256 223f7f5d400dfbc698da933e339f5c99e1a0a3a1229a965ecb9c5ebd4e1a129b SHA512 5061716147ac5c268f89f5e32a76504832ae201e2b0ca4a7ffd8639438e22227a8b1369777ccb4343131057f398eb5f4402599830b38df7da51ea41e163dfe96 WHIRLPOOL cfb1ba4b43cf7fb211ce55c12d4a502b21186994561d33e94631f9dc28dd576520e2b3e3c9903e3607671caf9915d452210427522241448a02d4cbbffdcc22d1
diff --git a/dev-ruby/msgpack/msgpack-0.5.7.ebuild b/dev-ruby/msgpack/msgpack-0.5.7.ebuild
deleted file mode 100644
index e99ea7895369..000000000000
--- a/dev-ruby/msgpack/msgpack-0.5.7.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/msgpack/msgpack-0.5.7.ebuild,v 1.2 2013/12/22 18:40:57 blueness Exp $
-
-EAPI=5
-
-# jruby → uses a binary extension
-USE_RUBY="ruby18 ruby19 ruby20"
-
-RUBY_FAKEGEM_TASK_DOC="doc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Binary-based efficient data interchange format for ruby binding"
-HOMEPAGE="http://msgpack.sourceforge.jp/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="doc"
-
-ruby_add_bdepend "doc? ( dev-ruby/yard )"
-
-all_ruby_prepare() {
- sed -i -e '/bundler/I s:^:#:' Rakefile || die
-}
-
-each_ruby_prepare() {
- case "${RUBY}" in
- *ruby18)
- # Fix tests as .clear is not available in ruby18
- # Tests are working, but are very slow on ruby18
- sed -i -e 's/s.clear/s.replace ""/' spec/buffer_spec.rb || die
- # Avoid tests requiring ruby 1.9+
- sed -i -e '/frozen short strings/,/end/ s:^:#:' \
- -e '/frozen long strings/,/end/ s:^:#:' spec/unpacker_spec.rb || die
- ;;
- *)
- ;;
- esac
-}
-
-each_ruby_configure() {
- ${RUBY} -Cext/${PN} extconf.rb || die "Configuration of extension failed."
-}
-
-each_ruby_compile() {
- emake V=1 -Cext/${PN}
- cp ext/${PN}/msgpack$(get_modname) lib/${PN} || die "Unable to install msgpack library."
-}
diff --git a/dev-ruby/rdoc/rdoc-3.12.2.ebuild b/dev-ruby/rdoc/rdoc-3.12.2.ebuild
index da202c69d093..166a8da65d9d 100644
--- a/dev-ruby/rdoc/rdoc-3.12.2.ebuild
+++ b/dev-ruby/rdoc/rdoc-3.12.2.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-3.12.2.ebuild,v 1.13 2014/01/05 10:56:21 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-3.12.2.ebuild,v 1.14 2014/07/05 12:57:48 mrueg Exp $
EAPI=5
-USE_RUBY="ruby18 ruby19 jruby"
+USE_RUBY="ruby19 jruby"
RUBY_FAKEGEM_TASK_DOC="docs"
@@ -37,9 +37,6 @@ ruby_add_rdepend "=dev-ruby/json-1* >=dev-ruby/json-1.4"
RDEPEND="${RDEPEND}
ruby_targets_ruby19? (
>=dev-lang/ruby-1.9.2:1.9
- )
- ruby_targets_ruby18? (
- >=dev-lang/ruby-1.8.7:1.8
)"
all_ruby_prepare() {
diff --git a/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild b/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild
index 9908f9bedc70..c8691a33eb02 100644
--- a/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild
+++ b/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild,v 1.10 2014/01/26 13:06:35 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-4.0.1-r1.ebuild,v 1.11 2014/07/05 12:57:48 mrueg Exp $
EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
+USE_RUBY="ruby19 ruby20 jruby"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_DOCDIR="doc"
@@ -34,9 +34,6 @@ ruby_add_rdepend "=dev-ruby/json-1* >=dev-ruby/json-1.4"
RDEPEND="${RDEPEND}
ruby_targets_ruby19? (
>=dev-lang/ruby-1.9.2:1.9
- )
- ruby_targets_ruby18? (
- >=dev-lang/ruby-1.8.7:1.8
)"
all_ruby_prepare() {
diff --git a/dev-ruby/rdoc/rdoc-4.0.1-r2.ebuild b/dev-ruby/rdoc/rdoc-4.0.1-r2.ebuild
index 59a36160aa2d..f568d6bc56cf 100644
--- a/dev-ruby/rdoc/rdoc-4.0.1-r2.ebuild
+++ b/dev-ruby/rdoc/rdoc-4.0.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-4.0.1-r2.ebuild,v 1.1 2013/12/26 09:27:13 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rdoc/rdoc-4.0.1-r2.ebuild,v 1.2 2014/07/05 12:57:48 mrueg Exp $
EAPI=5
-USE_RUBY="ruby18 ruby19 ruby20 ruby21 jruby"
+USE_RUBY="ruby19 ruby20 ruby21 jruby"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/rubygems/rubygems-2.0.14-r1.ebuild b/dev-ruby/rubygems/rubygems-2.0.14-r1.ebuild
index 94264a876658..03cb84c71a8d 100644
--- a/dev-ruby/rubygems/rubygems-2.0.14-r1.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.0.14-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.14-r1.ebuild,v 1.3 2014/07/02 10:33:11 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.14-r1.ebuild,v 1.4 2014/07/05 09:11:46 mrueg Exp $
EAPI=5
@@ -58,11 +58,6 @@ all_ruby_prepare() {
each_ruby_prepare() {
case ${RUBY} in
- *ruby18)
- # Remove test failing on ruby18. According to travis.yml
- # upstream no longer cares.
- sed -i -e '/test_install_location_extra_slash/,/^ end/ s:^:#:' test/rubygems/test_gem_package.rb || die
- ;;
*jruby)
sed -i -e '/test_install_location_extra_slash/,/^ end/ s:^:#:' test/rubygems/test_gem_package.rb || die
# Remove failing tests. Before we did not run any tests at
diff --git a/dev-ruby/rubygems/rubygems-2.0.14.ebuild b/dev-ruby/rubygems/rubygems-2.0.14.ebuild
index 368a8820e3a7..f5e3b9ac6004 100644
--- a/dev-ruby/rubygems/rubygems-2.0.14.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.0.14.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.14.ebuild,v 1.12 2014/07/02 10:33:11 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.14.ebuild,v 1.13 2014/07/05 09:11:46 mrueg Exp $
EAPI=5
@@ -58,11 +58,6 @@ all_ruby_prepare() {
each_ruby_prepare() {
case ${RUBY} in
- *ruby18)
- # Remove test failing on ruby18. According to travis.yml
- # upstream no longer cares.
- sed -i -e '/test_install_location_extra_slash/,/^ end/ s:^:#:' test/rubygems/test_gem_package.rb || die
- ;;
*jruby)
sed -i -e '/test_install_location_extra_slash/,/^ end/ s:^:#:' test/rubygems/test_gem_package.rb || die
# Remove failing tests. Before we did not run any tests at
diff --git a/dev-ruby/rubygems/rubygems-2.0.3.ebuild b/dev-ruby/rubygems/rubygems-2.0.3.ebuild
index e1b1ac958e41..9d42e71304e5 100644
--- a/dev-ruby/rubygems/rubygems-2.0.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-2.0.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.3.ebuild,v 1.13 2014/07/02 10:33:11 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rubygems/rubygems-2.0.3.ebuild,v 1.14 2014/07/05 09:11:46 mrueg Exp $
EAPI=5
@@ -58,11 +58,6 @@ all_ruby_prepare() {
each_ruby_prepare() {
case ${RUBY} in
- *ruby18)
- # Remove test failing on ruby18. According to travis.yml
- # upstream no longer cares.
- sed -i -e '/test_install_location_extra_slash/,/^ end/ s:^:#:' test/rubygems/test_gem_package.rb || die
- ;;
*jruby)
sed -i -e '/test_install_location_extra_slash/,/^ end/ s:^:#:' test/rubygems/test_gem_package.rb || die
# Remove failing tests. Before we did not run any tests at
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index ccf03a4f27e1..89de3c92cc4a 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,3 +1,4 @@
DIST android-studio-ide-135.1155795-linux.zip 164228773 SHA256 c936c3e5c2f9090eee6d396e7ec358cb41f3f11ba7cd4c374123b8444c43d133 SHA512 933aff14e18309a898b0b002e04765e872f7a7ee6f9e155ad887ebfe15d2a0710444f5d86da4389240bc5759dbe8d8943cfba70bc19e2b159c7bf0918ebd3ebe WHIRLPOOL c72b2be24464f078c76ade887f608a8b41fde372ba0afe7b12508cbc5d685a872e0ff3a965ee4d50eda8a795754e2d9dceba3dbfc676691631222c8b192c1797
DIST android-studio-ide-135.1195882-linux.zip 165365418 SHA256 21bd7bea5cfab59dfca97c9ebd39f11968c29991b257dcffc58ec642cd885854 SHA512 c56680e63b85d0f9b81da0511c053c2e213893dd23a3150b1028e827f65518d88097b605ca03f70aead36a4575854ae461b6926a4fcd241a43ec999cb4524153 WHIRLPOOL 43ce48d4773667aef3d44b6e9697190c7a994be21c0967ab1fccf440b8b5069c29d34c4a1daba34cf13d56e1e4bc37876b1db6ac24b65a7aa44395ec641dffd7
DIST android-studio-ide-135.1224218-linux.zip 165824675 SHA256 e01e0be365acedb20bb5a2c8902e997bb50c62304cf9b0986ef286ab16c47e92 SHA512 1b42f62f946f6d3a16405083382fa5f356e66391d8fc5104d12e15ef6e82570b6493cdfde949478db246fab0fb0a05cda0506fb7643c8934faa1d5e8a6b8dfc4 WHIRLPOOL 8e293e92d9f2376f1cb4814a3c5a14b64061e085c26c8bed04274b50a66e181ee538a6269da8ee5d5ec6c6449fe05364d9fcd7ad847af48f357065423807ba80
+DIST android-studio-ide-135.1248636-linux.zip 168195420 SHA256 aaeec83a5dbfc66e410765a2223ec41d4b360201d9a0e2daade5b6646c936d76 SHA512 f59a7bd6dad8e1b6762471df7d0c7119d39e62ac5d3a5fe5efa2a3994c09252e4d492c3514fc7302034a522d2cfdef547ed0443f3d05f5407962822c17f2b07a WHIRLPOOL f5fbee03bc14673ff7462192a1e82edf134e68f68f5f0356b28d3da6a2a5a87cfbf18819bf04ed6757c2573e97ae22e9008897bc6dd56510fc24836f6f4fc33b
diff --git a/dev-util/android-studio/android-studio-0.8.1.135.1248636.ebuild b/dev-util/android-studio/android-studio-0.8.1.135.1248636.ebuild
new file mode 100644
index 000000000000..d428bc873b0c
--- /dev/null
+++ b/dev-util/android-studio/android-studio-0.8.1.135.1248636.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/android-studio/android-studio-0.8.1.135.1248636.ebuild,v 1.1 2014/07/05 08:40:37 swift Exp $
+
+EAPI=5
+inherit eutils versionator
+
+RESTRICT="strip"
+QA_TEXTRELS="opt/${P}/bin/libbreakgen.so"
+STUDIO_V=$(get_version_component_range 1-3)
+BUILD_V=$(get_version_component_range 4-5)
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="http://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip"
+RDEPEND=">=virtual/jdk-1.7"
+S=${WORKDIR}/${PN}
+
+src_install() {
+ local dir="/opt/${PN}"
+
+ insinto "${dir}"
+ doins -r *
+ fperms 755 "${dir}/bin/studio.sh" "${dir}/bin/fsnotifier" "${dir}/bin/fsnotifier64"
+
+ newicon "bin/idea.png" "${PN}.png"
+ make_wrapper ${PN} ${dir}/bin/studio.sh
+ make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE"
+}
diff --git a/dev-util/cmake/cmake-2.8.12.2.ebuild b/dev-util/cmake/cmake-2.8.12.2.ebuild
index 29f70db3b6bf..e5cb5ca1b01f 100644
--- a/dev-util/cmake/cmake-2.8.12.2.ebuild
+++ b/dev-util/cmake/cmake-2.8.12.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.2.ebuild,v 1.9 2014/06/10 00:26:03 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.2.ebuild,v 1.13 2014/07/04 19:49:46 ago Exp $
EAPI=5
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.cmake.org/"
SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
LICENSE="CMake"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ~ppc ~ppc64 s390 sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
SLOT="0"
IUSE="emacs ncurses qt4 qt5"
diff --git a/dev-util/imediff2/imediff2-1.1.2-r2.ebuild b/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
similarity index 63%
rename from dev-util/imediff2/imediff2-1.1.2-r2.ebuild
rename to dev-util/imediff2/imediff2-1.1.2-r3.ebuild
index 1a1599531fee..11186a82ddaf 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r2.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/imediff2/imediff2-1.1.2-r2.ebuild,v 1.3 2013/08/15 03:44:36 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/imediff2/imediff2-1.1.2-r3.ebuild,v 1.1 2014/07/04 15:23:21 dev-zero Exp $
-EAPI="4"
+EAPI="5"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="ncurses"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses"
-inherit python versionator
+inherit python-single-r1 versionator
MY_P=${PN}_$(replace_version_separator 3 -)
@@ -20,27 +20,19 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-DEPEND="dev-lang/python[ncurses]"
+DEPEND="${PYTHON_DEPS}"
RDEPEND="${DEPEND}"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
S=${WORKDIR}/${PN}
-pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
- python_convert_shebangs 2 imediff2
-}
-
src_compile() {
# Otherwise the docs get regenerated :)
:
}
src_install() {
- dobin imediff2
+ python_doscript imediff2
dodoc AUTHORS README
doman imediff2.1
}
diff --git a/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild b/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild
index 8173d8d3cdf3..24387e3aa011 100644
--- a/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild
+++ b/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild,v 1.3 2014/06/24 21:56:52 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.28-r1.ebuild,v 1.4 2014/07/05 14:50:04 jer Exp $
EAPI=5
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
inherit autotools git-2
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
fi
diff --git a/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch b/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch
index 053664a77505..fbbb1cbf20f0 100644
--- a/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch
+++ b/dev-util/regexxer/files/regexxer-0.10-glib-2.32.patch
@@ -1,8 +1,8 @@
Downloaded from https://projects.archlinux.org/svntogit/community.git/plain/trunk/regexxer-glib2.32.patch?h=packages/regexxer
for bug 417049
---- regexxer-0.10/src/fileshared.h
-+++ regexxer-0.10/src/fileshared.h
+--- a/src/fileshared.h
++++ b/src/fileshared.h
@@ -23,6 +23,7 @@
#include "sharedptr.h"
@@ -11,8 +11,8 @@ for bug 417049
#include
#include
#include
---- regexxer-0.10/src/globalstrings.h
-+++ regexxer-0.10/src/globalstrings.h
+--- a/src/globalstrings.h
++++ b/src/globalstrings.h
@@ -21,7 +21,7 @@
#ifndef REGEXXER_GLOBALSTRINGS_H_INCLUDED
#define REGEXXER_GLOBALSTRINGS_H_INCLUDED
@@ -22,8 +22,8 @@ for bug 417049
namespace Regexxer
{
---- regexxer-0.10/src/translation.h
-+++ regexxer-0.10/src/translation.h
+--- a/src/translation.h
++++ b/src/translation.h
@@ -21,7 +21,7 @@
#ifndef REGEXXER_TRANSLATION_H_INCLUDED
#define REGEXXER_TRANSLATION_H_INCLUDED
diff --git a/dev-util/regexxer/files/regexxer-0.10-sandbox.patch b/dev-util/regexxer/files/regexxer-0.10-sandbox.patch
index de6c2bf0b4ff..f460344b8ad7 100644
--- a/dev-util/regexxer/files/regexxer-0.10-sandbox.patch
+++ b/dev-util/regexxer/files/regexxer-0.10-sandbox.patch
@@ -1,5 +1,5 @@
---- Makefile.am
-+++ Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
@@ -107,12 +107,6 @@
@INTLTOOL_DESKTOP_RULE@
@INTLTOOL_XML_NOMERGE_RULE@
diff --git a/dev-util/regexxer/regexxer-0.10.ebuild b/dev-util/regexxer/regexxer-0.10.ebuild
index 4fb9328d183f..7b6796aa2502 100644
--- a/dev-util/regexxer/regexxer-0.10.ebuild
+++ b/dev-util/regexxer/regexxer-0.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/regexxer-0.10.ebuild,v 1.4 2012/05/22 10:13:56 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/regexxer/regexxer-0.10.ebuild,v 1.5 2014/07/04 14:03:47 jer Exp $
-EAPI=4
+EAPI=5
GCONF_DEBUG=no
inherit autotools eutils gnome2
@@ -13,7 +13,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
RDEPEND=">=dev-cpp/glibmm-2.28
dev-cpp/gtkmm:3.0
@@ -23,9 +22,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
sys-devel/gettext"
-pkg_setup() {
- DOCS="AUTHORS ChangeLog NEWS README"
-}
+DOCS=( AUTHORS ChangeLog NEWS README )
src_prepare() {
epatch "${FILESDIR}"/${P}-glib-2.32.patch
diff --git a/dev-util/reviewboard/metadata.xml b/dev-util/reviewboard/metadata.xml
index 2077bc6dbb1d..d43f04946811 100644
--- a/dev-util/reviewboard/metadata.xml
+++ b/dev-util/reviewboard/metadata.xml
@@ -5,10 +5,6 @@
idella4@gentoo.org
Ian Delaney
-
- kensington@gentoo.org
- Michael Palimaka
-