Redo some library options and merge Darwin support #74101.

Package-Manager: portage-2.0.51.22-r2

3 files changed, 63 insertions, 30 deletions

diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 51e9e81ef9f0..b40daa4a9e5e 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.70 2005/10/02 02:15:22 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.71 2005/10/04 23:20:35 vapier Exp $
+
+  04 Oct 2005; Mike Frysinger <vapier@gentoo.org> netpbm-10.29-r1.ebuild:
+  Redo some library options and merge Darwin support #74101.
 
   02 Oct 2005; Jason Wever <weeve@gentoo.org> netpbm-10.29-r1.ebuild:
   Added ~sparc keyword wrt bug #107346.
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index 629ff2af7cb2..b6f9933b7966 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -1,33 +1,43 @@
-MD5 c03b18dd153d7428c4ea02e7b8fdd692 ChangeLog 10068
-MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 e356185ae787b984b1502205834c74f4 netpbm-10.11.14.ebuild 2010
 MD5 bc37890e535cf2fcbe66043b92491072 netpbm-10.11.15.ebuild 2009
+MD5 e1f6c302199a36c1be4ecf1654be9bac metadata.xml 224
+MD5 f17a1fb0d30a71452e534e435c7295b2 netpbm-9.12-r4.ebuild 1343
 MD5 28ca860ea5e88498171e08bc22685c16 netpbm-10.11.5-r3.ebuild 1567
-MD5 323b69ef703b303e44f51be5b762df65 netpbm-10.18.7.ebuild 2009
+MD5 232141f809b3f52bf76ed31cf6cc0771 netpbm-10.29-r1.ebuild 2869
+MD5 895b0e411f04f77b4f7c4d6eadff308a netpbm-10.29.ebuild 2431
+MD5 4ff1d95265184a7c760d4748a4cb1beb netpbm-10.28.ebuild 2460
+MD5 a936cf1a2061cebff85f7a54e12d6422 netpbm-10.20.ebuild 2273
 MD5 fc5b2c41ccdc4c486d3f7b65771753b5 netpbm-10.19.ebuild 1739
+MD5 6954228b2c54d3d9a7903c569e1b7097 ChangeLog 10205
+MD5 323b69ef703b303e44f51be5b762df65 netpbm-10.18.7.ebuild 2009
 MD5 e1d7f1307e675fbbfc3a07f2539c0708 netpbm-10.20-r1.ebuild 2442
-MD5 a936cf1a2061cebff85f7a54e12d6422 netpbm-10.20.ebuild 2273
-MD5 f17a1fb0d30a71452e534e435c7295b2 netpbm-9.12-r4.ebuild 1343
-MD5 4ff1d95265184a7c760d4748a4cb1beb netpbm-10.28.ebuild 2460
-MD5 895b0e411f04f77b4f7c4d6eadff308a netpbm-10.29.ebuild 2431
-MD5 4089544419963c75d595dc676eef8a16 netpbm-10.29-r1.ebuild 2469
-MD5 6735fc271948c349d02f59361b4c373e files/digest-netpbm-10.11.14 65
-MD5 15efd1a3748d1c9b0a9d9e88374bcbbc files/digest-netpbm-10.11.15 65
-MD5 19ce2b4d396523dcbcb1e415d4bdb8c9 files/digest-netpbm-10.11.5-r3 64
-MD5 74da89b4a373ba2116b4ba5d8e9d31a0 files/digest-netpbm-10.18.7 64
-MD5 c06a062a991dc2b0f8bd88ac44a1e5e5 files/digest-netpbm-10.19 62
 MD5 40a3370de6ed591305e4585ffbc605bd files/digest-netpbm-10.20 62
-MD5 40a3370de6ed591305e4585ffbc605bd files/digest-netpbm-10.20-r1 62
+MD5 e03ba0a74da10891ecaa41fb86191275 files/digest-netpbm-10.29-r1 136
 MD5 b38412609f4a8671a787d303b8d2b876 files/digest-netpbm-9.12-r4 61
-MD5 c6c3222383568021fbbdc34114b6f279 files/digest-netpbm-10.28 62
-MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
 MD5 8c4a20ca06c83687436b8cb75917d5f1 files/digest-netpbm-10.29 62
-MD5 e03ba0a74da10891ecaa41fb86191275 files/digest-netpbm-10.29-r1 136
 MD5 3e364cbe32c6c5bd2f329b8dbcf604d5 files/netpbm-10.29-anytopnm.patch 1562
+MD5 19ce2b4d396523dcbcb1e415d4bdb8c9 files/digest-netpbm-10.11.5-r3 64
 MD5 102062d84b1750c991d13e5528a9420b files/netpbm-10.29-build.patch 2278
