Remove old, possibly broken, versions. Fix bug #347992 by linking to libstdc++ and libm (and forcing --no-undefined build to be on the safe side). Thanks to Rafał Mużyło for reporting.

Package-Manager: portage-2.2.0_alpha7/cvs/Linux x86_64

5 files changed, 23 insertions, 66 deletions

diff --git a/media-libs/libfpx/ChangeLog b/media-libs/libfpx/ChangeLog
index 181bdcbc09d9..34cd28c3a38a 100644
--- a/media-libs/libfpx/ChangeLog
+++ b/media-libs/libfpx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libfpx
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfpx/ChangeLog,v 1.27 2010/11/28 14:26:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfpx/ChangeLog,v 1.28 2010/12/10 16:29:09 flameeyes Exp $
+
+  10 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -libfpx-1.2.0.13.ebuild, -libfpx-1.3.0.ebuild, libfpx-1.3.0-r1.ebuild:
+  Remove old, possibly broken, versions. Fix bug #347992 by linking to
+  libstdc++ and libm (and forcing --no-undefined build to be on the safe side).
+  Thanks to Rafał Mużyło for reporting.
 
   28 Nov 2010; Brent Baude <ranger@gentoo.org> libfpx-1.3.0-r1.ebuild:
   Marking libfpx-1.3.0-r1 ppc64 for bug 345569
diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest
index 6b33b18e9f5c..adda2b89493f 100644
--- a/media-libs/libfpx/Manifest
+++ b/media-libs/libfpx/Manifest
@@ -1,10 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libfpx-1.2.0.13-export-symbols.patch 343 RMD160 fb3f5b57910c5099880c1e43462ddd3a73eca608 SHA1 e11ff79557890bacfcdf654634bc242ef726a38b SHA256 e06b7ffd990e3e35132fd239ce856157a0d135bd43cc398e3c1f7fd5fb9373f2
-DIST libfpx-1.2.0.13.tar.bz2 2259745 RMD160 72e626c2b661606bece9b5a51c43ae7d111748ad SHA1 e0fe5830673f3126ea30ed52d0a83f2ef91d2c63 SHA256 7f45582ec73588a6ea102a6f51dec5260c6f54951e6b2356a618b139cd3d8f50
 DIST libfpx-1.2.0.9.tar.bz2 2240442 RMD160 f0fc74cdf8e1ba950bc24e9c93aa65095a6d9a2f SHA1 8f37c8a468f5bdc3aaa27f3e95a378c9282c7f58 SHA256 a7e475f14b1110c79d49e777a7d70341f6e2335ef8a28825295a6a279eca701e
 DIST libfpx-1.3.0-1.tar.bz2 2285921 RMD160 0a1a55f571f6d28730a4957ca607091638418e39 SHA1 ee96623144c6ad51dba24dae20a27fb646590bc8 SHA256 0cc240e9458d099c0a50db9c771b3e5b109164472c08f40f31e1190716af48b6
-EBUILD libfpx-1.2.0.13.ebuild 800 RMD160 c6ac4b005182fbc8fd80c71a7d8c24edc3dee3fa SHA1 8f692ec8edfa51c9cd822cda3ba7053d7d665131 SHA256 c95695d1350569cdcbe35c49e8acdfcce5b71a616a9a595f6295be252a4b1fb7
 EBUILD libfpx-1.2.0.9.ebuild 759 RMD160 3d1f22288cfbfcd666d924f7bfb746365b66e54c SHA1 1d42130975fa065a7f92c01392159cb9fe51ddab SHA256 d700444e3842f957924a3fc57d7c5d565436ecb7f50a8259b1cad219ccd4e827
