Convert to multilib, replace some plain make calls emake since it should be correct with the -build patch.

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 69 insertions, 8 deletions

diff --git a/media-libs/jbigkit/ChangeLog b/media-libs/jbigkit/ChangeLog
index 58a2791245e0..74b21951642e 100644
--- a/media-libs/jbigkit/ChangeLog
+++ b/media-libs/jbigkit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/jbigkit
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.55 2012/10/07 09:00:54 pacho Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.56 2013/08/10 16:23:55 aballier Exp $
+
+*jbigkit-2.0-r2 (10 Aug 2013)
+
+  10 Aug 2013; Alexis Ballier <aballier@gentoo.org> +jbigkit-2.0-r2.ebuild:
+  Convert to multilib, replace some plain make calls emake since it should be
+  correct with the -build patch.
 
   07 Oct 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, #24135.
diff --git a/media-libs/jbigkit/Manifest b/media-libs/jbigkit/Manifest
index a05c86ab7350..b2e84605eaf2 100644
--- a/media-libs/jbigkit/Manifest
+++ b/media-libs/jbigkit/Manifest
@@ -3,14 +3,15 @@ Hash: SHA256
 
 AUX jbigkit-2.0-r1-build.patch 9364 SHA256 1f8531adbf174a74bfcfabad0302c54b39c2ea5993a62cb46752d5f85e389b4a SHA512 646a322d1c3cea2a4245ab1e99cc7b2b9c53ac3c997c76bbc99b472aabb621da5080ef113f810e29883256023115a53ac0d65a97d8aad8156deae92b939bdea7 WHIRLPOOL 490a1376fd3e4d62ad42da25d3298fc91b37b64209faa2ded2ef87358618a055001da51940d86a1a54e580e6e7bf1a13993785b300aae1116e15f09f9b266ed6
 AUX jbigkit-2.0-static-libs.patch 507 SHA256 e542dec0e97c9a7e61b57804680cc5412f4d3e1a9800119a99c6140763f9005e SHA512 8659a4b9766f4d530ac09b733a852056ef608903535f8e1eab0206ff97fbea29eed1a0518209d8f93e0c6934adf35362cb9ead0ad241e8d08c15f378e3f93fe3 WHIRLPOOL 470ad10279dce12c96895d9a1ce627193d7b16d4149f926f4c252dca7190d70bef2fe950e58c768ed37d10eb7d80b5e8f6c928e98a1a17773379f6f18fadcc61
-DIST jbigkit-2.0.tar.gz 435027 SHA256 f6be61695d18d6315961e473eda92252fdecf9636903bfbf4766a2eeff1f17ee
+DIST jbigkit-2.0.tar.gz 435027 SHA256 f6be61695d18d6315961e473eda92252fdecf9636903bfbf4766a2eeff1f17ee SHA512 63df9d7bb3d18b7c275525ecf06074871a473fadcf60c95fbe28deb7cfb2cc0b152231e1866b67128251facd09996d67ee2129a2540d520ee51ffe4b22c2f18f WHIRLPOOL 1857da79557c9405c533bb02890bdf9acf41df20e40f31655e5450a4272576ff07f48f9e3456f851f751c705409a615468782de2bfc128a471a9605db122b6c8
 EBUILD jbigkit-2.0-r1.ebuild 1335 SHA256 fe85d37df92196d9e55462a67ebfab8157067311f474f6b16a6464af14aa0949 SHA512 1d016ed81f166f736d3f372a144f4159251a90ca516ae02a7a97e2720f62c8227fa661c1b921dd028f75f03f9ab1fe1f6ec0b024f13f0a7744e07cb09d1e3264 WHIRLPOOL 147e81968a37150323c615ef5ba09cdd8a880a3fd262e3993b5afa9486c4236a43363aa2d606c6c03ae8db50dc6c5947568d11c93df8f30e1dad11934e7fb143
