Do not builtin shapelib if sci-libs/shapelib is not installed. Build without shapelib support instead. (bug #430704). Thanks Diego.

Package-Manager: portage-2.1.11.11/cvs/Linux x86_64

4 files changed, 81 insertions, 24 deletions

diff --git a/media-radio/xastir/ChangeLog b/media-radio/xastir/ChangeLog
index acad286796ec..39a8b28b9036 100644
--- a/media-radio/xastir/ChangeLog
+++ b/media-radio/xastir/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-radio/xastir
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.23 2012/06/18 09:04:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/ChangeLog,v 1.24 2012/08/27 18:37:39 tomjbe Exp $
+
+  27 Aug 2012; Thomas Beierlein <tomjbe@gentoo.org> xastir-2.0.0-r2.ebuild,
+  +files/xastir-2.0.0-no-builtin-shapelib.diff:
+  Do not use builtin shapelib if sci-libs/shapelib is not installed. Build 
+  without shapelib support instead. (bug #430704). Thanks Diego.
 
   18 Jun 2012; Agostino Sarubbo <ago@gentoo.org> -xastir-1.9.8.ebuild:
   Remove old
diff --git a/media-radio/xastir/Manifest b/media-radio/xastir/Manifest
index 36f0aa91a156..4fce94c97dc3 100644
--- a/media-radio/xastir/Manifest
+++ b/media-radio/xastir/Manifest
@@ -1,25 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX xastir-1.9.8-Destdir.diff 630 RMD160 510c390e0c68eaf275ccb6a0d06800efddfd60f0 SHA1 566bd560cb78d1a46af7a48954d8c44730a62800 SHA256 a468240fc6c9397272057bf0cdb313dde6420a14b13697b87554e7e6e07f07c8
-AUX xastir-1.9.8-fortify.diff 4349 RMD160 e5eb39b90696dc03f0dc194343bc4738225aee36 SHA1 9a726fc83e28e974717220e1096f4c6be99417ed SHA256 11d2db08af1af0c5c19ece44b6d51b86010e651381d0ed544743de26a8cf9c62
-AUX xastir-1.9.8-scripts.diff 2741 RMD160 68f6b2c5a663b23f83002f3f2b381f7e2470d622 SHA1 e47b3db778066d0fbf5511d2f3b14246b442480a SHA256 44276ac01a0a8da7908444c3d46502fb9a38cea9a73cabbb248b7b68829de517
-AUX xastir-2.0.0-Destdir.diff 704 RMD160 9929466f7e0bafc7f8859a93a07a9f5855091c56 SHA1 735ffde57a1fe14eccd311653cca1279ac7d659f SHA256 d8f403965df2d047250ed723dbf13d18ba4877e8cc3ce8a2c7635f70766bcac7
-AUX xastir-2.0.0-proj48.diff 1245 RMD160 f8fe0506b1f0df6f4fe8c49b56370f89921f4bc1 SHA1 c2fdaed0c6aac7f1476e51da62efc4f212be0a4f SHA256 03c648a3c8bd5a6c4c28279b5c75457cdeae6f39e3d2e2ebf0cec8dce1b3e544
-AUX xastir-2.0.0-scripts.diff 3732 RMD160 d001101f7272f7cc957ad64347410b1ff6b8d549 SHA1 c4920a5cb1b5afaf1fdc05eff0b54cb164370729 SHA256 c0d06a9884d33cc8093d85b6f970dbfa8c24e49520cc2157fa5d6141afe41161
-DIST xastir-2.0.0.tar.gz 2544827 RMD160 43c7f5c1cf9735b0dbe797a3ccc6aead60f7a7bd SHA1 4dcb6445df134362353a49d34acf866250f205b7 SHA256 a7834f9adc802da8fb45c15656efa2f85a5b930dc414251af4cb6b490ddb7281
-EBUILD xastir-2.0.0-r1.ebuild 2313 RMD160 b1f9cd227ac57c53ccfa4c990a3c12bb0543c55b SHA1 41f0a5b5fb8512363deb3279394bbd11bec4721b SHA256 edcc94444fb8ba1ea1d41f9a42d56ed6c061234691e4a6bbe9046e9bd627bc1c
-EBUILD xastir-2.0.0-r2.ebuild 2030 RMD160 5577916f88898657d181f1f3eb9df0a1bc596775 SHA1 2c1c3d8030857232194fd78e6736689f9d4f492a SHA256 5f6605eeba7d2ac8e6e19c0eb42776d0b111fc9ee4578f984413512f9cf98fa8
-MISC ChangeLog 2371 RMD160 bfde68355721c983170bc0bc82f9d87d362322d6 SHA1 bb7f89e1c9239b2db3876ce4e3fdcd28fc8ed303 SHA256 1fbd6a28282a08d3e4b6af5c4a86d8ec0b07c413f1273e07724a04658bceb891
-MISC metadata.xml 601 RMD160 68a4f5fa74bc64c83771fc089045fd7af05b8dea SHA1 5d81b21efb27b3605d4627d2b11296c006af8590 SHA256 9c8d4aeeaa3a07d451671c9646a777c7029fd5ab09217b00b85e6571571f1773
+AUX xastir-1.9.8-Destdir.diff 630 SHA256 a468240fc6c9397272057bf0cdb313dde6420a14b13697b87554e7e6e07f07c8 SHA512 d92bd50ca6c10ddcc3b8e3fa8270a3e246c28e63b81298b6bb4c141dce3e83031c9a1bb16c1c4949afea730a097eb43f6c98d2b2089a88ad55f539eb0af7530e WHIRLPOOL 036f62f08a8b9fec5340cf310fd9ed417d7abda885fa330c969e88ed6471af69f249b7400ca09e6e38a742df921d1625ec92fa76a2e2cbeec037efbc10be4cd7
+AUX xastir-1.9.8-fortify.diff 4349 SHA256 11d2db08af1af0c5c19ece44b6d51b86010e651381d0ed544743de26a8cf9c62 SHA512 8beff19ed9a961fa1aadcf1dec1df36b8c69cbb57f0f100c2d29bed2eb08fb1e3bf0dfa206154afa2ebca803781afb6e3a60f7c3e90b17911f155442d1231e8e WHIRLPOOL c433f7d7d14ea1b68d51ff50e518331df0853e2e267a5a6d68c25e9a9a8cca5371259ce624a44a6cce9c1fb0f072b2a5d67a606d429c36c059eeb2d9df4c5e1b
+AUX xastir-1.9.8-scripts.diff 2741 SHA256 44276ac01a0a8da7908444c3d46502fb9a38cea9a73cabbb248b7b68829de517 SHA512 2e903bc86acb812a372a991efa04e99f8024bb094621b1af4e92db02c6d8dbc38d8e7bab433b5b59807e8e67bcab98e67b79ab0504f04c6c8cac2dae5782c4ac WHIRLPOOL c7f6c8d51648f5e6d68e0f69efe356980c9951ee23a0232c278888446199043c0d47eea95bc5d6a1bfd257028f6aac689b313e798c28af9051f3ac293de3d2a5
+AUX xastir-2.0.0-Destdir.diff 704 SHA256 d8f403965df2d047250ed723dbf13d18ba4877e8cc3ce8a2c7635f70766bcac7 SHA512 3f7f15c00bfb40a1be5a169496f7881859b5e99b7d4f8f654452b52223aae57f1bced2971bcae2a790cf210a9e1a20c1f09befff234404b84a787916231ac845 WHIRLPOOL 52bbca4a5a3bf94f6499f3839e7a401c1c6d8d3d2b660cc7062668d6f29e13a5f5516c3a368f1f2635866a5befd8e59e8142a8dcfbdbf81a3e2e8ceb8eb00731
+AUX xastir-2.0.0-no-builtin-shapelib.diff 2425 SHA256 ae518747d81a03cd831d065228fd03e5b2e1809f09abed13c23d8a4e9e5bf75c SHA512 e33405f105ce2e425034cc94468ea8010026d0089e7912983c273238c8a8442c563ba9f934a36d29649b58967984d722f0dacb845a512babff015c7f208ecbfb WHIRLPOOL 1b2c0b8fb4138f2f3c0a03ace22a6e4b7a4c46476de24cd9fa3a5cb9e6523ce8eed6e0853944fe65731a1c53a35422c6f11ec17f836b91a7c2cee1d4aa8b4126
+AUX xastir-2.0.0-proj48.diff 1245 SHA256 03c648a3c8bd5a6c4c28279b5c75457cdeae6f39e3d2e2ebf0cec8dce1b3e544 SHA512 0fcebcfbe56fd1f3374ec63a11866b6092ce5158101348e4fcc74f6763fb00c114dcaec02db274f5a438e681c1c8ed1f819da4c49af69ee366b3818b2cffa615 WHIRLPOOL 943572176c99b4c6f598a8925dea5173cb1f2eb76c547d45333857a7939b374b7db9359e6723b59fb1d64e3a6bcf6bcad12582421358fc0f93fa8c0c6845de07
+AUX xastir-2.0.0-scripts.diff 3732 SHA256 c0d06a9884d33cc8093d85b6f970dbfa8c24e49520cc2157fa5d6141afe41161 SHA512 c218cc0a970dcf0921e608fc4cb682111301ae3ff44906bf3ac30d202235a859b19872f687b3409a3eea68a839b9dd089521640f7323eab7866f51493394d764 WHIRLPOOL 19cde21bba12df2528d35935eb66119d5e474ba090545a2f255f7fc0dc217b3172a0adbf1d457dcc32614396e1c96d904dbaf6fc78299daccbc11908b5297cb5
+DIST xastir-2.0.0.tar.gz 2544827 SHA256 a7834f9adc802da8fb45c15656efa2f85a5b930dc414251af4cb6b490ddb7281 SHA512 60051a1cf9a49b172fe13340f82b73426bed11b7b785f91c8d33f69b03ef03a19443ec02c9cc86c0bad990266fcb7edc170b8a70883cca85095edebd65453e63 WHIRLPOOL 3edce24e200d5695c31f58fa3cb70a6d0187105af9205c2d46402c9c0181a3954a3321e17a6b57345fa9927cc558729bb7b68751e1f2c537fb81b143cf4c3c23
+EBUILD xastir-2.0.0-r1.ebuild 2313 SHA256 edcc94444fb8ba1ea1d41f9a42d56ed6c061234691e4a6bbe9046e9bd627bc1c SHA512 d6563c2819335cecf765d5ce74a8177b4e72a68edc80c49e3e00b0559ed2448551832c41f288d01a48a9bdd4cad736e86799aaabda1f83b027aa4cf5ed0fd635 WHIRLPOOL d9bfda018176d36106c2332d68c57b6bf8b165c1bb439083d10247775d402da52db5cbec44396873671914ee01609bf76fda1a3510b88a51996aee28f06c313e
+EBUILD xastir-2.0.0-r2.ebuild 2179 SHA256 0a0f4cc9d983b6622e45014890f8d9e6d6d15c4887563e5815a657073b9c8481 SHA512 47cfcba1d7c150b9fd50713b63a4a3bc78082602bc9f06d11e1a0217211dc354532818c619e044884bc04d82bdf9064fbfc98aa8184cdef343e8721fc94436e2 WHIRLPOOL 92afce8a7cdb375afd702ab84c4af9894d68152401a6855db675b90c055494995b3da8b6a760b09f41a7950ee736733fc106351556faa7c7581d8590a895d97d
+MISC ChangeLog 2640 SHA256 210f46bc025910599dd14f29e7dba8a25afa86890c5419528be64b801f02ed04 SHA512 d86113a735e4cda83268b3efb6df444cd86b5b9de80110ec1c772eb16202112d553a82a86764c969f187d8f94feb29a479b08c00e5bdf31459192dbe974ff759 WHIRLPOOL a3d7a20dd25a90877d8f0acf66478f774b829b5418fea9628eb128fb6ff7b3cadfe1cefce58e70c4297095e382388aed2f5a550e7786d7a687000a6c0a6b89e7
+MISC metadata.xml 601 SHA256 9c8d4aeeaa3a07d451671c9646a777c7029fd5ab09217b00b85e6571571f1773 SHA512 371ee7f590a846b095776f687c7bbb3920509923949121872875b8fa7ab22912cf806019998e16ea8443e2efdff3734ec9dbb8aaf9737bd17556eacae9478fa8 WHIRLPOOL d2de0305aee8d707a736a4d03b972a2470cd6dec1f34a1c011e0ef7d62fa42d34a61dab74658e8ae93ad5995768af5cf202a711fcc6c5e51cedaec5426cf68cb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJP3u8KAAoJEOTDgjZ80txd7ukH/jg2qmXR4YXK+ITd4nUf8ioL
-2iP0i6VBSeatxPS0NQvk3JPHUeSruJn2ypej23RLqZR/yBf576XrvdJPWvlH5FpE
-MTkEgYYshFFfse9J3XoB/fS0AZVJTSB8SK3CQPNryUHwCLqnELYAt6E0v1xkrz8k
-Xqq5Id1qWZml9rRAXaJS1YQOt4UfOgED3IRnxDDouw3fz6t3YTplC3ocmm2YwHu/
-i3tCTCcCJWbM8NJc52HYW5cOvApxnvPEGnRusPpFF3/OHSIs9LFzck03P1VMMgPf
-VWngsAOomNDF1tGwPlnEh8jgTnS5VniYzFEjtWxbedRZvyOmr5pIGoT/0EZTgD4=
-=rjgO
+iEYEAREIAAYFAlA7voMACgkQQe4uqXYgU9W3iwCgrGoCnwmxucLlEy9CbmTTKdCD
+9ogAnA+95OD9Z9FZCfyFTNMyIV8yGTQR
+=cNkN
 -----END PGP SIGNATURE-----
diff --git a/media-radio/xastir/files/xastir-2.0.0-no-builtin-shapelib.diff b/media-radio/xastir/files/xastir-2.0.0-no-builtin-shapelib.diff
new file mode 100644
index 000000000000..919b6aa01d64
--- /dev/null
+++ b/media-radio/xastir/files/xastir-2.0.0-no-builtin-shapelib.diff
@@ -0,0 +1,52 @@
+# Do not use builtin bundled shapelib if sci-libs/shapelib is not
+# installed. Drop shapelib support instead (bug #430704)
+--- configure.ac.orig	2012-08-27 20:17:30.000000000 +0200
++++ configure.ac	2012-08-27 20:19:32.000000000 +0200
+@@ -338,24 +338,14 @@
+ 
+ # Check for Shapelib
+ use_shapelib=yes
+-force_internal_shapelib=no
+ shapelib_desired=yes
+ LIBSHP=""
+ SUBSHP=""
+-AC_ARG_WITH(internal-shapelib,[  --with-internal-shapelib  Force use of internal shapelib library.],force_internal_shapelib=$withval)
+ AC_ARG_WITH(shapelib,[  --without-shapelib        Disable shapelib features.],shapelib_desired=$withval)
+ if test "${shapelib_desired}" = "no"; then
+   use_shapelib=no
+-  force_internal_shapelib=no
+ fi
+-if test "${force_internal_shapelib}" = "yes"; then
+-  AC_MSG_WARN([***************************************************************** ])  
+-  AC_MSG_WARN([Internal Shapelib library has been forced.                        ])
+-  AC_MSG_WARN([***************************************************************** ])
+-  # Temporary setting to get into if block below
+-  use_shapelib=no
+-fi
+-if test "${shapelib_desired}" = "yes" -a "${force_internal_shapelib}" = "no"; then
++if test "${shapelib_desired}" = "yes" ; then
+   use_shapelib=no
+   AC_CHECK_HEADERS(shapefil.h libshp/shapefil.h, [AC_CHECK_LIB(shp, DBFOpen, use_shapelib=yes
+     LIBS="$LIBS -lshp"
+@@ -364,21 +354,6 @@
+     AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). )
+     break)])
+ fi
+-if test "${shapelib_desired}" = "yes" -a "${use_shapelib}" = "no"; then
+- AC_MSG_WARN([**************************************************************** ])  
+- AC_MSG_WARN([Your system does not have shapelib installed.  Using an internal ])
+- AC_MSG_WARN([version.  This may lead to a larger filesize for the executable. ])
+- AC_MSG_WARN([Install shapelib on your system to eliminate this warning.       ])
+- AC_MSG_WARN([**************************************************************** ])  
+- LIBSHP="-Lshapelib -lshape"
+- CPPFLAGS="-I\$(top_srcdir)/src/shapelib $CPPFLAGS"
+- SUBSHP="shapelib" 
+- use_shapelib=yes
+- force_internal_shapelib=yes
+- AC_DEFINE(HAVE_DBFGETFIELDINDEX, , Define to 1 if your `shp' library has DBFGetFieldIndex. ) 
+- AC_DEFINE(HAVE_LIBSHP, , Define to 1 if you have the `shp' library (-lshp). )
+- AC_DEFINE(HAVE_SHAPEFIL_H, , Define to 1 if you have the `shapefil.h' header. )
+-fi
+ AC_SUBST(SUBSHP)
+ AC_SUBST(LIBSHP)
+ 
diff --git a/media-radio/xastir/xastir-2.0.0-r2.ebuild b/media-radio/xastir/xastir-2.0.0-r2.ebuild
index 6e0ad546e1a8..a3054a92bb50 100644
--- a/media-radio/xastir/xastir-2.0.0-r2.ebuild
+++ b/media-radio/xastir/xastir-2.0.0-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/media-radio/xastir/xastir-2.0.0-r2.ebuild,v 1.2 2012/06/04 17:51:52 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/xastir/xastir-2.0.0-r2.ebuild,v 1.3 2012/08/27 18:37:40 tomjbe Exp $
 
 EAPI=2
 inherit autotools eutils
@@ -43,12 +43,15 @@ src_prepare() {
 	# fix breakage with >=sci-libs/proj-4.8
 	epatch "${FILESDIR}"/${P}-proj48.diff
 
+	# do not use builtin shapelib if sci-libs/shapelib is not installed
+	# instead build without shapelib support (bug #430704)
+	epatch "${FILESDIR}"/${P}-no-builtin-shapelib.diff
+
 	eautoreconf
 }
 
 src_configure() {
-	econf --without-graphicsmagick \
-		--with-pcre \
+	econf --with-pcre \
 		--with-shapelib \
 		--with-dbfawk \
 		--without-ax25 \