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.

(Portage version: 2.2.0_alpha7/cvs/Linux x86_64)

4 files changed, 11 insertions, 61 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/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"
-}