Run eautoreconf and update git repo for live ebuild (bugs #536810 and 536826).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

diff --git a/dev-python/graph-tool/ChangeLog b/dev-python/graph-tool/ChangeLog
index 2ab0c83fac7a88a2f469d25a4011b8893d9cfedb..ef5e0e19b329bbb45143e3c54ca93955faf0d355 100644 (file)
--- a/dev-python/graph-tool/ChangeLog
+++ b/dev-python/graph-tool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/graph-tool
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/ChangeLog,v 1.20 2015/01/14 03:43:42 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/ChangeLog,v 1.21 2015/01/17 14:03:07 radhermit Exp $
+
+  17 Jan 2015; Tim Harder <radhermit@gentoo.org> graph-tool-2.2.36.ebuild,
+  graph-tool-9999.ebuild:
+  Run eautoreconf and update git repo for live ebuild (bugs #536810 and
+  536826).
 
 *graph-tool-2.2.36 (14 Jan 2015)
 

diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index ec62b04329165590c26d4487f99ad9b45fdba650..486907870c77ab42bde0864653e888efe41cdae3 100644 (file)
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -2,14 +2,18 @@
 Hash: SHA256
 
 DIST graph-tool-2.2.36.tar.bz2 15050904 SHA256 e1e030306480393464501cbcf3f3c938c2105c95fd0d67a8fe8bb4296e0be872 SHA512 3867fed367b547f28147c3234cf391d5415e5cf4594bc495abab1e1f827ba89af44d9d2bc92ee604ed184ce48f1644076aa852a0035fa2f8cdb449157d6b32bc WHIRLPOOL 741091c5504234767ed2662f69307aeaffb344ec132f708b494288d03485ff1910a967b244c35f5e7b77bad0564b249fd7b80ddb39051928f9806310c4d7843e
-EBUILD graph-tool-2.2.36.ebuild 1913 SHA256 146c46769aa15cbb27f9feb09309432d8b9d73a8ebbe68d81e548d0a290e79ea SHA512 d14c2b45ec4e58541291390d31aba815c34c66199179b368314f8f240dcb8749128370f37fce6fba016c978664d669166ddf050a96da01f3bee6058268195fda WHIRLPOOL 9443dda13994b76e2f8054a4c3d5bd2361e62e53c3ee27c5b59ca1a7bc36e9f9c37712aa9f6d14f02a61d579ccf0d5f5873364c43b395690c0a4c5f1244e3a2a
-EBUILD graph-tool-9999.ebuild 1905 SHA256 f2a761aa7f98c5d620dd83ea907bf1cde25a1bcd5cbc3218f8a3731e82b516cd SHA512 59a8d1a60570162145814dbb1507fda654ca22b64d6bc72bdd3091b8b00b66ddff3251bdb22a3716e4a01ccbdea4cbbd14d587f3be683a43fc894315edede774 WHIRLPOOL fe12c9da5062680bdb08bc307af925d855fe98d23807b9381b7ddcfb198aeb194fe242853c59c1141c12c6c25257619a7b1c81d69728c985d7a082582a5b7342
-MISC ChangeLog 2961 SHA256 cd8c104fae964c0e9979d7bf705348b6233143e39177b1e64ffdc7e20609899a SHA512 dc3548032ac3ebb20a1e175aa2684319eaf8351a4a07747b71a06b96fac3e46d237a7d8f013a842883ea96cc4fdc5ae684b57b1cb8f2beb710498693779a143a WHIRLPOOL da672ed888fa1824ea32b17f0019368d909fdd7ff76b5e710400fe0580ab156a6f05c25ba2df7e6d53229037d193e71d54793db3ff98c3f130d11c4d10ca8af1
+EBUILD graph-tool-2.2.36.ebuild 1935 SHA256 5ca0dbf521e6d3b163aee977bd41d60636f94e6d163c1ea300b8d7e941f0ccc1 SHA512 31a91b1dc06b0c239271c93a6059dfdd8a240a7c080e494c05464c8f460e02ed8ab92af8ad72eeece89cda08d48004b72bc4f9743547ca61e03e77748a7b8397 WHIRLPOOL 4a78e46be4d3bd52334f7fe8ec81c33c43363e7bdb0b2e24974d8e272880efa3c40ea1108a1eaf27618c623eef94f3515b93f8702fc54d0902cc85291f95ae10
+EBUILD graph-tool-9999.ebuild 1934 SHA256 7ccd791b016986840649bba83154e164fd7ea34211fcd70a2ffaaeedd26272a6 SHA512 e9783247f0a557071444bab0d9ef99cb2821400b4243979d881480a58c2740449c89dff073ea30d07f77eb8f9788bf7211bcc5f04c89e99a8254778e34094dab WHIRLPOOL 3d6923809cd621247761291aa7dff9da3f8e6cec9065d89c143056eb0fe04c955101bb520190142719e1d42d993f9de04c8bb437bd2a582585c13d26883fe3ec
+MISC ChangeLog 3148 SHA256 05eaa8c23034d8613b394f6446ff472cace7184967e5fee2a0db5e9cb5cf6cc5 SHA512 0b0f7327056a268549df9eeca37c139cddbe032e11836cb55fb2a2563ad6fd3fe1857c95d66c938f501403845e7a0df35a1aafb69d9c9b906bfc356f7a5872d4 WHIRLPOOL 377ce3012e5fd6108088cba83394c12daa7136893edadb1ee3d751d05a04f3063d6538149d371856418cc221838faee6b18aa85dbe39592db9e9260bfa119f93
 MISC metadata.xml 253 SHA256 9f2f51fd5d49ee6b0ef785dd7256455213e0e18e37f23b498cfee07dc1efac7f SHA512 5cb93e348b913d23ba4283ee3baf4a052658e27cbfad60ae3b80e68317909342ad3ec537724886b746f3cc1ada9db3010e41d80b615919d596df11bbe7bc7fed WHIRLPOOL e98beb144d79c5c872f1709991bd5b3ad17b63c494bcd4e9b2282957b309a888788e2b1c3ed8231a108914f76e0bfd21b5bd395236c09c25caa71df3a6063a90
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlS15fwACgkQso7CE7gHKw0j3ACgp7eB0P2VPtCnYFfb75XU1eGG
-aOUAoLBY8BMwT91gXS/uvX1Cz21hnApH
-=jwIx
+iQEcBAEBCAAGBQJUumugAAoJEEqz6FtPBkyjmQcH/icTfT0gsox1fSyB62ewy05U
+pfgh0uuG0wtfQaGGoa2YoyiVLG/nJNns7/7rIbwKFqMea8eRDEVbRYLH3xUWSXQ1
+DNhgXURDaGPYcnUhEWQ5QpXjU15Hzc5VGNDJ4UgMmieyIYK7ekJVsiOVIk5dAH8P
+SwfJW3Jl5imptnEljkBEn0BelsXAXtgnHETqbQlnpdo2nPTG9jSI/yud9qAyJVSj
+R0E6Pg5F15UVupvtWMV77f8sXKBhlcpdadgECoLsgW3rLozX6Bt9/P/4LNnlXBhN
+BxP84XuGCrpshEOK2aXxYZerdgAppMC6Yrc6JNnFdk4/ZZCi3YQqiiDB+RarwHE=
+=JBj+
 -----END PGP SIGNATURE-----

diff --git a/dev-python/graph-tool/graph-tool-2.2.36.ebuild b/dev-python/graph-tool/graph-tool-2.2.36.ebuild
index 6537038d64d195bb384bce40de3de013b79289c5..70a6977a22abd9af51bab74b4c95aa8a30d83ce8 100644 (file)
--- a/dev-python/graph-tool/graph-tool-2.2.36.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.2.36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.36.ebuild,v 1.1 2015/01/14 03:43:42 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-2.2.36.ebuild,v 1.2 2015/01/17 14:03:07 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 inherit check-reqs toolchain-funcs python-r1
 
 if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="git://git.skewed.de/graph-tool"
-       inherit git-2
+       EGIT_REPO_URI="https://github.com/count0/graph-tool.git"
+       inherit autotools git-r3
 else
        SRC_URI="http://downloads.skewed.de/${PN}/${P}.tar.bz2"
        KEYWORDS="~amd64 ~x86"
@@ -22,7 +22,6 @@ LICENSE="GPL-3"
 SLOT="0"
 IUSE="+cairo openmp"
 
-# Bug 524524
 CDEPEND="${PYTHON_DEPS}
        >=dev-libs/boost-1.54.0[python,${PYTHON_USEDEP}]
        dev-libs/expat
@@ -46,19 +45,20 @@ MAKEOPTS="${MAKEOPTS} -j1"
 CHECKREQS_DISK_BUILD="6G"
 
 pkg_pretend() {
-       if use openmp; then
+       if use openmp ; then
                tc-has-openmp || die "Please switch to an openmp compatible compiler"
        fi
        check-reqs_pkg_pretend
 }
 
 src_prepare() {
+       [[ ${PV} == "9999" ]] && eautoreconf
        >py-compile
        python_copy_sources
 }
 
 src_configure() {
-       python_parallel_foreach_impl run_in_build_dir \
+       python_foreach_impl run_in_build_dir \
                econf \
                        --disable-static \
                        --disable-optimization \
@@ -67,11 +67,11 @@ src_configure() {
 }
 
 src_compile() {
-       python_parallel_foreach_impl run_in_build_dir default
+       python_foreach_impl run_in_build_dir default
 }
 
 src_install() {
-       python_parallel_foreach_impl run_in_build_dir default
+       python_foreach_impl run_in_build_dir default
        prune_libtool_files --modules
 
        # remove unwanted extra docs

diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index 9086fa954808e517786fab8468f4299fad319cae..9f020f3f47a4094069c2d5eb56efbb169b0da418 100644 (file)
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-9999.ebuild,v 1.9 2015/01/14 03:43:42 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/graph-tool/graph-tool-9999.ebuild,v 1.10 2015/01/17 14:03:07 radhermit Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_7,3_3,3_4} )
 
-inherit check-reqs eutils toolchain-funcs python-r1
+inherit check-reqs toolchain-funcs python-r1
 
 if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="git://git.skewed.de/graph-tool"
-       inherit git-2
+       EGIT_REPO_URI="https://github.com/count0/graph-tool.git"
+       inherit autotools git-r3
 else
        SRC_URI="http://downloads.skewed.de/${PN}/${P}.tar.bz2"
        KEYWORDS="~amd64 ~x86"
@@ -45,19 +45,20 @@ MAKEOPTS="${MAKEOPTS} -j1"
 CHECKREQS_DISK_BUILD="6G"
 
 pkg_pretend() {
-       if use openmp; then
+       if use openmp ; then
                tc-has-openmp || die "Please switch to an openmp compatible compiler"
        fi
        check-reqs_pkg_pretend
 }
 
 src_prepare() {
+       [[ ${PV} == "9999" ]] && eautoreconf
        >py-compile
        python_copy_sources
 }
 
 src_configure() {
-       python_parallel_foreach_impl run_in_build_dir \
+       python_foreach_impl run_in_build_dir \
                econf \
                        --disable-static \
                        --disable-optimization \
@@ -66,11 +67,11 @@ src_configure() {
 }
 
 src_compile() {
-       python_parallel_foreach_impl run_in_build_dir default
+       python_foreach_impl run_in_build_dir default
 }
 
 src_install() {
-       python_parallel_foreach_impl run_in_build_dir default
+       python_foreach_impl run_in_build_dir default
        prune_libtool_files --modules
 
        # remove unwanted extra docs