diff options
| author |   Steve Arnold <nerdboy@gentoo.org> | 2009-10-18 07:05:49 +0000 |
|---|---|---|
| committer | Steve Arnold <nerdboy@gentoo.org> | 2009-10-18 07:05:49 +0000 |
| commit | c4f02cd243d9d16379cf2b9c4b99a8b115abaa5e (patch) | |
| tree | 9caa401d47fe16b18ba37b3e1fff800139f01cd5 /sci-libs | |
| parent | Version bump. Drop old. (diff) | |
| download | historical-c4f02cd243d9d16379cf2b9c4b99a8b115abaa5e.tar.gz historical-c4f02cd243d9d16379cf2b9c4b99a8b115abaa5e.tar.bz2 historical-c4f02cd243d9d16379cf2b9c4b99a8b115abaa5e.zip | |
QA fix: updated to respect LDFLAGS per bug 289158.
Package-Manager: portage-2.2_rc46/cvs/Linux x86_64
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/shapelib/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/shapelib/Manifest | 5 | ||||
| -rw-r--r-- | sci-libs/shapelib/files/makefile-fix.patch | 9 | ||||
| -rw-r--r-- | sci-libs/shapelib/shapelib-1.2.10-r1.ebuild | 12 |
4 files changed, 24 insertions, 8 deletions
diff --git a/sci-libs/shapelib/ChangeLog b/sci-libs/shapelib/ChangeLog index 73d5769b20cf..d63f28124bf2 100644 --- a/sci-libs/shapelib/ChangeLog +++ b/sci-libs/shapelib/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/shapelib # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/ChangeLog,v 1.10 2009/09/16 04:58:05 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/ChangeLog,v 1.11 2009/10/18 07:05:49 nerdboy Exp $ + + 18 Oct 2009; Steve Arnold <nerdboy@gentoo.org> shapelib-1.2.10-r1.ebuild, + +files/makefile-fix.patch: + More QA fixes: updated to respect LDFLAGS per bug 289158. 16 Sep 2009; Steve Arnold <nerdboy@gentoo.org> shapelib-1.2.10-r1.ebuild, +files/fix-shapelib-test.diff, +files/stdlib_include_fix.patch: diff --git a/sci-libs/shapelib/Manifest b/sci-libs/shapelib/Manifest index 37fd0192f640..794e5fc7f06c 100644 --- a/sci-libs/shapelib/Manifest +++ b/sci-libs/shapelib/Manifest @@ -1,6 +1,7 @@ AUX fix-shapelib-test.diff 1033 RMD160 fbcd5f30862573a707101c6f92a689b4fa989026 SHA1 bd1103be20f38ac60c2d0eec9d903149143ae3ea SHA256 839075511961b514171e5a1b84f6151724e04fbbde1f3b3c6a48baf817219ad2 +AUX makefile-fix.patch 213 RMD160 8394dc5dac487f231b2352654db7eb1e15a2f69e SHA1 0a32bf8790c4200fb3abf5b2f1d941d060d11a52 SHA256 225e989102341d75054e151f7d27dd203204648e2a8902f9c7ada4b976003581 AUX stdlib_include_fix.patch 838 RMD160 e28e8e35017fa61f6bba305c0f4b0014fc3ced8d SHA1 0ec87da346fd94404260261a885fa367506ae60e SHA256 a6fa734cfb0642de3e2e95455194ccf56ab4cd7053914575197a026f5dd74d0b DIST shapelib-1.2.10.tar.gz 167219 RMD160 9dcd90d5197aa7d6063a703a369a530f6aa1f1c3 SHA1 436b09b6a90f403e4568460d67560d5730725651 SHA256 afa54d60369e49a3d2ebcd1ffca75104bdc85d7f539b81aec8a6e2d311ca6b78 -EBUILD shapelib-1.2.10-r1.ebuild 1122 RMD160 87dabe52b45215471891d5c1047b139c4b8e2118 SHA1 f9d78422c37122b4b5bfa40ca0a4f6bda4c4797b SHA256 e5252cb1bc223665cc17b34b64d20047879a3aa4fdcc1170264fba436ff67e48 -MISC ChangeLog 1835 RMD160 95e7cc5e00475d8bf002268589a67d47863ce761 SHA1 cac78d70dc17be822a66f263c995c115f9417d71 SHA256 dc0d646f75ef2ff01887c63b093a8908ee41805771bf62ee1976d4de49a66cc4 +EBUILD shapelib-1.2.10-r1.ebuild 1220 RMD160 70e294b63a2ec84cea9c6f402a9f860f5b446fc2 SHA1 2cf19153ed2297104807620d440acba5aca084ac SHA256 b5077b1f90106fb47d52b2254b73cdecef06c6e3110aa11fe322bb115f990a28 +MISC ChangeLog 2001 RMD160 d6d3acecb25053aabb38f649a27d7c641b7e0b10 SHA1 fe2e3d396b872039183062587e8098da3cf64ff3 SHA256 958d0e4c7ce1d8b105e2b94f6804991973e19a779194d2f28a0dcfd96f6760ea MISC metadata.xml 441 RMD160 c987199410f870735080ba1b5f8a8286fbce17b4 SHA1 f7bc2b8c7bebdfdc301b0672a76a67d6e26521fc SHA256 aa5df660dea112b2e216bef74e49bc4c648933135f6772038ed5aa5e0de5e0ac diff --git a/sci-libs/shapelib/files/makefile-fix.patch b/sci-libs/shapelib/files/makefile-fix.patch new file mode 100644 index 000000000000..f30bbfc2d215 --- /dev/null +++ b/sci-libs/shapelib/files/makefile-fix.patch @@ -0,0 +1,9 @@ +--- Makefile.orig 2009-10-17 23:37:30.307257014 -0700 ++++ Makefile 2009-10-17 23:38:25.914190883 -0700 +@@ -1,6 +1,7 @@ + + #LINKOPT = /usr/local/lib/libdbmalloc.a ++LINKOPT = $(LDFLAGS) + CFLAGS = -g + + default: all diff --git a/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild b/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild index 3eddad9839d2..4da6c07756c2 100644 --- a/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild +++ b/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild,v 1.3 2009/09/16 04:58:05 nerdboy Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/shapelib/shapelib-1.2.10-r1.ebuild,v 1.4 2009/10/18 07:05:49 nerdboy Exp $ +EAPI="2" inherit eutils toolchain-funcs DESCRIPTION="library for manipulating ESRI Shapefiles" @@ -15,16 +16,17 @@ IUSE="" DEPEND="" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { + epatch "${FILESDIR}"/makefile-fix.patch epatch "${FILESDIR}"/fix-shapelib-test.diff epatch "${FILESDIR}"/stdlib_include_fix.patch sed -i \ -e 's:/usr/local/:${DESTDIR}/usr/:g' \ -e "s:/usr/lib:/usr/$(get_libdir):g" \ -e 's:SHPLIB_VERSION=1.2.9:SHPLIB_VERSION=1.2.10:g' \ - -e "s:-g:${CFLAGS}:g" \ + -e "s:-g:${CFLAGS}:" \ + -e "s:-g -O2:${CFLAGS}:g" \ + -e "s:link gcc :link gcc ${LDFLAGS}:" \ Makefile || die "sed failed" } |