+MD5 c06a062a991dc2b0f8bd88ac44a1e5e5 files/digest-netpbm-10.19 62
+MD5 c6c3222383568021fbbdc34114b6f279 files/digest-netpbm-10.28 62
+MD5 6735fc271948c349d02f59361b4c373e files/digest-netpbm-10.11.14 65
 MD5 d0d44fe5de727324db35e8110dc81f63 files/netpbm-10.29-pnmtopng-alpha-check.patch 603
-MD5 d3afaf9141525a706f8c077f66918670 files/10.11.14/Makefile.config 17308
+MD5 40a3370de6ed591305e4585ffbc605bd files/digest-netpbm-10.20-r1 62
+MD5 ef9c07e7cbf6b830f8dd61e59fb0a34b files/netpbm-dSAFER.patch 818
+MD5 74da89b4a373ba2116b4ba5d8e9d31a0 files/digest-netpbm-10.18.7 64
+MD5 15efd1a3748d1c9b0a9d9e88374bcbbc files/digest-netpbm-10.11.15 65
+MD5 943662580b449abb996444e348c48298 files/9.12/Makefile.config 11635
 MD5 be5dafab017b8247e09f643e9798441e files/10.11.14/Makefile.svga 17374
-MD5 d3afaf9141525a706f8c077f66918670 files/10.11.5/Makefile.config 17308
+MD5 d3afaf9141525a706f8c077f66918670 files/10.11.14/Makefile.config 17308
 MD5 be5dafab017b8247e09f643e9798441e files/10.11.5/Makefile.svga 17374
-MD5 943662580b449abb996444e348c48298 files/9.12/Makefile.config 11635
+MD5 d3afaf9141525a706f8c077f66918670 files/10.11.5/Makefile.config 17308
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDQw6bgIKl8Uu19MoRAqCDAJ47l5afUDTKnnClQjReVd7UhBCf5ACePp12
+zaTL4ZlJe7Ba/ngBlkX50tg=
+=onH0
+-----END PGP SIGNATURE-----
diff --git a/media-libs/netpbm/netpbm-10.29-r1.ebuild b/media-libs/netpbm/netpbm-10.29-r1.ebuild
index 27dcf0fe1218..37c92dd9013b 100644
--- a/media-libs/netpbm/netpbm-10.29-r1.ebuild
+++ b/media-libs/netpbm/netpbm-10.29-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.29-r1.ebuild,v 1.4 2005/10/02 02:15:22 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.29-r1.ebuild,v 1.5 2005/10/04 23:20:35 vapier Exp $
 
-inherit flag-o-matic toolchain-funcs eutils
+inherit flag-o-matic toolchain-funcs eutils multilib
 
 DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
 HOMEPAGE="http://netpbm.sourceforge.net/"
@@ -23,8 +23,24 @@ DEPEND="jpeg? ( >=media-libs/jpeg-6b )
 	media-libs/jasper
 	media-libs/urt"
 
+netpbm_libtype() {
+	case ${CHOST} in
+		*-darwin*) echo dylib;;
+		*)         echo unixshared;;
+	esac
+}
+netpbm_libsuffix() {
+	local suffix=$(get_libname)
+	echo ${suffix//\.}
+}
+netpbm_ldshlib() {
+	case ${CHOST} in
+		*-darwin*) echo '-dynamiclib -install_name $(SONAME)';;
+		*)         echo '-shared -Wl,-soname,$(SONAME)';;
+	esac
+}
 netpbm_config() {
-	use $1 && echo ${2:-lib$1.so} || echo NONE
+	use $1 && echo -l${2:-$1} || echo NONE
 }
 
 src_unpack() {
@@ -46,20 +62,24 @@ src_unpack() {
 	STRIPFLAG =
 	CFLAGS_SHLIB = -fPIC
 
+	NETPBMLIBTYPE = $(netpbm_libtype)
+	NETPBMLIBSUFFIX = $(netpbm_libsuffix)
+	LDSHLIB = $(netpbm_ldshlib)
+
 	# Gentoo build options
 	TIFFLIB = $(netpbm_config tiff)
 	JPEGLIB = $(netpbm_config jpeg)
 	PNGLIB = $(netpbm_config png)
-	ZLIB = $(netpbm_config zlib libz.so)
-	LINUXSVGALIB = $(netpbm_config svga libvga.so)
+	ZLIB = $(netpbm_config zlib z)
+	LINUXSVGALIB = $(netpbm_config svga vga)
 
 	# Use system versions instead of bundled
-	JBIGLIB = libjbig.a
+	JBIGLIB = -ljbig
 	JBIGHDR_DIR =
-	JASPERLIB = libjasper.so
+	JASPERLIB = -ljasper
 	JASPERHDR_DIR =
-	URTLIB = librle.a
-	URTHDR_DIR = /usr/include/urt
+	URTLIB = -lrle
+	URTHDR_DIR =
 	EOF
 
 	# Sparc support ...