-MISC ChangeLog 6523 SHA256 e62f81a3203ebeb742d2296cad4131d183f8a4f38011a57e2d6beb9eef6e5ccd SHA512 610083d313363bebeed5600da8220854f696d4f868a250fc8809c09f3871039c9e3cdaff6c0ac3ef55f52e257359426e9ef80182ce8f7d6920718c0cb3114484 WHIRLPOOL 904c32d470fb155a37e4920df108442cbba4a2368a9fbca977ba31cadb918ed90546ab008f61a46b98e0d4a7ec12ed732c083d9707818b6dce9913a4282156b4
+EBUILD jbigkit-2.0-r2.ebuild 1510 SHA256 7f897c6d89ae6ea6025083e64f50ee347afd741f58d79038eb91520b88687cec SHA512 0729297796dc2acd770fe5cc0f92b9dcaddf58f34c28c600283e98762e0c60610e64c616ddfba504d69bd94f2a7d2be3f014a79b894355e498034d0a24d78014 WHIRLPOOL b61a176e97bdf00e178a0ba481c32bdabc217c2a597af622a78e821f833374fb1872d1ed58b28c2da9276fd05c0b386575e4c82e1d61d850feed6e19a3ef81a0
+MISC ChangeLog 6745 SHA256 03bb57eaf4c8ea6b85c3655eec634327f1ba9e906ae697b0753bfcde72800182 SHA512 1048b65197a46026cb8f1face35375aeac8e4e96883b60c1a31a0e60fda4de21fe53e94b641ffffc1b4127cef2db34b097fb599306c7da3e83cdc29f2ff6dc0e WHIRLPOOL 9c650bd5c17ab1b86c63bb5565dd0feeea1ac2fdefc0bb13a8c6b86a08ba38aca0048b27a08cc7c880703e6782b5a17457965c832042728b9443a671f30f91cf
 MISC metadata.xml 369 SHA256 3f3399c037e30dc50fdba9d473d094fb64b5013a3a3ae8bebdaa2a71949cf037 SHA512 692ae5fdfbb25139ac5dda28d28855c07e105b49f5ff44c821bb242ca2349db1c2390fc2b21557ba86bcff27d513a50aef022e1ea78d5c94ce62b6757b1150f7 WHIRLPOOL c862da460053fde291b412090af9a09d9ab93d05a4ba4b3f3840c3e420a43b93b59663eefff64571fbfaffb99d89321b5502741262a419c1550bffd11bf46b22
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlBxRMcACgkQCaWpQKGI+9SpfACffV70dcfTGFQtXXfhukAWKusY
-iZwAn3VPZ8qUizm55T27x8I9UsxWsdUk
-=8DIo
+iEYEAREIAAYFAlIGaRwACgkQvFcC4BYPU0rkowCaAjrYtM1y/FtnHsEUr3y4CC1Q
+o/YAnRNRcVcRjaF8NNXs89stWeGerNaU
+=lHZz
 -----END PGP SIGNATURE-----
diff --git a/media-libs/jbigkit/jbigkit-2.0-r2.ebuild b/media-libs/jbigkit/jbigkit-2.0-r2.ebuild
new file mode 100644
index 000000000000..566ba8dd37b1
--- /dev/null
+++ b/media-libs/jbigkit/jbigkit-2.0-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r2.ebuild,v 1.1 2013/08/10 16:23:55 aballier Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="data compression algorithm for bi-level high-resolution images"
+HOMEPAGE="http://www.cl.cam.ac.uk/~mgk25/jbigkit/"
+SRC_URI="http://www.cl.cam.ac.uk/~mgk25/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+S=${WORKDIR}/${PN}
+
+DOCS="ANNOUNCE CHANGES TODO libjbig/*.txt"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-r1-build.patch \
+		"${FILESDIR}"/${P}-static-libs.patch
+	multilib_copy_sources
+}
+
+multilib_src_compile() {
+	tc-export AR CC RANLIB
+	emake \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		$(multilib_is_native_abi || echo lib)
+
+	if use static-libs; then
+		cd libjbig && emake static
+	fi
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH=${BUILD_DIR}/libjbig emake -j1 test
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		dobin pbmtools/jbgtopbm{,85} pbmtools/pbmtojbg{,85}
+		doman pbmtools/jbgtopbm.1 pbmtools/pbmtojbg.1
+	fi
+
+	insinto /usr/include
+	doins libjbig/*.h
+	dolib libjbig/libjbig{,85}$(get_libname)
+	use static-libs && dolib libjbig/libjbig{,85}.a
+}