diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2010-08-11 06:23:03 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2010-08-11 06:23:03 +0000 |
| commit | bee42618d3324acf580b1969fcf6fb501a06fd3f (patch) | |
| tree | 25a9bb41d2887259dc923c122cb2410fc531bfc4 /sci-libs/gdal | |
| parent | Remove old version. (diff) | |
| download | historical-bee42618d3324acf580b1969fcf6fb501a06fd3f.tar.gz historical-bee42618d3324acf580b1969fcf6fb501a06fd3f.tar.bz2 historical-bee42618d3324acf580b1969fcf6fb501a06fd3f.zip | |
Add back soname/install_name conditional patching for Darwin
Package-Manager: portage-2.2.01.15553-prefix/cvs/Darwin powerpc
Diffstat (limited to 'sci-libs/gdal')
| -rw-r--r-- | sci-libs/gdal/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-libs/gdal/Manifest | 4 | ||||
| -rw-r--r-- | sci-libs/gdal/gdal-1.7.2.ebuild | 10 |
3 files changed, 13 insertions, 6 deletions
diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog index c65319931fbb..881942145e6f 100644 --- a/sci-libs/gdal/ChangeLog +++ b/sci-libs/gdal/ChangeLog @@ -1,10 +1,13 @@ # ChangeLog for sci-libs/gdal # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.95 2010/08/08 17:12:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.96 2010/08/11 06:23:03 grobian Exp $ 08 Aug 2010; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.7.2.ebuild: Disable paralel emake everywhere. + 08 Aug 2010; Fabian Groffen <grobian@gentoo.org> gdal-1.7.2.ebuild: + Add back soname/install_name conditional patching for Darwin + 31 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.7.2.ebuild: Fix one too many : at sed line. Per bug #330515. diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest index 2b19bfe5f232..0a48f6855070 100644 --- a/sci-libs/gdal/Manifest +++ b/sci-libs/gdal/Manifest @@ -16,6 +16,6 @@ DIST gdal-1.7.2.tar.gz 7755378 RMD160 a3f7950798448d8179f899dc095a83e23dcc269b S EBUILD gdal-1.6.1.ebuild 6207 RMD160 bc770f30e3fc7a2730593301493e5131887f96cf SHA1 fa00e68b0db2889ff4f41485577c73aea4c1902d SHA256 f42f23039752836249fbd420e7be8d1261b31dd8f62189a38e0e6cb030deff93 EBUILD gdal-1.6.3-r1.ebuild 6953 RMD160 ebddd7e18664123f25311ab30c3a81ffbc8fbed0 SHA1 3e9f9ea851f0e1a818339249c1c7cc03f2f6ce41 SHA256 e0203d2a2e49adcb982c4cdc05520816af0e5ebd7a15edfb55275f4ec86e189f EBUILD gdal-1.7.1-r1.ebuild 7451 RMD160 52f641bb8f071b89cc735f10b88ec238ad3d3376 SHA1 3cdbf9facf1f1cb7aec01663741c8cb261fc5b2b SHA256 9fbda91f15606d33a0fcd2e421925b965800e78bcde3f15816965b2edb6202cd -EBUILD gdal-1.7.2.ebuild 6053 RMD160 ab08ba33540ce4f9ccaec0967b35dcff2a19ca8d SHA1 6f21acb5369bcd0361b68442dcf686a02e3ecd1d SHA256 023271f33e7d1c081fb4f2a627ed24a90b258d02c97de9dbab56cd5e3b9f6e26 -MISC ChangeLog 17884 RMD160 464e9ca961da5d47cf568dce6d55fd77c826d973 SHA1 2bcd725233a11cd2df1e928933d7f43a487aefd6 SHA256 6a3c1d2077bd9e749ffff2aaf893ca03d49d42645f802791fe26332239b91a5a +EBUILD gdal-1.7.2.ebuild 6192 RMD160 f60ff0f84eae084c36d4b0dadfe1c7ef5dffa9e4 SHA1 a551e36ba10b5db971d5646601df2b7fb3aa330a SHA256 cc9e20acba036ce6220c6ffed6e5ff7b68326ac29b076edf7a6018e129e3aba5 +MISC ChangeLog 18016 RMD160 d08ce69ae35f8590a3a8a0bc962f9cec3995e674 SHA1 d59f756f125e34b8fcb659ea88ec685ebce8a7e1 SHA256 eb1b661199a0ea14d6c42129c827b925cf86c5a27eeaa0a7d20bf4da82f0ff68 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3 diff --git a/sci-libs/gdal/gdal-1.7.2.ebuild b/sci-libs/gdal/gdal-1.7.2.ebuild index a427d860c4ab..60003c74dcd7 100644 --- a/sci-libs/gdal/gdal-1.7.2.ebuild +++ b/sci-libs/gdal/gdal-1.7.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild,v 1.4 2010/08/08 17:12:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild,v 1.5 2010/08/11 06:23:03 grobian Exp $ EAPI="3" @@ -79,8 +79,12 @@ src_prepare() { -e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \ swig/python/GNUmakefile || die - epatch "${FILESDIR}"/${PV}-ruby_cflags.patch \ - "${FILESDIR}"/${PN}-1.5.0-soname.patch + epatch "${FILESDIR}"/${PV}-ruby_cflags.patch + + # -soname is only accepted by GNU ld/ELF + [[ ${CHOST} == *-darwin* ]] \ + && epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \ + || epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch eautoreconf } |