diff options
| -rw-r--r-- | media-radio/ibp/ChangeLog | 8 | ||||
| -rw-r--r-- | media-radio/ibp/Manifest | 19 | ||||
| -rw-r--r-- | media-radio/ibp/files/ibp-0.21-ldflags.patch | 7 | ||||
| -rw-r--r-- | media-radio/ibp/ibp-0.21.ebuild | 31 |
4 files changed, 35 insertions, 30 deletions
diff --git a/media-radio/ibp/ChangeLog b/media-radio/ibp/ChangeLog index 45016ea9faea..a8351024c362 100644 --- a/media-radio/ibp/ChangeLog +++ b/media-radio/ibp/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-radio/ibp -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/ibp/ChangeLog,v 1.4 2010/10/24 15:33:31 phajdan.jr Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-radio/ibp/ChangeLog,v 1.5 2012/11/12 19:14:37 tomjbe Exp $ + + 12 Nov 2012; Thomas Beierlein <tomjbe@gentoo.org> ibp-0.21.ebuild, + -files/ibp-0.21-ldflags.patch: + Respect CFLAGS, do not use cc (bug #440900). Thanks Diego 24 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> ibp-0.21.ebuild: x86 stable wrt bug #341469 diff --git a/media-radio/ibp/Manifest b/media-radio/ibp/Manifest index f3bde901a2b7..df67f3799447 100644 --- a/media-radio/ibp/Manifest +++ b/media-radio/ibp/Manifest @@ -1,17 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX ibp-0.21-ldflags.patch 241 RMD160 76ce5e887aa6567cb6dc4afe455a5f55aef77920 SHA1 9bfd37ce048781b67c6848fbd75059c34d1fafb5 SHA256 3a233f0f085d003ec6901f2c44c325df4b1d87210ac9afb14ec164e55df5715d -DIST ibp-0.21.tgz 33536 RMD160 ffc23bb7ea0c937120d03c237328f3307279e8cd SHA1 2eb1a7cba735e73427b0a1ef076ee4bee6600462 SHA256 b3b118ca83619f0a5605652a0a8c385c77ada3a10321a771e2d19f9f59604abd -EBUILD ibp-0.21.ebuild 813 RMD160 8e6ea8ba108da6f7315c369b95f36b0c845adf5b SHA1 72a685551f3f05eae4a2aa62509816ee3b877654 SHA256 caf2da1d5e8b8a633e6da742dd5caa20bf2a9bef368e0aae53955853066b431e -MISC ChangeLog 737 RMD160 e8e2dab903eae0bff1335c9454d944180e39d00d SHA1 d9431f613e47e608bc5b260fdf52314144020738 SHA256 1387f6d6a9f59e6bccb5120757076a17a34f9a06c86dba470d6284ec0f88b8cb -MISC metadata.xml 235 RMD160 f4ff4565289571ee422eccea7fdfefad9ee6be79 SHA1 8bd6a736d788a9b631454c68331b18f94402ea59 SHA256 ae15692b7066faecf636a6f882d1b44a4fb1e6357ba1c0a91b5753d43eb0139d +DIST ibp-0.21.tgz 33536 SHA256 b3b118ca83619f0a5605652a0a8c385c77ada3a10321a771e2d19f9f59604abd SHA512 784bdcae61ce41dff7d88eb2068171dafa607012660393188326e94e323fdf5badebf3d8a24016c83c96c770b6d0935fc35aef5aca6bbfd665b7f2ccf39118ca WHIRLPOOL f3ebf23a5d797b564e8669aad0cbd8827e5dfc01f13f5b24c6d268f9e1a16be143eaf5257755d47efbccab8ab99e1caa113671509bc04ea3ded9850caba037a7 +EBUILD ibp-0.21.ebuild 995 SHA256 0c6a21a8ef6af2aacb1fc86644a229e412fa3aa43e595324252c8e0d0e5017b3 SHA512 65787b620687402dc9808eb9bb8d3723347164ec2fd382042b160d2162263be283f384d6fe4ce8f6adeba61b9ef2e1c102f41699aed9bdcd4b5b39763116097a WHIRLPOOL 11c38a3cee278934fee9a9e14d5a60687d72f35afdb743bd36232de5e5319e7aa9786f9874be77df2bc7d524e935e43fe35af254700dd72e450834c44371066c +MISC ChangeLog 896 SHA256 fa8a75f613a590c5244e270bf3683b541b15339831077824a2dc3fb501d877d8 SHA512 81991380ee145be7aca48733e9aff5c8bfc244388ff21a677a8839ced45ebdb72534e04383cec3cade0d89fa5795c49db9fd4926c0082579e9d578fe2b1b9e9d WHIRLPOOL 7107acd09c0a57444d5d47e2d31819705ac0e86f5f203ab172483122b05db798798a6d89a0acc738f2423c622cbd3d2399b37d242df1b1fda52e8d03142ebf7a +MISC metadata.xml 235 SHA256 ae15692b7066faecf636a6f882d1b44a4fb1e6357ba1c0a91b5753d43eb0139d SHA512 b9faad5ebd8050835c9acdd103ac79a026077fa2aa89530e6cd0f0c8c5b1afd2cf0fac187a85ed8dc1d901a17157ea0ca468985b2a16099ea49a20cfe25c5ca1 WHIRLPOOL 835fdc49a180de4347ea082036705ed23eac16b53de2cff4b88a876eface5233f3b87cb60fca00e3577862a55fa8f385e117c3493b2ae595e3ec755c8d93fb42 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.19 (GNU/Linux) -iJwEAQEIAAYFAk59oZYACgkQfXuS5UK5QB13iAP+JQQ5IuXiT4e7l/hmUwMTRxEv -XZV0N4o0d10ntUhzcEqivDpR+r3+LN6YQ3HyORjR8Q5L3zeINBccXb9A9GHfLrCm -0T3MWJc2skHcamCvGCa7C5wM+bcPr1xjN5BcpGp8tA6EZ/L6Q8G/5NGBjcNtI9gP -FTP/WCX6KRdnXTu9FIA= -=48WB +iEYEAREIAAYFAlChSqoACgkQQe4uqXYgU9UluwCgtvuUm8M+4RX+mvhk4Yv5YivX +2VoAn1i+hxJIBBdvQuFF/8FwhjPpvUoQ +=aTQg -----END PGP SIGNATURE----- diff --git a/media-radio/ibp/files/ibp-0.21-ldflags.patch b/media-radio/ibp/files/ibp-0.21-ldflags.patch deleted file mode 100644 index d33103b4d833..000000000000 --- a/media-radio/ibp/files/ibp-0.21-ldflags.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- Imakefile.old 2010-10-19 08:44:15.000000000 +0200 -+++ Imakefile 2010-10-19 08:43:56.000000000 +0200 -@@ -1,3 +1,4 @@ -+LOCAL_LDFLAGS = $(LDFLAGS) - SYS_LIBRARIES = -lX11 -lm -lcurses - SRCS = ibp.c xdisp.c large.bits.h - OBJS = ibp.o xdisp.o diff --git a/media-radio/ibp/ibp-0.21.ebuild b/media-radio/ibp/ibp-0.21.ebuild index cc395c940c4b..dbd9cfb73211 100644 --- a/media-radio/ibp/ibp-0.21.ebuild +++ b/media-radio/ibp/ibp-0.21.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-radio/ibp/ibp-0.21.ebuild,v 1.4 2010/10/24 15:33:31 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-radio/ibp/ibp-0.21.ebuild,v 1.5 2012/11/12 19:14:37 tomjbe Exp $ -EAPI="2" - -inherit eutils +EAPI="4" +inherit eutils toolchain-funcs DESCRIPTION="Shows currently transmitting beacons of the International Beacon Project (IBP)" HOMEPAGE="http://wwwhome.cs.utwente.nl/~ptdeboer/ham/${PN}.html" @@ -21,16 +20,28 @@ DEPEND="${RDEPEND} X? ( x11-misc/imake )" src_prepare() { - epatch "${FILESDIR}"/${P}-ldflags.patch + # respect CFLAGS if built without USE=X + sed -i -e "s/= -D/+= -D/" Makefile || die } src_configure() { - if ( use X ) ;then - xmkmf || die " xmkmf failed" + if use X ;then + xmkmf || die + fi +} + +src_compile() { + if use X ; then + emake \ + CC="$(tc-getCC)" \ + LOCAL_LDFLAGS="${LDFLAGS}" \ + CDEBUGFLAGS="${CFLAGS}" + else + emake CC="$(tc-getCC)" fi } src_install() { - dobin ${PN} || die - doman ${PN}.1 || die + dobin ${PN} + doman ${PN}.1 } |