From dfb704351e1348746987976a6b04fa4a180784dd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 15 Mar 2006 01:46:10 +0000 Subject: [PATCH] Update dependencies, add patch to respect LDFLAGS, avoid sed hacking to respect CFLAGS, respect CC. Package-Manager: portage-2.1_pre6-r2 --- media-sound/mp3info/ChangeLog | 9 +++- media-sound/mp3info/Manifest | 43 ++++++++++++++----- .../mp3info/files/mp3info-0.8.4-ldflags.patch | 17 ++++++++ media-sound/mp3info/mp3info-0.8.4-r2.ebuild | 23 +++++----- 4 files changed, 69 insertions(+), 23 deletions(-) create mode 100644 media-sound/mp3info/files/mp3info-0.8.4-ldflags.patch diff --git a/media-sound/mp3info/ChangeLog b/media-sound/mp3info/ChangeLog index 4e0c838a4c8f..c4a6e7a3f635 100644 --- a/media-sound/mp3info/ChangeLog +++ b/media-sound/mp3info/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-sound/mp3info -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/ChangeLog,v 1.15 2005/09/10 15:53:21 flameeyes Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/ChangeLog,v 1.16 2006/03/15 01:46:10 flameeyes Exp $ + + 15 Mar 2006; Diego Pettenò + +files/mp3info-0.8.4-ldflags.patch, mp3info-0.8.4-r2.ebuild: + Update dependencies, add patch to respect LDFLAGS, avoid sed hacking to + respect CFLAGS, respect CC. 10 Sep 2005; Diego Pettenò mp3info-0.8.4-r1.ebuild, mp3info-0.8.4-r2.ebuild: diff --git a/media-sound/mp3info/Manifest b/media-sound/mp3info/Manifest index 388f2695cd74..1818ed1e3d4d 100644 --- a/media-sound/mp3info/Manifest +++ b/media-sound/mp3info/Manifest @@ -1,19 +1,40 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 b7d6c465ac5d1d7bb1338b4d36355bae ChangeLog 2116 -MD5 4fbf04b95be8684b7d17839c70708fba mp3info-0.8.4-r2.ebuild 947 -MD5 05a119f1f1c4675a5c3073ef525347af mp3info-0.8.4-r1.ebuild 858 -MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 -MD5 ad2d1f86b64479bc8dd0b27b192d606f files/digest-mp3info-0.8.4-r2 61 -MD5 8051859c5524c1f7dc847f4a2557a474 files/sanity-checks.patch 487 +MD5 4fb58dc7caf8a8f2906f68d9947a564a ChangeLog 2337 +RMD160 3668e05d2aaa8587d4fd304d0274d12cd9ae570f ChangeLog 2337 +SHA256 bb84fc2ef521f8516897069f6f8f60cef3909beb45d1d3e113f77667bc0c19ce ChangeLog 2337 +MD5 7e73f6eeb2bb3e8971c487c5a9b6a0f8 files/cast.patch 449 +RMD160 dd6b0597185fa44cb04142c45e6b5ac481fdfa58 files/cast.patch 449 +SHA256 68bf86be778411ee777ad41f2175092b1ffbbf1500ba6756a164ec01eac830a2 files/cast.patch 449 MD5 ad2d1f86b64479bc8dd0b27b192d606f files/digest-mp3info-0.8.4-r1 61 +RMD160 2361596586204cdf2581720e4af7d073bf5d06fe files/digest-mp3info-0.8.4-r1 61 +SHA256 e7e7fc683c4f6ae0194535e4f945db51948e5f5fbc3bdc9318bdbd027ee79527 files/digest-mp3info-0.8.4-r1 61 +MD5 ad2d1f86b64479bc8dd0b27b192d606f files/digest-mp3info-0.8.4-r2 61 +RMD160 2361596586204cdf2581720e4af7d073bf5d06fe files/digest-mp3info-0.8.4-r2 61 +SHA256 e7e7fc683c4f6ae0194535e4f945db51948e5f5fbc3bdc9318bdbd027ee79527 files/digest-mp3info-0.8.4-r2 61 MD5 2be66b044256d5db41bb23da1d53b133 files/gcc.patch 825 -MD5 7e73f6eeb2bb3e8971c487c5a9b6a0f8 files/cast.patch 449 +RMD160 c07bb1acc985409f2b33574fe8212840c9737831 files/gcc.patch 825 +SHA256 8e2a3463dbf8fdae531726c3e9de9b7c3eab51587cc38e03bde598dfd657bd00 files/gcc.patch 825 +MD5 c4614adc194785400e4cc5732592014f files/mp3info-0.8.4-ldflags.patch 601 +RMD160 7ffa89a69adee68983ef0d654a90971b65790fd3 files/mp3info-0.8.4-ldflags.patch 601 +SHA256 729c2cec81b6fa285e4b0c34523e7db33a1442da860fe09e325bc2a10c61e83c files/mp3info-0.8.4-ldflags.patch 601 +MD5 8051859c5524c1f7dc847f4a2557a474 files/sanity-checks.patch 487 +RMD160 a4104a9799fbcc8f791d725d24eb7128d85452dd files/sanity-checks.patch 487 +SHA256 673f303b2c81f4afa741f9859b0d96d2c5e78bd979c8488dfc57ce4b6f7ab71b files/sanity-checks.patch 487 +MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 +RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 +SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158 +MD5 05a119f1f1c4675a5c3073ef525347af mp3info-0.8.4-r1.ebuild 858 +RMD160 02360309fab77d343c72b369b51bfbb4274b851b mp3info-0.8.4-r1.ebuild 858 +SHA256 430b97a7800c58090436d29b44c07521f0ef858f9395a47230d0a8743265b9af mp3info-0.8.4-r1.ebuild 858 +MD5 9be6ed7841cdbc0ae80fa3ac53fd84f4 mp3info-0.8.4-r2.ebuild 1098 +RMD160 ef2614f1922667b780c67b8a78fee6788f81b767 mp3info-0.8.4-r2.ebuild 1098 +SHA256 63c2fe380bfae29e60d220a457d0efe643e81e6df42107051678116b3d97f6d0 mp3info-0.8.4-r2.ebuild 1098 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) +Version: GnuPG v1.4.2.2 (GNU/Linux) -iD8DBQFDIwGLj5H05b2HAEkRAvEPAJ0eTmcRviJ4byvs1PU/VDMs/CCSvwCcCkWZ -+965f/dbmrnLwKaFhOfQ7RE= -=jBoE +iD8DBQFEF3H2AiZjviIA2XgRAvx1AJ4khs+bNTYyigWOj+PMUkhrqhmdqACgxBGy +bn+MZLQPBUKjsxWz5vQoBDo= +=O7ep -----END PGP SIGNATURE----- diff --git a/media-sound/mp3info/files/mp3info-0.8.4-ldflags.patch b/media-sound/mp3info/files/mp3info-0.8.4-ldflags.patch new file mode 100644 index 000000000000..e20e4565e783 --- /dev/null +++ b/media-sound/mp3info/files/mp3info-0.8.4-ldflags.patch @@ -0,0 +1,17 @@ +Index: mp3info-0.8.4/Makefile +=================================================================== +--- mp3info-0.8.4.orig/Makefile ++++ mp3info-0.8.4/Makefile +@@ -52,10 +52,10 @@ all: mp3info gmp3info doc + doc: mp3info.txt + + mp3info: $(OBJS) +- $(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS) ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + + gmp3info: $(XSRC) $(XOBJ) +- $(CC) $(XSRC) $(CFLAGS) -o $@ $(XOBJ) `gtk-config --cflags --libs` ++ $(CC) $(XSRC) $(CFLAGS) $(LDFLAGS) -o $@ $(XOBJ) `gtk-config --cflags --libs` + + mp3info.txt: mp3info.1 + groff -t -e -mandoc -Tascii mp3info.1 | col -bx > mp3info.txt diff --git a/media-sound/mp3info/mp3info-0.8.4-r2.ebuild b/media-sound/mp3info/mp3info-0.8.4-r2.ebuild index 5f94aa3bd77d..1de3426d13d2 100644 --- a/media-sound/mp3info/mp3info-0.8.4-r2.ebuild +++ b/media-sound/mp3info/mp3info-0.8.4-r2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/mp3info-0.8.4-r2.ebuild,v 1.3 2005/09/10 15:53:21 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/mp3info/mp3info-0.8.4-r2.ebuild,v 1.4 2006/03/15 01:46:10 flameeyes Exp $ -inherit eutils +inherit eutils toolchain-funcs IUSE="gtk" @@ -10,7 +10,10 @@ DESCRIPTION="An MP3 technical info viewer and ID3 1.x tag editor" SRC_URI="http://ibiblio.org/pub/linux/apps/sound/mp3-utils/${PN}/${P}.tgz" HOMEPAGE="http://ibiblio.org/mp3info/" -DEPEND="gtk? ( =x11-libs/gtk+-1.2* )" +RDEPEND="gtk? ( =x11-libs/gtk+-1.2* ) + sys-libs/ncurses" +DEPEND="${RDEPEND} + sys-apps/groff" SLOT="0" LICENSE="GPL-2" @@ -20,16 +23,16 @@ src_unpack() { unpack ${A} cd ${S} - sed -i -e "s:-O2:${CFLAGS}:" Makefile - epatch ${FILESDIR}/gcc.patch - epatch ${FILESDIR}/cast.patch - epatch ${FILESDIR}/sanity-checks.patch + epatch "${FILESDIR}/gcc.patch" + epatch "${FILESDIR}/cast.patch" + epatch "${FILESDIR}/sanity-checks.patch" + epatch "${FILESDIR}/${P}-ldflags.patch" } src_compile() { - emake mp3info || die + emake mp3info CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die if use gtk; then - emake gmp3info || die "gtk mp3info failed" + emake gmp3info CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "gtk mp3info failed" fi } -- 2.26.2