Revbump to fix linking against jpeg library problem on Solaris when versioning is...

Package-Manager: portage-2.2.01.20023-prefix/cvs/Darwin i386

diff --git a/media-libs/jpeg/ChangeLog b/media-libs/jpeg/ChangeLog
index 977bc355a2829c9ea0b19a0830b11fe33cd5d46a..94a1de8a2e9c4f395c57d056c9077d16c4d21edc 100644 (file)
--- a/media-libs/jpeg/ChangeLog
+++ b/media-libs/jpeg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/jpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.119 2011/01/19 20:21:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/ChangeLog,v 1.120 2011/12/25 11:26:15 grobian Exp $
+
+*jpeg-8c-r1 (25 Dec 2011)
+
+  25 Dec 2011; Fabian Groffen <grobian@gentoo.org> +jpeg-8c-r1.ebuild:
+  Revbump to fix linking against jpeg library problem on Solaris when versioning
+  is enabled.  Move source preparations from src_unpack into src_prepare.
 
 *jpeg-8c (19 Jan 2011)
 

diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index fc6b23713b798b0830a646e48becbcf6b5060037..9b53dbbf0868fcb7fe7e6474b748def314b708cf 100644 (file)
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Makefile.in.extra 814 RMD160 f8cc72b3c7eceb5cfb3413d6f70b37a45794081b SHA1 aa15a6662862b6e4459b44d98957011f491e8ac3 SHA256 067806da66421b303a155243bd80d729a10ca3f15182490fef3e55fc17ad9cf4
 AUX jpeg-7-maxmem_sysconf.patch 1313 RMD160 5c6821fc4150b95e67e61bbf330362d938e58d46 SHA1 0b9b6741e58e2964a15a520aa23ab23534d6e92d SHA256 92d08b14ade2f42291d3de8074f5e4f9dd3c64dd9ec227bc770a0825187202de
 DIST jpeg-6b-patches-2.tar.bz2 3703 RMD160 71f15f911baa0c60d5b2d78069c25f8a23f367b1 SHA1 dfb1a237f0984d3d3f03cdf3503b1ce72d50a81b SHA256 62d8496764330c57cc29137ee46c3cd76ce6463680f9e2e63af8bc4483439b2d
@@ -9,6 +12,14 @@ DIST libjpeg7_7-1.diff.gz 11554 RMD160 193bcb5fdc7360707cbb450c16888499085dd2c6
 EBUILD jpeg-6b-r9.ebuild 1091 RMD160 369507ab90e7b5a3c3182c169b66ffbcc76a7fbb SHA1 055b2ac70da0b34a06c56d35e90e79aa64a7cd14 SHA256 f3a41589896686abd7591c3b8e56395b2c61da047af283577ab8e47e69a7f8f8
 EBUILD jpeg-7-r1.ebuild 1206 RMD160 e093481dc826f1408bf50fb79424012f058895a5 SHA1 04b5fa14c37d326a000ca12588d5a028a5b199bf SHA256 c06e956ec11edd175e9c689ccc6455a2728052d265437ee9b89f7c4ab22baad0
 EBUILD jpeg-8b.ebuild 1538 RMD160 a9e771a155be5a55085f16661fca8033a78c2d78 SHA1 7096c39fc9fe2d33641b0596db94d473e47ce1e3 SHA256 24f7f0e30f57a9ecec3e70859a28f3e70a03f966b1ec9986c7c2c5e1a116a940
+EBUILD jpeg-8c-r1.ebuild 1817 RMD160 e9428b9dceaa0f36c9977864fd4369b3e26bafb4 SHA1 3e2437c367d3eebee2557fb323f925f2edde2a2b SHA256 7494d71d886350a2426a451179083321fe08ee645fcbb595082c0b9bd9878575
 EBUILD jpeg-8c.ebuild 1583 RMD160 06975227d003f19f0684691d51a70c3153dbd3f1 SHA1 b1952e11c9e549adcd2cc6b4e1d858b2e77ef0f3 SHA256 e63e8f053fbb0fbd28a0c91fb2b2653d5477d8466d7e4a9a7528e3c76f40e263
-MISC ChangeLog 14133 RMD160 12c52220b8f0e7ba38ec78f010605ee3425022c7 SHA1 a09f2534b54261914e78b02fe730cb5c585bd0ec SHA256 f1ea6124c50846ac14243bcdb0e73bf28bc80b6fc11b17aaba20af0b12637bd3
+MISC ChangeLog 14385 RMD160 d81c30c7ca24c7708d84517e1e1d8ad8e98482d2 SHA1 c15037b1899a63f0652f77d8041ea2c24f9ba07f SHA256 7eadea258fd3d96cd4ba08dada6b52240dcc7440ad3b856c009b0683feb384f9
 MISC metadata.xml 224 RMD160 3a7dcbadaed2b7ed12e11152fe1fe2de0193fc29 SHA1 fa5078079869e963f3f51f80124cecf8ea6c1b67 SHA256 806818bba7ae36d62f16c1fe548a1eb2a360caf2d984aa8f47bba7b91ff73434
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (Darwin)
+
+iEYEARECAAYFAk73CFwACgkQX3X2B8XHTomJQQCdG0uSuVFkZiadp/Pw6HSFaxYJ
+T9UAn0Bz7IYSaROv3VV3qvNKPu8OHHJX
+=2n05
+-----END PGP SIGNATURE-----

diff --git a/media-libs/jpeg/jpeg-8c-r1.ebuild b/media-libs/jpeg/jpeg-8c-r1.ebuild
new file mode 100644 (file)
index 0000000..964bdce
--- /dev/null
+++ b/media-libs/jpeg/jpeg-8c-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-8c-r1.ebuild,v 1.1 2011/12/25 11:26:15 grobian Exp $
+
+EAPI="3"
+
+DEB_PV="7-1"
+DEB_PN="libjpeg7"
+DEB="${DEB_PN}_${DEB_PV}"
+
+inherit eutils libtool multilib
+
+DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
+HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
+SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
+       mirror://gentoo/${DEB}.diff.gz"
+#      mirror://debian/pool/main/libj/${DEB_PN}/${DEB}.diff.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+src_prepare() {
+       epatch "${WORKDIR}"/${DEB}.diff
+       epatch "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch
+       cp "${FILESDIR}"/Makefile.in.extra debian/extra/Makefile.in
+       elibtoolize
+       # hook the Debian extra dir into the normal jpeg build env
+       sed -i '/all:/s:$:\n\t./config.status --file debian/extra/Makefile\n\t$(MAKE) -C debian/extra $@:' Makefile.in
+}
+
+src_configure() {
+       # unbreak compilation against this library on Solaris, same issue as on
+       # DragonFly BSD:
+       # http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
+       local ldverscript=
+       [[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
+       econf \
+               --disable-dependency-tracking \
+               --enable-shared \
+               $(use_enable static-libs static) \
+               --enable-maxmem=64 \
+               ${ldverscript}
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die
+       dodoc change.log example.c README *.txt
+
+       find "${ED}" -name '*.la' -exec rm -f '{}' +
+}