-EBUILD libfpx-1.3.0-r1.ebuild 1096 RMD160 44ffbc6941a8157f43f9af5610ffbf1ae57e6b6f SHA1 e8bef3d18c8c42e2401ca06f026896a297bf183a SHA256 935cc061680f52b068a83adea0eebdb27e70435e6cf543be5b8a8c73e078cd2c
-EBUILD libfpx-1.3.0.ebuild 904 RMD160 65bb4e3fc67765c8a941914f9f3dd21239d42e60 SHA1 73a4acebc78fb1d323ffb55c38488c2298a04681 SHA256 3f9fb7b5330fc3b0dfc0a52a12127ed2cf6545896fe73193468a2afc554a9bf4
-MISC ChangeLog 3377 RMD160 56fcc3cea394d501a4e6186064b5595a7acb8718 SHA1 62ffdb884944ff88e433fdd0d06eb808da54e289 SHA256 33917319ca20936d8f70665f13650f93f32308e60c82c966329d1809a62362a1
+EBUILD libfpx-1.3.0-r1.ebuild 1158 RMD160 3c7697b651448e375ec2346b948c579a42eea9f3 SHA1 f020ad52fe90df9b224ef1971c593a29b7f7e776 SHA256 cd088cd7be033d69144f0377a907e1da81d5b76710996fed8e9f6679e1607fcf
+MISC ChangeLog 3704 RMD160 04a7942d231e371424f3776a2776d200ae84a6a4 SHA1 ec1b3170c2462ead18f009ceca0a1e0b911ee223 SHA256 d1fb83be34979e19fea28a6e0974731522ec26d7409624ef5707f244081f3115
 MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0CVV8ACgkQAiZjviIA2XhbwQCdFeESXVRyoor/ZHQeB8OBqs9R
+gmMAn3q0i0gcnw5T+4pWGsKZuileBrLU
+=+NKg
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libfpx/libfpx-1.2.0.13.ebuild b/media-libs/libfpx/libfpx-1.2.0.13.ebuild
deleted file mode 100644
index 2793fd0dd779..000000000000
--- a/media-libs/libfpx/libfpx-1.2.0.13.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfpx/libfpx-1.2.0.13.ebuild,v 1.2 2007/09/28 13:40:11 uberlord Exp $
-
-inherit eutils
-
-### uncomment the right variables depending on if we have a patchlevel or not
-#MY_P=${PN}-${PV%.*}-${PV#*.*.*.}
-#MY_P2=${PN}-${PV%.*}
-MY_P=${PN}-${PV}
-MY_P2=${PN}-${PV}
-
-DESCRIPTION="A library for manipulating FlashPIX images"
-HOMEPAGE="http://www.i3a.org/"
-SRC_URI="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/${MY_P}.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-S=${WORKDIR}/${MY_P2}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc doc/*
-}
diff --git a/media-libs/libfpx/libfpx-1.3.0-r1.ebuild b/media-libs/libfpx/libfpx-1.3.0-r1.ebuild
index ef34cbb13633..fbefc26ac594 100644
--- a/media-libs/libfpx/libfpx-1.3.0-r1.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.0-r1.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/media-libs/libfpx/libfpx-1.3.0-r1.ebuild,v 1.7 2010/11/28 14:26:13 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libfpx/libfpx-1.3.0-r1.ebuild,v 1.8 2010/12/10 16:29:09 flameeyes Exp $
 
 EAPI=2
 inherit eutils flag-o-matic libtool
@@ -22,8 +22,10 @@ src_prepare() {
 }
 
 src_configure() {
+	append-ldflags -Wl,--no-undefined
 	econf \
-		--disable-dependency-tracking
+		--disable-dependency-tracking \
+		LIBS="-lstdc++ -lm"
 }
 
 src_install() {
diff --git a/media-libs/libfpx/libfpx-1.3.0.ebuild b/media-libs/libfpx/libfpx-1.3.0.ebuild
deleted file mode 100644
index 084e95154964..000000000000
--- a/media-libs/libfpx/libfpx-1.3.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libfpx/libfpx-1.3.0.ebuild,v 1.3 2010/01/15 09:32:29 fauli Exp $
-
-EAPI=2
-inherit libtool
-
-DESCRIPTION="A library for manipulating FlashPIX images"
-HOMEPAGE="http://www.i3a.org/"
-SRC_URI="ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/${P}-1.tar.bz2"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog doc/*.txt || die "dodoc failed"
-	insinto /usr/share/doc/${PF}/pdf
-	doins doc/*.pdf || die "doins failed"
-}