Link with libm wrt bug #246727

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 54 insertions, 16 deletions

diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog
index e13cbff72d4a..78f6da60ac66 100644
--- a/media-libs/openjpeg/ChangeLog
+++ b/media-libs/openjpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/openjpeg
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.18 2008/12/07 11:54:58 vapier Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.19 2009/02/03 15:34:37 drizzt Exp $
+
+*openjpeg-1.3-r1 (03 Feb 2009)
+
+  03 Feb 2009; <drizzt@gentoo.org> openjpeg-1.3.ebuild,
+  +openjpeg-1.3-r1.ebuild:
+  Link with libm wrt bug #246727
 
   07 Dec 2008; Mike Frysinger <vapier@gentoo.org> openjpeg-1.3.ebuild:
   Add arm/s390/sh love #240520.
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index e9dde86cb83d..c5dd3ba889f2 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX openjpeg-1.1.1-Makefile.patch 558 RMD160 485ed66f0db6df3e657fa7fb09a333eae12f9cdb SHA1 5d78c5d2230cc03605e28437a7d84edfb4c230a6 SHA256 216925794ff95f720f910ef414256abf41cf2fb50a1b4cc9e65e3eb812f1b758
 AUX openjpeg-1.2-Makefile.patch 999 RMD160 0088fbadaea6401409071df76591ab6b1c006665 SHA1 79026cb2ea5fb9eafe187b03edad7f21e132a03b SHA256 39d427776b30026aa6ca03df4c52f13ffded210cb8327e351db1c9f170db5040
 AUX openjpeg-1.3-codec-Makefile 722 RMD160 fdc0880dfab7f82d56716afb9b73a283953f0917 SHA1 b38ab6acda4676bba922167a06104f6c6564bdf2 SHA256 6554a08e1cd69476ad3c06cc6322ed28c010ac947a43489b14748c4e51d2a0a4
@@ -9,13 +6,7 @@ DIST openjpeg_v1_2.tar.gz 929866 RMD160 3ac46e0f4cd16bbb52e05ad23e0b4d395c333c27
 DIST openjpeg_v1_3.tar.gz 1004678 RMD160 2a22cc123058b1974cd1bf3898044acabceba26c SHA1 8d6870d9500ea09e0b1d30b981bea1c8de534de4 SHA256 3bca2e1e040f9dcbbcb1e0627f17a76eeb95e153bf663d082070c044a21202bd
 EBUILD openjpeg-1.1.1.ebuild 915 RMD160 0b53488eafaa585dfc3943c14782b570cef9befc SHA1 7fc881f953de08433031e783eeb53792f56e6533 SHA256 6cc342323afcc39dc5bf9d7fcbebafa9ec850167380c30bd599c44e13035db9e
 EBUILD openjpeg-1.2.ebuild 875 RMD160 2d72394fb43dace4f56a7d12b9ec8140cc897dc2 SHA1 d6197ee13a04ad987690cd8b7245ab35a8c5a0ad SHA256 fa43faf3a01c8d797dfb62779a4d6e5f36de82d63591f859e8a8c6d116687321
-EBUILD openjpeg-1.3.ebuild 1204 RMD160 2168132bbec37229c5fca631898ce5a3f0426d47 SHA1 93b29fc45fc2fcffa85be7345c9421075162c237 SHA256 4d3c28a0fd9cf0145cb5cee01b6fafdfaeb0fd83729e685d9adf93b825a6ea20
-MISC ChangeLog 2657 RMD160 dddcfd4c0b097dc585d296f8763472e94aeba344 SHA1 2d68de27655cd5a01233e9a9a99b13a19d41d58d SHA256 a082b141f94db31ff688ce0edee35a063536d6138db0b7ef441d3fe90c2066bc
+EBUILD openjpeg-1.3-r1.ebuild 1247 RMD160 73ebb61dee987e7d55c7b249b980df3404b167ba SHA1 926d84fa5117a62157f8092b97305e8d42413e63 SHA256 44693669257fc5e38ec5f5732f21c2c73e55160132bb1ec5c3433a96e20b7d49
+EBUILD openjpeg-1.3.ebuild 1223 RMD160 7eb7f1760b0b7b4ce69ee2f44d4e17fe1f906420 SHA1 254f65680291e1782505f50e25b59d2b4b808fd4 SHA256 55f1d3bf65364b81b1b70196b5bb701404a27ee167b7e9010035b7827ce39dc7
+MISC ChangeLog 2806 RMD160 fbc0e3547ec1070aefd41bd2b7731fbdd833867c SHA1 03d207133b872d9f46f10f14972c99af76affd17 SHA256 36dd516531e7199c2074b952da42ff1d079e85cfcde58b9e0978ffe562153cb0
 MISC metadata.xml 324 RMD160 2d95e0a01f11bca08961a8f7f2e0d56370567dff SHA1 a7fe255b6b2dd6c97da736a90d8fd41751291ee5 SHA256 a60b95e1f390cbd2b180519d2a200c766fa5adf86534ada54fda51ea1f2310ce
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkk7uZgACgkQ67wieSYcaxc9LQCgjgb0h81mvEgCy1n9viJBcU9A
-HYoAn1P59ki4j+rVEazuPzbN2EbSgH0C
-=esT1
------END PGP SIGNATURE-----
diff --git a/media-libs/openjpeg/openjpeg-1.3-r1.ebuild b/media-libs/openjpeg/openjpeg-1.3-r1.ebuild
new file mode 100644
index 000000000000..168e5d56f298
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-1.3-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.3-r1.ebuild,v 1.1 2009/02/03 15:34:37 drizzt Exp $
+
+inherit eutils toolchain-funcs multilib
+
+DESCRIPTION="An open-source JPEG 2000 codec written in C"
+HOMEPAGE="http://www.openjpeg.org/"
+SRC_URI="http://www.openjpeg.org/openjpeg_v${PV//./_}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="tools"
+DEPEND="tools? ( >=media-libs/tiff-3.8.2 )"
+RDEPEND=${DEPEND}
+
+S="${WORKDIR}/OpenJPEG_v1_3"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-1.2-Makefile.patch
+	cp "${FILESDIR}"/${P}-codec-Makefile "${S}"/codec/Makefile
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" AR="$(tc-getAR)" LIBRARIES="-lm" COMPILERFLAGS="${CFLAGS} -std=c99 -fPIC" || die "emake failed"
+	if use tools; then
+		emake -C codec CC="$(tc-getCC)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" INSTALL_LIBDIR="/usr/$(get_libdir)" install || die "install failed"
+	if use tools; then
+		emake -C codec DESTDIR="${D}" INSTALL_BINDIR="/usr/bin" install || die "install failed"
+	fi
+	dodoc ChangeLog
+}
diff --git a/media-libs/openjpeg/openjpeg-1.3.ebuild b/media-libs/openjpeg/openjpeg-1.3.ebuild
index 9bb4f4b0dda0..110c1d6a24b4 100644
--- a/media-libs/openjpeg/openjpeg-1.3.ebuild
+++ b/media-libs/openjpeg/openjpeg-1.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.3.ebuild,v 1.9 2008/12/07 11:54:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.3.ebuild,v 1.10 2009/02/03 15:34:37 drizzt Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -13,6 +13,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="tools"
 DEPEND="tools? ( >=media-libs/tiff-3.8.2 )"
+RDEPEND=${DEPEND}
 
 S="${WORKDIR}/OpenJPEG_v1_3"