diff options
author | Donnie Berkholz <dberkholz@gentoo.org> | 2007-05-30 22:00:27 +0000 |
---|---|---|
committer | Donnie Berkholz <dberkholz@gentoo.org> | 2007-05-30 22:00:27 +0000 |
commit | 0e52efd61d3b7e2b74189b71f7ee734a541abcb6 (patch) | |
tree | e08c0af4a40ebf541d69bbce41a9b7bb029465d7 /sci-libs/clipper | |
parent | Fix --as-needed patch to use dependencies instead of just linking. Move WANT_... (diff) | |
download | historical-0e52efd61d3b7e2b74189b71f7ee734a541abcb6.tar.gz historical-0e52efd61d3b7e2b74189b71f7ee734a541abcb6.tar.bz2 historical-0e52efd61d3b7e2b74189b71f7ee734a541abcb6.zip |
Move the sed to change the includes to use clipper-2 to after the install, so it compiles properly. Keyword ~ppc.
Package-Manager: portage-2.1.2.7
Diffstat (limited to 'sci-libs/clipper')
-rw-r--r-- | sci-libs/clipper/ChangeLog | 7 | ||||
-rw-r--r-- | sci-libs/clipper/Manifest | 16 | ||||
-rw-r--r-- | sci-libs/clipper/clipper-20070528.ebuild | 20 |
3 files changed, 24 insertions, 19 deletions
diff --git a/sci-libs/clipper/ChangeLog b/sci-libs/clipper/ChangeLog index 42f29340cc6d..71abe4d931db 100644 --- a/sci-libs/clipper/ChangeLog +++ b/sci-libs/clipper/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sci-libs/clipper # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/ChangeLog,v 1.1 2007/05/29 08:08:17 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/ChangeLog,v 1.2 2007/05/30 22:00:27 dberkholz Exp $ + + 30 May 2007; Donnie Berkholz <dberkholz@gentoo.org>; + clipper-20070528.ebuild: + Move the sed to change the includes to use clipper-2 to after the install, + so it compiles properly. Keyword ~ppc. *clipper-20070528 (29 May 2007) diff --git a/sci-libs/clipper/Manifest b/sci-libs/clipper/Manifest index 689a6adcbc16..a873ccec1a05 100644 --- a/sci-libs/clipper/Manifest +++ b/sci-libs/clipper/Manifest @@ -3,14 +3,14 @@ MD5 02986c51c33f3b22465bb5a6e01e812a files/20070528-as-needed.patch 884 RMD160 9bf79566b547f700b136c645c59b6aaf7126880f files/20070528-as-needed.patch 884 SHA256 e6654df312419335c0e1886a23b685462f5ce08f5745e36f78f29a509fd6acbd files/20070528-as-needed.patch 884 DIST clipper20ac.latest-20070528.tar.gz 1121873 RMD160 fe0db88ebdff7beebe947a29ec3f07732d19ebfc SHA1 ac4095e1968831b74cc45141144883b1fb27d948 SHA256 9da6189965b8742b35af8bece8575938c5257eb5bf81eae296726c31e0569691 -EBUILD clipper-20070528.ebuild 1915 RMD160 ed918570e9e67b5aa4b77ebf656905552447d35d SHA1 6bbb50bd6f93ace692bf0bebab1f3cb2d185488e SHA256 47e2ae809c186484b1e3c2612dd0fcfdddffd30802edaed57f2445d171dee18c -MD5 ba753dd45b5261a2120b6447b1542975 clipper-20070528.ebuild 1915 -RMD160 ed918570e9e67b5aa4b77ebf656905552447d35d clipper-20070528.ebuild 1915 -SHA256 47e2ae809c186484b1e3c2612dd0fcfdddffd30802edaed57f2445d171dee18c clipper-20070528.ebuild 1915 -MISC ChangeLog 494 RMD160 ee51bc25b88cf296713163580b3538b4ddfc2c05 SHA1 e7fde65c4ffb56ada03e14ae17486b675d9628d0 SHA256 aa9de50c0630d2165427a36d0cd77ece91da6f7d113521e6287fad1aee1678cb -MD5 2cb7dbead2f6937afc309a57be74a0a7 ChangeLog 494 -RMD160 ee51bc25b88cf296713163580b3538b4ddfc2c05 ChangeLog 494 -SHA256 aa9de50c0630d2165427a36d0cd77ece91da6f7d113521e6287fad1aee1678cb ChangeLog 494 +EBUILD clipper-20070528.ebuild 1925 RMD160 1bb564219d907c340cf30f803d7838e59b17d0d8 SHA1 5ac2cf74f3315ca40e88c34adf7b34d19df1d5a8 SHA256 46be23809a5196623f76510a706385f16d323c771ca2e5928d889d65196b2a0e +MD5 5c49bc13d5dbe45951d4a17512f87923 clipper-20070528.ebuild 1925 +RMD160 1bb564219d907c340cf30f803d7838e59b17d0d8 clipper-20070528.ebuild 1925 +SHA256 46be23809a5196623f76510a706385f16d323c771ca2e5928d889d65196b2a0e clipper-20070528.ebuild 1925 +MISC ChangeLog 695 RMD160 611fc5643f69c73d7c89290f397415e4b8a9c8b5 SHA1 f5e757817aca0ef060c2babcb885bc80ff957fc4 SHA256 28b67ae4e751ee836cad45ee34c25082d212cab0e98ce2cb948980df676aa8d7 +MD5 372b958d2d2d3f87b6f70d9ac021d053 ChangeLog 695 +RMD160 611fc5643f69c73d7c89290f397415e4b8a9c8b5 ChangeLog 695 +SHA256 28b67ae4e751ee836cad45ee34c25082d212cab0e98ce2cb948980df676aa8d7 ChangeLog 695 MISC metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 SHA1 cb0b513473c0348f4f6f6cd9a132e4884155fddb SHA256 84c92b49702daf95eace8d2765215cbd8650da4ef776f9f700b5ce3785dec852 MD5 43628e9f5743b5c3b018a82669a76bc7 metadata.xml 166 RMD160 4452298fd03e7c9395d1182bfe69d60a14144af6 metadata.xml 166 diff --git a/sci-libs/clipper/clipper-20070528.ebuild b/sci-libs/clipper/clipper-20070528.ebuild index f29dc48adca2..428349f6e2ff 100644 --- a/sci-libs/clipper/clipper-20070528.ebuild +++ b/sci-libs/clipper/clipper-20070528.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/clipper-20070528.ebuild,v 1.1 2007/05/29 08:08:17 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/clipper/clipper-20070528.ebuild,v 1.2 2007/05/30 22:00:27 dberkholz Exp $ inherit autotools @@ -10,7 +10,7 @@ HOMEPAGE="http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper.html" SRC_URI="http://dev.gentoo.org/~dberkholz/distfiles/clipper20ac.latest-${PV}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~x86" +KEYWORDS="~x86 ~ppc" IUSE="" RDEPEND="sci-chemistry/ccp4" DEPEND="${RDEPEND}" @@ -31,14 +31,6 @@ src_unpack() { || die "sed to version libs with -2 failed" eend $? - # Use '-2' suffix in headers - ebegin "changing headers to use -2 suffix" - grep 'include.*clipper' -rl . \ - | xargs sed -i \ - -e "s~\(include.*clipper\)/~\1-2/~g" \ - || die "sed to find -2 slotted headers failed" - eend $? - AT_M4DIR="config" eautoreconf } @@ -65,4 +57,12 @@ src_install() { pkgincludedir=/usr/include/clipper-2 \ install \ || die "emake install failed" + + # Use '-2' suffix in headers + ebegin "changing headers to use -2 suffix" + grep 'include.*clipper' -rl "${D}" \ + | xargs sed -i \ + -e "s~\(include.*clipper\)/~\1-2/~g" \ + || die "sed to find -2 slotted headers failed" + eend $? } |