Make ssuominen happy by introducing patch and add 5 more lines to ebuild to not spent 2 seconds on AR command.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 29 insertions, 5 deletions

diff --git a/media-libs/jbigkit/ChangeLog b/media-libs/jbigkit/ChangeLog
index ea3502ff17f0..80d43df41c16 100644
--- a/media-libs/jbigkit/ChangeLog
+++ b/media-libs/jbigkit/ChangeLog
@@ -1,6 +1,11 @@
 # 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.52 2012/03/12 19:15:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/ChangeLog,v 1.53 2012/03/12 19:48:08 scarabeus Exp $
+
+  12 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/jbigkit-2.0-static-libs.patch, jbigkit-2.0-r1.ebuild:
+  Make ssuominen happy by introducing patch and add 5 more lines to ebuild to
+  not spent 2 seconds on AR command.
 
   12 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> jbigkit-2.0-r1.ebuild:
   If we build static libraries, we should also install them.
diff --git a/media-libs/jbigkit/files/jbigkit-2.0-static-libs.patch b/media-libs/jbigkit/files/jbigkit-2.0-static-libs.patch
new file mode 100644
index 000000000000..1387fbe144b0
--- /dev/null
+++ b/media-libs/jbigkit/files/jbigkit-2.0-static-libs.patch
@@ -0,0 +1,14 @@
+diff -urN jbigkit.old/libjbig/Makefile jbigkit/libjbig/Makefile
+--- jbigkit.old/libjbig/Makefile	2012-03-12 20:42:50.774142386 +0100
++++ jbigkit/libjbig/Makefile	2012-03-12 20:43:20.147140210 +0100
+@@ -14,7 +14,9 @@
+ 	SONAME = so
+ endif
+ 
+-all: libjbig.a libjbig.$(SONAME) libjbig85.a libjbig85.$(SONAME) tstcodec tstcodec85
++all: libjbig.$(SONAME) libjbig85.$(SONAME) tstcodec tstcodec85
++
++static: libjbig.a libjbig85.a
+ 
+ tstcodec: tstcodec.o jbig.o jbig_ar.o
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o tstcodec $+
diff --git a/media-libs/jbigkit/jbigkit-2.0-r1.ebuild b/media-libs/jbigkit/jbigkit-2.0-r1.ebuild
index e49d17d1a8ac..bd91bde3aad8 100644
--- a/media-libs/jbigkit/jbigkit-2.0-r1.ebuild
+++ b/media-libs/jbigkit/jbigkit-2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild,v 1.12 2012/03/12 19:15:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/jbigkit/jbigkit-2.0-r1.ebuild,v 1.13 2012/03/12 19:48:08 scarabeus Exp $
 
 EAPI=4
 
@@ -13,17 +13,22 @@ 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+IUSE="static-libs"
 
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-r1-build.patch
+	epatch \
+		"${FILESDIR}"/${P}-r1-build.patch \
+		"${FILESDIR}"/${P}-static-libs.patch
 }
 
 src_compile() {
 	tc-export AR CC RANLIB
 	emake LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+	if use static-libs; then
+		cd libjbig && make static
+	fi
 }
 
 src_test() {
@@ -37,7 +42,7 @@ src_install() {
 	insinto /usr/include
 	doins libjbig/*.h
 	dolib libjbig/libjbig{,85}$(get_libname)
-	dolib libjbig/libjbig{,85}.a
+	use static-libs && dolib libjbig/libjbig{,85}.a
 
 	dodoc ANNOUNCE CHANGES TODO libjbig/*.txt
 }