diff --git a/app-arch/dpkg/dpkg-1.16.9.ebuild b/app-arch/dpkg/dpkg-1.16.9.ebuild
index f842336dab85..17c2c220e135 100644
--- a/app-arch/dpkg/dpkg-1.16.9.ebuild
+++ b/app-arch/dpkg/dpkg-1.16.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.9.ebuild,v 1.1 2012/10/22 09:14:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/dpkg/dpkg-1.16.9.ebuild,v 1.2 2012/11/26 12:23:18 jer Exp $
EAPI=4
inherit eutils multilib autotools toolchain-funcs
@@ -64,16 +64,17 @@ src_prepare() {
src_configure() {
tc-export CC
econf \
- ${myconf} \
$(use_enable dselect) \
$(use_enable unicode) \
$(use_with bzip2 bz2) \
$(use_with zlib) \
- --disable-compiler-warnings \
+ ${myconf} \
--disable-compiler-optimisations \
+ --disable-compiler-warnings \
--disable-linker-optimisations \
- --without-selinux \
- --disable-start-stop-daemon
+ --disable-start-stop-daemon \
+ --localstatedir=/var \
+ --without-selinux
}
src_install() {
diff --git a/app-emacs/magit/Manifest b/app-emacs/magit/Manifest
index 2089a0cc9af6..425e750864d2 100644
--- a/app-emacs/magit/Manifest
+++ b/app-emacs/magit/Manifest
@@ -1,2 +1,3 @@
DIST magit-1.0.0.tar.gz 60561 SHA256 f87393137f2ddf814dd79e31986289a00357fa479774b4c3b0f19bd440a2cdc1 SHA512 527cf4799c183a4b928f4cbf0e81e8933d23291b2dd4a8a94d1e408126bf0e4c6cd36cdbfea928d0b976b9311f7d9497428bd2035b5fb8a4429e9804e0906f51 WHIRLPOOL 35ff3f1c23c30894ac337cb3327da08096a92010a91d673fdb36c7cf347841bcf1ed065e01b03f3c33884487fc210b06bef8e01b5307a0d356d189f4e8c1c40f
DIST magit-1.1.1.tar.gz 97241 SHA256 9ffdfddad0023262df6e7ff90a15a3f170e1a8127c9cec848d54d57b63c7e57e SHA512 2a3cca13ddd30fac5bd72fd24723b4cb91ee4ab77d6bd79675d699592dd58eaa55cc388cd3c9c6f89aa23c690781193d093a20247539dd0953e876cf93aadce0 WHIRLPOOL 2fa2670f4eeb56b0a648de99777a228e957d9942c561fd7333add5a8c8a59c814c61f01aef00bc237610e483f738a3846b8f268e401d5e8e21feddd3f7f3bbc3
+DIST magit-1.2.0.tar.gz 163318 SHA256 ef535819b8ee32c53ad38efabc82028f62422f2629407d69ddc5970669dc1ba9 SHA512 3f673d38d9f73cdf653108184ed97c1d499492224be3925949ffadb3bb6900a9be664c773dae49da696c6e1daa8bbb70d7446a9f9d7f9a7f8714ca254ed02c3d WHIRLPOOL 0462ea59ae75c01992d6d7dd17783ab4c60c335c17e03a8791be0771caf54d6a546a84c0622f2c1d45d1231a8d2638fb936bff31c94aa08a10d2c98e5986e4a4
diff --git a/app-emacs/magit/magit-1.0.0.ebuild b/app-emacs/magit/magit-1.0.0.ebuild
index 234defa85966..c612fe26c6d3 100644
--- a/app-emacs/magit/magit-1.0.0.ebuild
+++ b/app-emacs/magit/magit-1.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.0.0.ebuild,v 1.2 2012/04/02 17:54:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.0.0.ebuild,v 1.3 2012/11/26 11:31:15 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="An Emacs mode for GIT"
HOMEPAGE="http://magit.github.com/magit/"
SRC_URI="http://github.com/downloads/magit/magit/${P}.tar.gz"
-LICENSE="GPL-3 FDL-1.2"
+LICENSE="GPL-3+ FDL-1.2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
diff --git a/app-emacs/magit/magit-1.1.1.ebuild b/app-emacs/magit/magit-1.1.1.ebuild
index 27a011545bb3..d1820646d88b 100644
--- a/app-emacs/magit/magit-1.1.1.ebuild
+++ b/app-emacs/magit/magit-1.1.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.1.1.ebuild,v 1.1 2012/04/02 17:54:02 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.1.1.ebuild,v 1.2 2012/11/26 11:31:15 ulm Exp $
EAPI=4
@@ -10,7 +10,7 @@ DESCRIPTION="An Emacs mode for GIT"
HOMEPAGE="http://magit.github.com/magit/"
SRC_URI="http://github.com/downloads/magit/magit/${P}.tar.gz"
-LICENSE="GPL-3 FDL-1.2"
+LICENSE="GPL-3+ FDL-1.2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="contrib"
diff --git a/app-emacs/magit/magit-1.2.0.ebuild b/app-emacs/magit/magit-1.2.0.ebuild
new file mode 100644
index 000000000000..bfa88a4e2729
--- /dev/null
+++ b/app-emacs/magit/magit-1.2.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/magit/magit-1.2.0.ebuild,v 1.1 2012/11/26 11:31:15 ulm Exp $
+
+EAPI=5
+
+inherit elisp
+
+DESCRIPTION="An Emacs mode for GIT"
+HOMEPAGE="http://magit.github.com/magit/"
+SRC_URI="http://github.com/downloads/magit/magit/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="contrib"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+ emake core docs
+ use contrib && emake contrib
+ rm 50magit.el magit-pkg.el || die
+}
+
+src_install() {
+ elisp-install ${PN} *.{el,elc} || die
+ elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+ doinfo magit.info
+ dodoc README.md
+
+ if use contrib; then
+ elisp-install ${PN} contrib/*.{el,elc} || die
+ dobin contrib/magit
+ fi
+}
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 6281368ef055..91cc2602acd3 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.133 2012/11/24 13:47:16 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.134 2012/11/26 12:55:56 scarabeus Exp $
EAPI=4
@@ -68,9 +68,10 @@ unset EXT_URI
unset ADDONS_SRC
IUSE="bluetooth +branding +cups dbus eds gnome gstreamer +gtk gtk3
-jemalloc kde mysql nsplugin odk opengl postgres telepathy test +vba +webdav"
+jemalloc kde mysql nsplugin odk opengl pdfimport postgres telepathy
+test +vba +webdav"
-LO_EXTS="nlpsolver pdfimport presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
+LO_EXTS="nlpsolver presenter-console presenter-minimizer scripting-beanshell scripting-javascript wiki-publisher"
# Unpackaged separate extensions:
# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
# hunart: only on ooo extensions -> fubared download path somewhere on sf
@@ -140,7 +141,6 @@ COMMON_DEPEND="
>=media-libs/gst-plugins-base-0.10:0.10
)
jemalloc? ( dev-libs/jemalloc )
- libreoffice_extensions_pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
libreoffice_extensions_wiki-publisher? (
@@ -156,6 +156,7 @@ COMMON_DEPEND="
virtual/glu
virtual/opengl
)
+ pdfimport? ( >=app-text/poppler-0.16[xpdf-headers(+),cxx] )
postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
telepathy? (
dev-libs/glib:2
@@ -494,6 +495,7 @@ src_configure() {
$(use_enable nsplugin) \
$(use_enable odk) \
$(use_enable opengl) \
+ $(use_enable pdfimport) \
$(use_enable postgres postgresql-sdbc) \
$(use_enable telepathy) \
$(use_enable test linkoo) \
diff --git a/dev-cpp/gtkmm/metadata.xml b/dev-cpp/gtkmm/metadata.xml
index b21acc696c0c..57c9d9c1a1d8 100644
--- a/dev-cpp/gtkmm/metadata.xml
+++ b/dev-cpp/gtkmm/metadata.xml
@@ -2,7 +2,4 @@
gnome-mm
-
diff --git a/dev-db/ctdb/ctdb-1.13.ebuild b/dev-db/ctdb/ctdb-1.13.ebuild
index 8c065b72743f..cc1a422ae19f 100644
--- a/dev-db/ctdb/ctdb-1.13.ebuild
+++ b/dev-db/ctdb/ctdb-1.13.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.13.ebuild,v 1.1 2012/03/23 10:55:46 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/ctdb/ctdb-1.13.ebuild,v 1.2 2012/11/26 11:59:39 ago Exp $
EAPI=4
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE=""
DEPEND="dev-libs/popt"
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index ad767164b3a0..265d55c36b4e 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -2,6 +2,8 @@ DIST libnl-1.1.tar.gz 288932 SHA256 35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b83
DIST libnl-3.2.13.tar.gz 1177080 SHA256 4deba0ecec0e5aede900b5676ed56d727b688e3d49f3e732c7e294a6a920bcf9 SHA512 30f8063caf288a596e18f3162fdfef1e67d1584322f5064bef3978d2e874177c0dcc9486ab92f7f737896a102e772f15a54451c886436f01abebb3e38e36a2ee WHIRLPOOL dbb2a8b3c69ee53f3cc0019596ba37984b359079ccb88444fb44db3bf387a9215bf2442ce4d48e697244278ef92d245c92895147cb9779382e652651d58cc75e
DIST libnl-3.2.14.tar.gz 687883 SHA256 6bb043eea08765bada37a053d932f073db9d51e7a8cd419e237c785ba6369e2c SHA512 14e9b733beb985d83bb4672087c91734954a6e90fe71a825dc089ab797ddf6a9e9ee39a046c5b996a3a0184588160a47830a368540831443615793a1eef647f5 WHIRLPOOL 34f6e4cb8b07b67a5b5abfaa59a0a45f114921b894959ede2e7b44640d6aa012a4bc1e08752b31b11035b745001a43716c3e093b4ccfecfa99a0f6a0b65a7539
DIST libnl-3.2.15.tar.gz 712039 SHA256 756f8b31f74e087f180340aa28a181f698062965ca69936ab089f7f6741e6ea9 SHA512 3b9ee8bdb6daba06aa8ecf21466d4d9252988a772a7cd3c306ecb248e7e58a1605c7dcfd62591dae51b47e284fee3c55da28cba09da587eddabc49a1283673f9 WHIRLPOOL 03ff7dbf875d1fa6e9bc01835551d2c2ee1e41c6510d0725c4278a0ca4d281b79e2749ac182846f6e993b6553762248a8bdeb05ac3675d65d11e79cc7194c010
+DIST libnl-3.2.16.tar.gz 712043 SHA256 c43a42336c6a3cf559f390e202f8f029d165bd767da7cf7a32a815c570b31826 SHA512 7aaeac4b13a374bc89bebd932da522223776c7c3462002bd9c6b9c1fde1ff3620518b335e117ee78f5da0007a19b85c82078c21348db6ad9aa684da7c2083aa9 WHIRLPOOL dd43f8f4a2eb787a84a77ea0e54bcd4401822d333d57fca427fb4ba760ae81be58a8ac916e42decde2fc8f6ee2d7dc8fe570e046d8bff3c82317fb280199542f
DIST libnl-3.2.7.tar.gz 1124758 SHA256 1141f3229ebf65f6cee43a898d4832b8c17cb942e23adeccb365e75708a2b08e SHA512 be060ca030a83869575e22761b106e206c9545be92c18e61f09dce99476237ea71ebfb777ebb7ee17da6a2e3886fdfd30ae1fc6b37b775ba6a74cdd79568d1f3 WHIRLPOOL e7ed8f3f1d662d784527ce2a7bfaf5c34c39fbe3a7c1bf799e7cd3aa31703fe662bb3eb0ad59f55ca5b2d9e62946646117bce7ecae99f8b32f201120d11a1dde
DIST libnl-doc-3.2.14.tar.gz 8766064 SHA256 1db05aaa61c14ee578fa432cc1973a73379abe175859ef9e92ea033eae005e43 SHA512 2692f6d4c3e3a9d4fe9cc210fdb03751356daaebe19f8d9041804252a6c220dfc7ad4e72da428b56ade30afa2ef3ec3b6c86416f07b12013403dad8f735b0c0b WHIRLPOOL f55436bc28750f4d4d1bf716fc73e36a01b27d8799c0b2d8fee785db3da935fae4c4ab05a03dd4c65b9ef0cc32d2c112182b4e343e97b116a28da90e3035d96c
DIST libnl-doc-3.2.15.tar.gz 11792430 SHA256 71c9aef7bf1495b5c2a488abf247ab5a4744783e8b4c6641b0bbb8e28d92605f SHA512 9224f308e3f01fd7a2d98f0cca0bf6f6d6535cfdc905c61bbb242c788a7c6121dee80c135552fd87a6e0dce31be4dea89e981066982f9d4f96b29f35ce92458c WHIRLPOOL 58902aff10580f1374dca9885060a20d32aedf1264c628c0105a860c8870d1ff9f4491a5b16389fb677815ae19aa98b9218ca3ce46385510d4bc88d0f5e574f9
+DIST libnl-doc-3.2.16.tar.gz 11792430 SHA256 71c9aef7bf1495b5c2a488abf247ab5a4744783e8b4c6641b0bbb8e28d92605f SHA512 9224f308e3f01fd7a2d98f0cca0bf6f6d6535cfdc905c61bbb242c788a7c6121dee80c135552fd87a6e0dce31be4dea89e981066982f9d4f96b29f35ce92458c WHIRLPOOL 58902aff10580f1374dca9885060a20d32aedf1264c628c0105a860c8870d1ff9f4491a5b16389fb677815ae19aa98b9218ca3ce46385510d4bc88d0f5e574f9
diff --git a/dev-libs/libnl/libnl-3.2.16.ebuild b/dev-libs/libnl/libnl-3.2.16.ebuild
new file mode 100644
index 000000000000..ef1a48ce3318
--- /dev/null
+++ b/dev-libs/libnl/libnl-3.2.16.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-3.2.16.ebuild,v 1.1 2012/11/26 17:41:47 zerochaos Exp $
+
+EAPI=4
+inherit eutils libtool multilib
+
+DESCRIPTION="A library for applications dealing with netlink socket"
+HOMEPAGE="http://www.infradead.org/~tgr/libnl/"
+SRC_URI="
+ http://www.infradead.org/~tgr/libnl/files/${P}.tar.gz
+ http://www.infradead.org/~tgr/libnl/files/${PN}-doc-${PV}.tar.gz
+"
+LICENSE="LGPL-2.1 doc? ( GPL-2 ) utils? ( GPL-2 )"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="doc static-libs utils"
+
+DEPEND="
+ sys-devel/flex
+ sys-devel/bison
+"
+
+src_prepare() {
+ elibtoolize
+ epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch
+}
+
+src_configure() {
+ econf \
+ --disable-silent-rules \
+ $(use_enable static-libs static) \
+ $(use_enable utils cli)
+}
+
+src_install() {
+ default
+ if use doc; then
+ dohtml -r \
+ -a css,html,js,map,png \
+ "${WORKDIR}"/${PN}-doc-${PV}/*
+ fi
+
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib*.la
+
+ dodoc ChangeLog
+}
diff --git a/dev-libs/ucommon/Manifest b/dev-libs/ucommon/Manifest
index dd29902feb9d..b754f586610a 100644
--- a/dev-libs/ucommon/Manifest
+++ b/dev-libs/ucommon/Manifest
@@ -1 +1,3 @@
DIST ucommon-5.2.2.tar.gz 792081 SHA256 9d5f3f4d1ef897482fe470b0dd65b0df516aaeb874eac3a33a455abca13f39e9 SHA512 5d5e526675cb39dffea48c38a14dff4eb1316a59c60e2352cfdbb0727ff4db00417e9704026f106da5d34f92ec2be3385b0763d66196f345f0b775bf62eb0125 WHIRLPOOL f857c4b06aff4bbb1ff84edc810d674c7d77a92bb4bcdb62fed64e77e9979c7d736b93596166de6c5fb848745aa7efc1b666231bdb6a33c3b959953b4b114ac2
+DIST ucommon-5.5.0.tar.gz 803892 SHA256 fd4b885ee5abdb3cc44a501d92428af71e1c50ff9166a0e5c5fdbdf16a853d8d SHA512 c860d0134a5c888bbbd008b1716eff985f152a8bf3e3ee54b85adcf89f3d073ea1d080a071def3314584579841a270f5323a7c092bf516af9efb2b3180b12440 WHIRLPOOL c7baf57390c415011a48fa7472932d73778b1f2a0b435de55a8d6564061ca28c29ef0660f03727853f7d96b6ea8f0d1e8afc99fff9556de4694ea9694f8363c3
+DIST ucommon-6.0.0.tar.gz 806713 SHA256 b28fe9c9f596c58bb796ec4aab54db7c525c8ad42bf5b7c57fe08d7d260c5099 SHA512 1482be954582317535e7b3668b433e4ee2bfe53ad05a7391f1152e19895221411b1900f66b0971c642bf1c5ff76241fc2d7ebd3ad020d20fce1e46d32d228bf7 WHIRLPOOL 546623fe5f5d4807c0f04145627b0e69f67022f15daf3ad6a49a69ef7c6a9be61cbbd9a255a674e2ea1f6cec54a65a5efe266b97243bc8f8946ae131b375a23e
diff --git a/dev-libs/ucommon/files/gcrypt_autotools.patch b/dev-libs/ucommon/files/gcrypt_autotools.patch
new file mode 100644
index 000000000000..8a5b93ffbdcd
--- /dev/null
+++ b/dev-libs/ucommon/files/gcrypt_autotools.patch
@@ -0,0 +1,62 @@
+diff --git a/Makefile.am b/Makefile.am
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,6 +8,8 @@
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
++ACLOCAL_AMFLAGS = -I m4
++
+ AUTOMAKE_OPTIONS = no-dependencies dist-zip
+ EXTRA_DIST = autogen.sh README* *.pc.in *.spec.in *.spec *-config.in \
+ *-config.1 Doxyfile cmodel.sh BUILDS SUPPORT COPYING* COPYRIGHT \
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,8 +37,12 @@
+ UCOMMON_LIBS=""
+ OPENSSL_LINK=""
+
++AM_SILENT_RULES([yes])
++
+ CHECKFLAGS="$CHECKFLAGS"
+
++m4_include([m4/libgcrypt.m4])
++
+ case "$with_crypto" in
+ ssl|openssl)
+ ssl="openssl"
+@@ -664,7 +668,8 @@
+ ;;
+ gnutls|gnu)
+ if test ! -z "$GNUTLS_LIBS" ; then
+- SECURE_LIBS="$GNUTLS_LIBS"
++ AM_PATH_LIBGCRYPT
++ SECURE_LIBS="$GNUTLS_LIBS $LIBGCRYPT_LIBS"
+ SECURE="gnutls"
+ fi
+ ;;
+diff --git a/utils/Makefile.am b/utils/Makefile.am
+--- a/utils/Makefile.am
++++ b/utils/Makefile.am
+@@ -9,9 +9,9 @@
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ MAINTAINERCLEANFILES = Makefile.in Makefile
+-AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@
++AM_CXXFLAGS = -I$(top_srcdir)/inc @UCOMMON_FLAGS@ @LIBGCRYPT_CFLAGS@
+ INCLUDES = -I$(top_srcdir)/inc
+-LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@
++LDADD = ../corelib/libucommon.la @UCOMMON_LIBS@ @UCOMMON_CLINK@ @LIBGCRYPT_LIBS@
+ EXTRA_DIST = *.1
+
+ man_MANS = args.1 scrub-files.1 mdsum.1 zerofill.1 car.1 sockaddr.1 pdetach.1
+@@ -27,7 +27,7 @@
+ scrub_files_LDFLAGS = @SECURE_LOCAL@
+
+ mdsum_SOURCES = mdsum.cpp
+-mdsum_LDFLAGS = @SECURE_LOCAL@
++mdsum_LDFLAGS = @SECURE_LOCAL@ @LIBGCRYPT_LIBS@
+
+ zerofill_SOURCES = zerofill.cpp
+ zerofill_LDFLAGS = @SECURE_LOCAL@
diff --git a/dev-libs/ucommon/files/install_gcrypt.m4_file.patch b/dev-libs/ucommon/files/install_gcrypt.m4_file.patch
new file mode 100644
index 000000000000..5fb0cc3b878d
--- /dev/null
+++ b/dev-libs/ucommon/files/install_gcrypt.m4_file.patch
@@ -0,0 +1,128 @@
+diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4
+new file mode 100644
+--- /dev/null
++++ m4/libgcrypt.m4
+@@ -0,0 +1,123 @@
++dnl Autoconf macros for libgcrypt
++dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
++dnl
++dnl This file is free software; as a special exception the author gives
++dnl unlimited permission to copy and/or distribute it, with or without
++dnl modifications, as long as this notice is preserved.
++dnl
++dnl This file is distributed in the hope that it will be useful, but
++dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
++dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++
++dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
++dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
++dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
++dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
++dnl with the API version to also check the API compatibility. Example:
++dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
++dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
++dnl this features allows to prevent build against newer versions of libgcrypt
++dnl with a changed API.
++dnl
++AC_DEFUN([AM_PATH_LIBGCRYPT],
++[ AC_ARG_WITH(libgcrypt-prefix,
++ AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
++ [prefix where LIBGCRYPT is installed (optional)]),
++ libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
++ if test x$libgcrypt_config_prefix != x ; then
++ if test x${LIBGCRYPT_CONFIG+set} != xset ; then
++ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
++ fi
++ fi
++
++ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no)
++ tmp=ifelse([$1], ,1:1.2.0,$1)
++ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
++ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
++ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
++ else
++ req_libgcrypt_api=0
++ min_libgcrypt_version="$tmp"
++ fi
++
++ AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
++ ok=no
++ if test "$LIBGCRYPT_CONFIG" != "no" ; then
++ req_major=`echo $min_libgcrypt_version | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
++ req_minor=`echo $min_libgcrypt_version | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
++ req_micro=`echo $min_libgcrypt_version | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
++ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
++ major=`echo $libgcrypt_config_version | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
++ minor=`echo $libgcrypt_config_version | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
++ micro=`echo $libgcrypt_config_version | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
++ if test "$major" -gt "$req_major"; then
++ ok=yes
++ else
++ if test "$major" -eq "$req_major"; then
++ if test "$minor" -gt "$req_minor"; then
++ ok=yes
++ else
++ if test "$minor" -eq "$req_minor"; then
++ if test "$micro" -ge "$req_micro"; then
++ ok=yes
++ fi
++ fi
++ fi
++ fi
++ fi
++ fi
++ if test $ok = yes; then
++ AC_MSG_RESULT([yes ($libgcrypt_config_version)])
++ else
++ AC_MSG_RESULT(no)
++ fi
++ if test $ok = yes; then
++ # If we have a recent libgcrypt, we should also check that the
++ # API is compatible
++ if test "$req_libgcrypt_api" -gt 0 ; then
++ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
++ if test "$tmp" -gt 0 ; then
++ AC_MSG_CHECKING([LIBGCRYPT API version])
++ if test "$req_libgcrypt_api" -eq "$tmp" ; then
++ AC_MSG_RESULT([okay])
++ else
++ ok=no
++ AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
++ fi
++ fi
++ fi
++ fi
++ if test $ok = yes; then
++ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
++ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
++ ifelse([$2], , :, [$2])
++ if test x"$host" != x ; then
++ libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none`
++ if test x"$libgcrypt_config_host" != xnone ; then
++ if test x"$libgcrypt_config_host" != x"$host" ; then
++ AC_MSG_WARN([[
++***
++*** The config script $LIBGCRYPT_CONFIG was
++*** built for $libgcrypt_config_host and thus may not match the
++*** used host $host.
++*** You may want to use the configure option --with-libgcrypt-prefix
++*** to specify a matching config script.
++***]])
++ fi
++ fi
++ fi
++ else
++ LIBGCRYPT_CFLAGS=""
++ LIBGCRYPT_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
++ AC_SUBST(LIBGCRYPT_CFLAGS)
++ AC_SUBST(LIBGCRYPT_LIBS)
++])
diff --git a/dev-libs/ucommon/ucommon-5.5.0.ebuild b/dev-libs/ucommon/ucommon-5.5.0.ebuild
new file mode 100644
index 000000000000..a306568f23a4
--- /dev/null
+++ b/dev-libs/ucommon/ucommon-5.5.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-5.5.0.ebuild,v 1.1 2012/11/26 18:05:54 maksbotan Exp $
+
+EAPI="4"
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Portable C++ runtime for threads and sockets"
+HOMEPAGE="http://www.gnu.org/software/commoncpp"
+SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="doc static-libs socks +cxx debug ssl gnutls"
+
+RDEPEND="ssl? (
+ !gnutls? ( dev-libs/openssl )
+ gnutls? (
+ net-libs/gnutls
+ dev-libs/libgcrypt
+ )
+ )"
+
+DEPEND="virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ ${RDEPEND}"
+
+DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
+PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch
+ "${FILESDIR}"/install_gcrypt.m4_file.patch
+ "${FILESDIR}"/gcrypt_autotools.patch )
+
+#"${FILESDIR}/${P}-address.patch"
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_configure() {
+ local myconf=""
+ if use ssl; then
+ myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
+ else
+ myconf+=" --with-sslstack=nossl ";
+ fi
+
+ local myeconfargs=(
+ $(use_enable socks)
+ $(use_enable cxx stdcpp)
+ ${myconf}
+ --enable-atomics
+ --with-pkg-config
+ )
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+ use doc && autotools-utils_src_compile doxy
+}
+
+src_install() {
+ autotools-utils_src_install
+ if use doc; then
+ dohtml doc/html/*
+ fi
+}
diff --git a/dev-libs/ucommon/ucommon-6.0.0.ebuild b/dev-libs/ucommon/ucommon-6.0.0.ebuild
new file mode 100644
index 000000000000..c5a923b20745
--- /dev/null
+++ b/dev-libs/ucommon/ucommon-6.0.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ucommon/ucommon-6.0.0.ebuild,v 1.1 2012/11/26 18:05:54 maksbotan Exp $
+
+EAPI="4"
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils eutils
+
+DESCRIPTION="Portable C++ runtime for threads and sockets"
+HOMEPAGE="http://www.gnu.org/software/commoncpp"
+SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+IUSE="doc static-libs socks +cxx debug ssl gnutls"
+
+RDEPEND="ssl? (
+ !gnutls? ( dev-libs/openssl )
+ gnutls? (
+ net-libs/gnutls
+ dev-libs/libgcrypt
+ )
+ )"
+
+DEPEND="virtual/pkgconfig
+ doc? ( app-doc/doxygen )
+ ${RDEPEND}"
+
+DOCS=(README NEWS SUPPORT ChangeLog AUTHORS)
+PATCHES=( "${FILESDIR}"/disable_rtf_gen_doxy.patch
+ "${FILESDIR}"/install_gcrypt.m4_file.patch
+ "${FILESDIR}"/gcrypt_autotools.patch )
+
+#"${FILESDIR}/${P}-address.patch"
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+src_configure() {
+ local myconf=""
+ if use ssl; then
+ myconf+=" --with-sslstack=$(usex gnutls gnu ssl) "
+ else
+ myconf+=" --with-sslstack=nossl ";
+ fi
+
+ local myeconfargs=(
+ $(use_enable socks)
+ $(use_enable cxx stdcpp)
+ ${myconf}
+ --enable-atomics
+ --with-pkg-config
+ )
+ autotools-utils_src_configure
+}
+
+src_compile() {
+ autotools-utils_src_compile
+ use doc && autotools-utils_src_compile doxy
+}
+
+src_install() {
+ autotools-utils_src_install
+ if use doc; then
+ dohtml doc/html/*
+ fi
+}
diff --git a/dev-python/pry/metadata.xml b/dev-python/pry/metadata.xml
index 9300f12fbb80..f690c1d00486 100644
--- a/dev-python/pry/metadata.xml
+++ b/dev-python/pry/metadata.xml
@@ -6,4 +6,7 @@
radhermit@gentoo.org
Tim Harder
+
+ pry
+
diff --git a/dev-python/rdflib/rdflib-3.2.3.ebuild b/dev-python/rdflib/rdflib-3.2.3.ebuild
index d386c3be4a2e..3e34dc164b10 100644
--- a/dev-python/rdflib/rdflib-3.2.3.ebuild
+++ b/dev-python/rdflib/rdflib-3.2.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-3.2.3.ebuild,v 1.2 2012/11/25 13:26:48 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-3.2.3.ebuild,v 1.3 2012/11/26 12:27:32 idella4 Exp $
EAPI="4"
SUPPORT_PYTHON_ABIS="1"
@@ -27,6 +27,12 @@ RDEPEND="dev-python/isodate
DEPEND="${RDEPEND}
dev-python/setuptools"
+src_prepare() {
+ # Upstream manufactured .pyc files which promptly break distutils' src_test
+ distutils_src_prepare
+ find -name "*.py[c~]" -delete
+}
+
src_install() {
distutils_src_install
@@ -37,10 +43,5 @@ src_install() {
}
src_test() {
- # Only sure way to get nostests to stop trawling files it shouldn't
- testing() {
- nosetests --verbosity=1 --py3where=build/src test/test_*.py || die
- }
- python_execute_function testing
-
+ distutils_src_test --py3where='build/src'
}
diff --git a/dev-python/skype4py/metadata.xml b/dev-python/skype4py/metadata.xml
index 157326a7e891..544b8f70ae82 100644
--- a/dev-python/skype4py/metadata.xml
+++ b/dev-python/skype4py/metadata.xml
@@ -5,4 +5,7 @@
radhermit@gentoo.org
Tim Harder
+
+ Skype4Py
+
diff --git a/dev-util/complexity/Manifest b/dev-util/complexity/Manifest
index 6a6876910339..2e1401451f2e 100644
--- a/dev-util/complexity/Manifest
+++ b/dev-util/complexity/Manifest
@@ -1 +1,2 @@
DIST complexity-0.4.tar.gz 656660 SHA256 28fb64282b051de42f43f294f70a977a01624e2a772d0b052225c57dea15b336 SHA512 62f0479d499e6e08390c0c615e5bf74ecc98b020f0e143aff30bcb6cbfe277b1b0c2ce6569c57dbd4905e3fd7d01482e9b4313f0be315dcea5ab4f84f965f9e0 WHIRLPOOL 8f68893bb5eae06ee1bfcadcd0417128d04ff55d328ff74d7062b5a11db2508a62a6116e6fa1733699b67ce9dbb2a2382be1db09b0ef7d4ba03ff687af942281
+DIST complexity-1.0.tar.gz 571279 SHA256 dcf4e48d85a9752d50312c464a68e0906c035abc25890500e4593d86b135c856 SHA512 0effb51500674bebe7666a524ea35871596b8da5066b58f14a377a3c0d7ac2ec926cf01de6f980c59d4399dbacbd95ce82834476f8ae95a01723cfe78018f6b0 WHIRLPOOL 04971ae9d08f0607977598134581380cf7206e713e60bac179a579b20d1c8c602ec78009b215bd59c77fdfc24a3e8eea07304ee33df9a650f536d4958ed7373e
diff --git a/dev-util/complexity/complexity-1.0.ebuild b/dev-util/complexity/complexity-1.0.ebuild
new file mode 100644
index 000000000000..29cbda2077c6
--- /dev/null
+++ b/dev-util/complexity/complexity-1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/complexity/complexity-1.0.ebuild,v 1.1 2012/11/26 13:12:21 jer Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="a tool designed for analyzing the complexity of C program
+functions"
+HOMEPAGE="http://www.gnu.org/software/complexity/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE=""
+
+RDEPEND="
+ >=sys-devel/autogen-5.11.7
+"
+DEPEND="
+ ${RDEPEND}
+ sys-devel/libtool
+"
+
+DOCS=( ChangeLog )
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.0-ac_aux_dir.patch
+ eautoreconf
+}
diff --git a/dev-util/complexity/files/complexity-1.0-ac_aux_dir.patch b/dev-util/complexity/files/complexity-1.0-ac_aux_dir.patch
new file mode 100644
index 000000000000..c3db5713212f
--- /dev/null
+++ b/dev-util/complexity/files/complexity-1.0-ac_aux_dir.patch
@@ -0,0 +1,27 @@
+Call AC_CONFIG_AUX_DIR before it is used
+
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,19 +2,14 @@
+ m4_esyscmd([cat .tarball-version]),
+ [bkorb@gnu.org])
+
++AC_CONFIG_AUX_DIR([build-aux])
++
+ AS_BOX([Configuring AC_PACKAGE_TARNAME AC_PACKAGE_VERSION])
+ AC_USE_SYSTEM_EXTENSIONS
+
+-dnl we can't use AC_CONFIG_AUX_DIR here, because the heuristics
+-dnl for finding install-sh in the generated configure script
+-dnl consider this directory to be a subproject of gnulib proper,
+-dnl and will only look for install-sh in . and .. :(
+-dnl AC_CONFIG_AUX_DIR([build-aux])
+-dnl
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_HEADER([config.h])
+ AC_CONFIG_FILES([Makefile doc/Makefile lib/Makefile src/Makefile tests/Makefile])
+-AC_CONFIG_AUX_DIR([build-aux])
+
+ AM_INIT_AUTOMAKE([gnu check-news 1.5 dist-bzip2])
+ gl_INIT
diff --git a/eclass/distutils-r1.eclass b/eclass/distutils-r1.eclass
index 129cd49c9312..fc9416b6da7f 100644
--- a/eclass/distutils-r1.eclass
+++ b/eclass/distutils-r1.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.19 2012/11/24 21:07:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.20 2012/11/26 10:05:11 mgorny Exp $
# @ECLASS: distutils-r1
# @MAINTAINER:
@@ -59,8 +59,12 @@ if [[ ! ${_DISTUTILS_R1} ]]; then
inherit eutils python-r1
+fi
+
EXPORT_FUNCTIONS src_prepare src_configure src_compile src_test src_install
+if [[ ! ${_DISTUTILS_R1} ]]; then
+
RDEPEND=${PYTHON_DEPS}
DEPEND=${PYTHON_DEPS}
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index 96b0df51de26..aa367b71f71e 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.112 2012/11/24 19:00:49 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.113 2012/11/26 15:47:20 tetromino Exp $
# @ECLASS: gnome2.eclass
# @MAINTAINER:
@@ -200,8 +200,7 @@ gnome2_src_install() {
FAQ CREDITS CHANGELOG ; do
[[ -s "${d}" ]] && dodoc "${d}"
done
- # TODO: wrong "declare -a" command..., should be fixed in PMS at first
- elif declare -p DOCS | grep -q `^declare -a` ; then
+ elif declare -p DOCS | grep -q '^declare -a ' ; then
dodoc "${DOCS[@]}"
else
dodoc ${DOCS}
diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass
index 125dc16ae39f..1fdf803b91c1 100644
--- a/eclass/python-single-r1.eclass
+++ b/eclass/python-single-r1.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.3 2012/11/26 08:31:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.4 2012/11/26 10:05:11 mgorny Exp $
# @ECLASS: python-single-r1
# @MAINTAINER:
@@ -46,8 +46,12 @@ if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
inherit python-r1
+fi
+
EXPORT_FUNCTIONS pkg_setup
+if [[ ! ${_PYTHON_SINGLE_R1} ]]; then
+
_python_single_set_globals() {
local flags=( "${PYTHON_COMPAT[@]/#/python_single_target_}" )
local optflags=${flags[@]/%/(+)?}
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index ad569198ec15..d8e4b815cc8e 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.2 2012/11/24 21:07:14 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.3 2012/11/26 10:16:43 mgorny Exp $
# @ECLASS: python-utils-r1
# @MAINTAINER:
@@ -285,6 +285,55 @@ _python_ln_rel() {
ln -fs "${rel_path}" "${to}"
}
+# @FUNCTION: python_optimize
+# @USAGE: [...]
+# @DESCRIPTION:
+# Compile and optimize Python modules in specified directories (absolute
+# paths). If no directories are provided, the default system paths
+# are used (prepended with ${D}).
+python_optimize() {
+ debug-print-function ${FUNCNAME} "${@}"
+
+ [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).'
+
+ local PYTHON=${PYTHON}
+ [[ ${PYTHON} ]] || python_export PYTHON
+
+ # Note: python2.6 can't handle passing files to compileall...
+
+ # default to sys.path
+ if [[ ${#} -eq 0 ]]; then
+ local f
+ while IFS= read -r -d '' f; do
+ # 1) accept only absolute paths
+ # (i.e. skip '', '.' or anything like that)
+ # 2) skip paths which do not exist
+ # (python2.6 complains about them verbosely)
+
+ if [[ ${f} == /* && -d ${D}${f} ]]; then
+ set -- "${D}${f}" "${@}"
+ fi
+ done < <("${PYTHON}" -c 'import sys; print("\0".join(sys.path))')
+ fi
+
+ local d
+ for d; do
+ # make sure to get a nice path without //
+ local instpath=${d#${D}}
+ instpath=/${instpath##/}
+
+ case "${EPYTHON}" in
+ python*)
+ "${PYTHON}" -m compileall -q -f -d "${instpath}" "${d}"
+ "${PYTHON}" -OO -m compileall -q -f -d "${instpath}" "${d}"
+ ;;
+ *)
+ "${PYTHON}" -m compileall -q -f -d "${instpath}" "${@}"
+ ;;
+ esac
+ done
+}
+
# @ECLASS-VARIABLE: python_scriptroot
# @DEFAULT_UNSET
# @DESCRIPTION:
@@ -430,19 +479,7 @@ python_domodule() {
insinto "${d}"
doins -r "${@}"
- local PYTHON=${PYTHON}
- [[ ${PYTHON} ]] || python_export PYTHON
-
- # erm, python2.6 can't handle passing files to compileall...
- case "${EPYTHON}" in
- python*)
- "${PYTHON}" -m compileall -q "${D}/${d}"
- "${PYTHON}" -OO -m compileall -q -f "${D}/${d}"
- ;;
- *)
- "${PYTHON}" -m compileall -q "${D}/${d}"
- ;;
- esac
+ python_optimize "${D}/${d}"
}
_PYTHON_UTILS_R1=1
diff --git a/eclass/toolchain-binutils.eclass b/eclass/toolchain-binutils.eclass
index fce928131fdc..d18320474760 100644
--- a/eclass/toolchain-binutils.eclass
+++ b/eclass/toolchain-binutils.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.120 2012/10/24 03:24:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain-binutils.eclass,v 1.121 2012/11/26 18:06:55 vapier Exp $
#
# Maintainer: Toolchain Ninjas
#
@@ -144,7 +144,6 @@ tc-binutils_apply_patches() {
cd "${S}"
if ! use vanilla ; then
- [[ ${SYMLINK_LIB} != "yes" ]] && EPATCH_EXCLUDE+=" 65_all_binutils-*-amd64-32bit-path.patch"
if [[ -n ${PATCHVER} ]] ; then
EPATCH_SOURCE=${WORKDIR}/patch
if [[ ${CTARGET} == mips* ]] ; then
diff --git a/games-strategy/dominions2-demo/Manifest b/games-strategy/dominions2-demo/Manifest
index 6d6285bbbb08..b8070716c0ec 100644
--- a/games-strategy/dominions2-demo/Manifest
+++ b/games-strategy/dominions2-demo/Manifest
@@ -1 +1,2 @@
+DIST dom2demo_linux_ppc.tgz 73611156 SHA256 d37d1ff801e206dabfb52643f62fdc4f0c2a818457e1b2e00ed6a2b34c2e1a0c SHA512 cc53e2e720b27115810b9e9ff08a8155a0f1f12fff44bd1800351fa7b55e32e1e3bd4dc60cf8d823ea3da09ea795d42ef71bfcd5bb3b94c4bc7f42787f16669e WHIRLPOOL 61011ea006db708e6975020fb27b3d39a6b154f2bddf9a8e8e6b9c049eb89a2b59bad6e8efc4232cd1ddcbc1b0c7a1727adfa974208b666bc08cfc82e4f6ff97
DIST dom2demo_linux_x86.tgz 73674653 SHA256 6e28a2be0f998a95fca036d107f666000d7f18f5b0730d07406e9349cee874ca SHA512 752061df4f3b9691ab96aac28052beee4e447e1fdb0c33b48693fe33d56ba3ec63d3a5801ab938d9778d295fdb639b38a4ba9cb3d13ee8ed5b860cf34c0df442 WHIRLPOOL c4d6b82140d229a02798b1ef0a1fd18343d81102c8c585ff93de820a827b178c52428c7a965827fd9016172b5a61b812796c36f3c8e3df58558c0c2405193450
diff --git a/games-strategy/dominions2-demo/dominions2-demo-2.08-r1.ebuild b/games-strategy/dominions2-demo/dominions2-demo-2.08-r1.ebuild
index 83bc03760d02..1bb927d06833 100644
--- a/games-strategy/dominions2-demo/dominions2-demo-2.08-r1.ebuild
+++ b/games-strategy/dominions2-demo/dominions2-demo-2.08-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2-demo/dominions2-demo-2.08-r1.ebuild,v 1.1 2012/11/26 09:34:41 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/dominions2-demo/dominions2-demo-2.08-r1.ebuild,v 1.2 2012/11/26 10:22:43 pinkbyte Exp $
EAPI=4
@@ -8,15 +8,16 @@ inherit games
DESCRIPTION="Dominions 2: The Ascension Wars is an epic turn-based fantasy strategy game"
HOMEPAGE="http://www.shrapnelgames.com/Illwinter/d2/"
-SRC_URI="http://www.shrapnelgames.com/downloads/dom2demo_linux_x86.tgz"
+SRC_URI="!ppc? ( http://www.shrapnelgames.com/downloads/dom2demo_linux_x86.tgz )
+ ppc? ( http://www.shrapnelgames.com/downloads/dom2demo_linux_ppc.tgz )"
LICENSE="as-is"
SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 ~ppc ~x86"
IUSE=""
RESTRICT="strip"
-DEPEND="x86? (
+DEPEND="!amd64? (
virtual/glu
virtual/opengl
x11-libs/libXext
diff --git a/mail-client/evolution/evolution-2.32.3-r1.ebuild b/mail-client/evolution/evolution-2.32.3-r1.ebuild
index a87ce28171ba..f302533ff8d5 100644
--- a/mail-client/evolution/evolution-2.32.3-r1.ebuild
+++ b/mail-client/evolution/evolution-2.32.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.16 2012/11/17 12:12:15 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.32.3-r1.ebuild,v 1.17 2012/11/26 16:08:14 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -106,6 +106,7 @@ src_prepare() {
--disable-profiling
--disable-pst-import
$(use_enable python)
+ pythonpath=$(PYTHON -2 -a)
$(use_with clutter)
$(use_with ldap openldap)
$(use_with kerberos krb5 /usr)
diff --git a/mail-client/evolution/evolution-3.2.3-r1.ebuild b/mail-client/evolution/evolution-3.2.3-r1.ebuild
index c076907ccf9d..a3311e64b0a4 100644
--- a/mail-client/evolution/evolution-3.2.3-r1.ebuild
+++ b/mail-client/evolution/evolution-3.2.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.3-r1.ebuild,v 1.4 2012/10/17 09:55:53 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.2.3-r1.ebuild,v 1.6 2012/11/26 16:19:56 tetromino Exp $
EAPI=4
GCONF_DEBUG=no
@@ -90,6 +90,11 @@ REQUIRED_USE="map? ( clutter )
networkmanager? ( !connman )"
pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
ELTCONF="--reverse-deps"
DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
@@ -110,6 +115,7 @@ pkg_setup() {
$(use_enable gstreamer audio-inline)
$(use_enable map contact-maps)
$(use_enable python)
+ pythonpath=$(PYTHON -2 -a)
$(use_with clutter)
$(use_with ldap openldap)
$(use_with kerberos krb5 ${EPREFIX}/usr)"
@@ -130,11 +136,6 @@ pkg_setup() {
--without-nss-includes"
fi
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
# https://bugzilla.gnome.org/show_bug.cgi?id=663077, requires eautoreconf
epatch "${FILESDIR}"/${PN}-3.2.1-reorder-mx-clutter-gtk.patch
# Fix build failure with glib-2.32
diff --git a/mail-client/evolution/evolution-3.4.4.ebuild b/mail-client/evolution/evolution-3.4.4.ebuild
index 7acf320e4a8a..d5d48b47238d 100644
--- a/mail-client/evolution/evolution-3.4.4.ebuild
+++ b/mail-client/evolution/evolution-3.4.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.4.4.ebuild,v 1.4 2012/10/27 07:24:21 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.4.4.ebuild,v 1.6 2012/11/26 16:19:56 tetromino Exp $
EAPI="4"
GCONF_DEBUG="no"
@@ -89,6 +89,11 @@ REQUIRED_USE="map? ( clutter )
networkmanager? ( !connman )"
pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
ELTCONF="--reverse-deps"
DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
@@ -110,6 +115,7 @@ pkg_setup() {
$(use_enable gstreamer audio-inline)
$(use_enable map contact-maps)
$(use_enable python)
+ pythonpath=$(PYTHON -2 -a)
$(use_with clutter)
$(use_with ldap openldap)
$(use_with kerberos krb5 ${EPREFIX}/usr)"
@@ -130,11 +136,6 @@ pkg_setup() {
--without-nss-includes"
fi
- python_set_active_version 2
- python_pkg_setup
-}
-
-src_prepare() {
# Fix paths for Gentoo spamassassin executables
epatch "${FILESDIR}/${PN}-3.3.91-spamassassin-paths.patch"
sed -e "s:@EPREFIX@:${EPREFIX}:g" \
diff --git a/media-gfx/opencolorio/opencolorio-1.0.7.ebuild b/media-gfx/opencolorio/opencolorio-1.0.7.ebuild
index e5b56a21ddf7..577dda33611c 100644
--- a/media-gfx/opencolorio/opencolorio-1.0.7.ebuild
+++ b/media-gfx/opencolorio/opencolorio-1.0.7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/opencolorio/opencolorio-1.0.7.ebuild,v 1.3 2012/11/26 07:42:27 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/opencolorio/opencolorio-1.0.7.ebuild,v 1.4 2012/11/26 11:21:33 ago Exp $
EAPI=4
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/imageworks/OpenColorIO/tarball/v${PV} \
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc opengl pdf python sse2 test"
RDEPEND="opengl? (
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index d7279c8cf0d1..5464476ded25 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -19,8 +19,6 @@
disable optimized assembly code that is not PIC friendly
Enable sharing of common code for classic DRI drivers.
Enable sharing of common code for the OpenGL API.
- Enable the VDPAU acceleration interface for the Gallium3D Video Layer.
- Enable support for dev-libs/wayland
Enable the XA (X Acceleration) API for Gallium3D.
Enable the X.org state tracker (DDX replacement) for Gallium3D.
Enable the XvMC acceleration interface for the Gallium3D Video Layer.
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index 4d195dfd66be..e3d1c619af6a 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/metadata.xml
@@ -14,7 +14,6 @@
Builds rtaudio consumer for native audio support on multiple platforms.
Build SWIG bindings for Ruby
Use media-libs/swfdec for reading .swf files (Macromedia Flash) instead of libavformat.
- Build with vdpau support
Enables a KCM plugin for configuring flash player
preferences
diff --git a/www-servers/nginx/nginx-1.2.5.ebuild b/www-servers/nginx/nginx-1.2.5.ebuild
index dc2265641cc9..262da1052eaf 100644
--- a/www-servers/nginx/nginx-1.2.5.ebuild
+++ b/www-servers/nginx/nginx-1.2.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.2.5.ebuild,v 1.1 2012/11/16 07:13:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/nginx/nginx-1.2.5.ebuild,v 1.3 2012/11/26 13:05:02 ago Exp $
EAPI="4"
@@ -92,7 +92,7 @@ SRC_URI="http://nginx.org/download/${P}.tar.gz
LICENSE="as-is BSD BSD-2 GPL-2 MIT"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif fastcgi
geo gzip limit_req limit_conn map memcached proxy referer rewrite scgi ssi
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index 9175343241b9..d4946dd47eca 100644
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -17,6 +17,5 @@
for introspection
Enable support for the distro-neutral package
manager GUI app-admin/packagekit in application chooser
- Enable dev-libs/wayland backend
diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml
index 276a5d9e3208..053fd40a1f4d 100644
--- a/x11-libs/libva-intel-driver/metadata.xml
+++ b/x11-libs/libva-intel-driver/metadata.xml
@@ -9,7 +9,4 @@
jkarlson@cc.hut.fi
Emil Karlson
-
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 1168e9b71b8e..b078f453ae1e 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,3 +1,3 @@
-DIST libva-1.0.15.tar.bz2 488805 SHA256 7cc24ae9c947aa13904255244810d3637b03d41e2b6f4b643db3b97412cacd37
+DIST libva-1.0.15.tar.bz2 488805 SHA256 7cc24ae9c947aa13904255244810d3637b03d41e2b6f4b643db3b97412cacd37 SHA512 e82d7c7126ff008500c3df47c93d0e5f8205f3cdaf92dc7be8fa6519a761f58961f908931aea9d4bea2ee4373e1ee02c146d4433fa00f50e6b83384f30fadc6e WHIRLPOOL 61c6ede021fc133e721caea73b0f4b95cba64b9ecddaca471a731207aaf44510e1c61553058b1a5cb5e8b5e4f56c49ace35c1bc7a55f5c715e0d939e39d9d189
DIST libva-1.0.16.tar.bz2 496776 SHA256 a9a39a2b92eeab73c517de7e6b841c2840b040ea685f850866fe58242cc2f161 SHA512 5c7db891d418764db9cce34175c10a84abdb649aa14cdc10df4a294ef86af707937e13a783748b547294f72d9b11aa075d871198165243bb9870f7e7b92a0019 WHIRLPOOL b388beeef6f738110e6b947a9b59e6c246217372644c9c4488aef78d2d87cfdab52a3c4e6a6c016acf46fbb9ae17aff515e247ebee57ec2a0dbee150e6d0f55a
DIST libva-1.1.0.tar.bz2 728879 SHA256 db6adc24a6f02f234a823dd8ced4a7e38084581f4ae02b6aac10716e523cefa8 SHA512 3ae73e789a26b6d2eee0a38a5e1dc7f06430dbca5ca73785295ca5a1bcc0bdc0ca2423e481e1304203471b55369faf62b2a234daa6370edc7ca8013affb6eaee WHIRLPOOL 27e6d4648aa2eddf2846f57a1300f97820dd013675bd173a019b9a8b1ccf343109a13df822f8581012020451a35cb485974f97be55bf8d2f131a8988e6807c1d
diff --git a/x11-libs/libva/metadata.xml b/x11-libs/libva/metadata.xml
index 3d120b2097c7..af702ea29fbe 100644
--- a/x11-libs/libva/metadata.xml
+++ b/x11-libs/libva/metadata.xml
@@ -7,6 +7,5 @@
diff --git a/x11-misc/bbweather/Manifest b/x11-misc/bbweather/Manifest
index b8e2831d18f3..eb414a321fec 100644
--- a/x11-misc/bbweather/Manifest
+++ b/x11-misc/bbweather/Manifest
@@ -1,2 +1,2 @@
DIST bbweather-0.6.2.tar.bz2 80487 SHA256 dac024c15df75cf8de29ae5e4a80e17771361e708ae45b772d1741fc926dc093
-DIST bbweather-0.6.3.tar.bz2 80631 SHA256 575e0f5dd1af770490bf0f3ef9c26de5245deb91f79caa3d5db3cd9dc23b8e1e
+DIST bbweather-0.6.3.tar.bz2 80631 SHA256 575e0f5dd1af770490bf0f3ef9c26de5245deb91f79caa3d5db3cd9dc23b8e1e SHA512 e5bd4febf119c0f81a64fb5ff4cf3b526a84e8fd26005ff04c6297f9b50963d2d710227469f9a1cf2d1c51f3524a2bce544a07c70ca4e5beff64c954768468a6 WHIRLPOOL 7b0c2f4561f54bdf1daab217ca4ca3d26e44a377013f327668a5edeb964f189ea19f1eb413ca48f35c52e69275ed945e8843c1dfedf59b28b5dc3cacd35c5724
diff --git a/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild b/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild
new file mode 100644
index 000000000000..9cd9ebabf5cb
--- /dev/null
+++ b/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild,v 1.1 2012/11/26 12:29:55 jer Exp $
+
+EAPI=2
+
+inherit autotools eutils
+
+DESCRIPTION="blackbox weather monitor"
+HOMEPAGE="http://www.netmeister.org/apps/bbweather/"
+SRC_URI="http://www.netmeister.org/apps/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+ x11-libs/libX11"
+RDEPEND="${DEPEND}
+ net-misc/wget
+ x11-apps/xmessage
+ !<=x11-plugins/gkrellweather-2.0.7-r1"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-asneeded.patch
+ gunzip doc/*.gz || die
+ sed -i \
+ -e "s:man_DATA:man1_MANS:;s:.gz::g;/^mandir/d" \
+ doc/Makefile.am || die
+ sed -i \
+ -e 's|-helvetica-|-*-|g' \
+ resource.cpp data/${PN}.{nobb,style} || die
+ eautoreconf
+}
+
+src_install () {
+ emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install || die
+ dodoc README AUTHORS ChangeLog NEWS TODO data/README.bbweather || die
+
+ # since multiple bbtools packages provide this file, install
+ # it in /usr/share/doc/${PF}
+ mv "${D}"/usr/share/bbtools/bbtoolsrc.in \
+ "${D}"/usr/share/doc/${PF}/bbtoolsrc.example
+}