Revision bump: install static libs optionally, wrt bug #456648

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

4 files changed, 82 insertions, 16 deletions

diff --git a/dev-libs/libx86/ChangeLog b/dev-libs/libx86/ChangeLog
index e0b043aec295..da35b1a651b6 100644
--- a/dev-libs/libx86/ChangeLog
+++ b/dev-libs/libx86/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libx86
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86/ChangeLog,v 1.18 2013/02/10 14:52:44 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86/ChangeLog,v 1.19 2013/02/11 12:41:25 pinkbyte Exp $
+
+*libx86-1.1-r3 (11 Feb 2013)
+
+  11 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> +libx86-1.1-r3.ebuild,
+  +files/libx86-1.1-makefile.patch:
+  Revision bump: install static libs optionally, wrt bug #456648
 
   10 Feb 2013; Michael Palimaka <kensington@gentoo.org> -libx86-1.1-r1.ebuild:
   Remove old.
diff --git a/dev-libs/libx86/Manifest b/dev-libs/libx86/Manifest
index 35f3b50eed54..d4cfc8fe0de0 100644
--- a/dev-libs/libx86/Manifest
+++ b/dev-libs/libx86/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX libx86-0.99-ifmask.patch 584 SHA256 b8070e57c5d267b3736b133e4c3c92965cc5a62e72466b705b506ad2ce39dd25 SHA512 781ea16e535ca1c0a54552b51d67b0901102f20ab63ff5ff39f9f2bb513abb53867eb5e52089e72afa6c313380b2033881f17cfe233b09a38ed5a9e95ad8d5f8 WHIRLPOOL 148e94477662dd91e654972f8ad475808574e006677e3858346c864b580776ec203457d1011f05d984ba82231f8ebdddac46e8f9bd1e1650e831268c7abe0b66
+AUX libx86-1.1-makefile.patch 853 SHA256 ce7c23404e1ba95343418cc0256c7ad2db702b79518e4cda77c802dfbbce306f SHA512 a61e21ab31b1f22d898799ecc3db57e6816146488d436d3d33817f0ac19d420562830411111bacd8ca4c80a446c088fb931ee293522828076d0a1cae6e7ee0a6 WHIRLPOOL 80d8a599a7fa6aa54f3a65076c5642f5281e79eb283215ced4da9e5523f74c21e17a26eb75b8957757b96f71b7f0a3eee5a0098b46099df2ac193c2577853a7e
 DIST libx86-1.1.tar.gz 87428 SHA256 5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048 SHA512 b946555a45405a06fdf00b3e2522fc99dd7c61349c32726221aa60117a8d3da6da4b44188b1ebb208368e12b396f26055437cebcc8a0e6df10c7a006182c9280 WHIRLPOOL 778dae64fb0a21988debb12ca43ca6eed94fc34ab8d0e012aa30914053f57e6817fc7bbec42f6a85a0be4399263c035f981708036804cb756875143f91fe227c
 EBUILD libx86-1.1-r2.ebuild 924 SHA256 32f80eff9b0ca27783bdae1dd5337e58519cc1859f063e971b5d0409db62753e SHA512 3eb4654eade677eecbe634b3c210d46e985102d81472954f19be2c2c93554c637604a718b252cd47637bfdfd356d742323df6cfa1da85d4821203a10b26aeff5 WHIRLPOOL fd2e280261fe576bc84eafc32beb007ce8e89070d18f2150de4c45eb08962651f527b055775ad39a0950c23c952f02a8370a771cb13e4e19cc421870d10cc542
-MISC ChangeLog 2597 SHA256 9b6f4c7cc97024ff20afa7872690cd9587d28e361ae0796b82575f1455754caf SHA512 85829664eae4c2b25e1cffb065cf57593a038bed535285a68bfe3f4a494a50bdbc9a67d1382e021eddaade88c75e35ed52bb12af2ef2dc5f23254e592f7d6b68 WHIRLPOOL c4e8a77e85e59fd09153db5f43c9c5581cb336f522299a20fdfa91df65b9f6bafacca2911c40228ad314ba4b5f5d5b4bec92e7ee3d4e8145a0c278c5094203ac
+EBUILD libx86-1.1-r3.ebuild 1157 SHA256 f7febb81579f97ec84391971a324640d155b9871af5318d0c8dcfb654c32204d SHA512 363277201fd2538106e9e62d7606dc9a3c3e23fb5f86c77bcac270405a57d6e21ade193ea43d3ebd67b67ecfeed4f2357176b2fa8a19872915427c427225f1c3 WHIRLPOOL 96da6972aac2792807a39c20e2b5d884d7c579f5b7bffbd513ea24ffdc13445fc32e49aad6f799c499b1b6ddae4e4ac1f14ac38972eca004213664eb36e58844
+MISC ChangeLog 2800 SHA256 dc976d5d55e05fa27d4c718184c78425e4cb99d2617296dd700d45d15451b78e SHA512 aae5a1d4b1bcb6524ac5c0e44ea6a44b52d978887db32acb206c2b65f37c61700c30066bdde8572c79dda871a0eec90e89ff7a9c91177be72ecf4dfa64a66d59 WHIRLPOOL 87675392620f9bb095fe4dcecf5929247ed46255232e1858e27ea44b9e0ad6ad7c094c856789e94f4841edead2791e482d27eee10b567e2a7cf6b7749e17ff04
 MISC metadata.xml 268 SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb SHA512 8e365ead118785104bc7576a48a106346ef24f5b709349f8ca3d5fb9107a248d0f172e6898fb4ba4b2b7f84e6c8c7960578a2919e1a3692664cb808b16e6b2b2 WHIRLPOOL 255e754b42ff038b07a48321ced9fe6f8acdc99bb85873807b3e902517a1764dabc7152e5ca9ad4d83ab5dc9d3a611f79e6c066121be77aed3cad1b0f3587b73
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJRF7Q8AAoJEMbwO6tnXQ0sAAsH/A53OivI/tXvEU87sbtYMO4P
-jkKo63uOSHC0Yo5G9qoXk/AryeKZXrkBTZMFm8ABHCDcCh9zsitC7uQZXQCJV8xO
-RqtDw4BnpV6wKyJGkxmg5nWH8gf8qEy31qbQtxSVmNZ6SHZb5QCzUoLEZh+p3qd9
-pAsLmY7Xvv2A9qmrUfSPaKIVA3jLRhdc2WVs5A93htPCKLR+/g/zbJl6p72jv16W
-Q+as7RxRtBauq0RRapuMPXf1cXUKPxzAjWcnezv0gz9G1NZs8pSNxZIQh7LsoK9A
-DeiFQSrZFSs7Tw+XYC2ZJ9NwhWmst0Tuxymu6tAZ9OeGZHSIbvfIwRRfoTEYZmg=
-=JkwT
------END PGP SIGNATURE-----
diff --git a/dev-libs/libx86/files/libx86-1.1-makefile.patch b/dev-libs/libx86/files/libx86-1.1-makefile.patch
new file mode 100644
index 000000000000..471c3fbc78fd
--- /dev/null
+++ b/dev-libs/libx86/files/libx86-1.1-makefile.patch
@@ -0,0 +1,28 @@
+--- Makefile.orig	2013-02-11 16:35:56.834368910 +0400
++++ Makefile	2013-02-11 16:36:02.587369368 +0400
+@@ -22,7 +22,7 @@
+ 	$(AR) cru libx86.a $(OBJECTS)
+ 
+ shared: $(OBJECTS)
+-	$(CC) $(CFLAGS) -o libx86.so.1 -shared -Wl,-soname,libx86.so.1 $(OBJECTS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o libx86.so.1 -shared -Wl,-soname,libx86.so.1 $(OBJECTS)
+ 
+ objclean:
+ 	$(MAKE) -C x86emu clean
+@@ -31,8 +31,14 @@
+ clean: objclean
+ 	rm -f *.so.1 *.a
+ 
+-install: libx86.so.1
++install-shared: libx86.so.1
+ 	install -D libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so.1
+-	install -D libx86.a $(DESTDIR)$(LIBDIR)/libx86.a
+ 	ln -sf libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so
++
++install-header:
+ 	install -p -m 0644 -D lrmi.h $(DESTDIR)/usr/include/libx86.h
++
++install-static:
++	install -D libx86.a $(DESTDIR)$(LIBDIR)/libx86.a
++
++install: install-shared install-static install-header
diff --git a/dev-libs/libx86/libx86-1.1-r3.ebuild b/dev-libs/libx86/libx86-1.1-r3.ebuild
new file mode 100644
index 000000000000..62609313a199
--- /dev/null
+++ b/dev-libs/libx86/libx86-1.1-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libx86/libx86-1.1-r3.ebuild,v 1.1 2013/02/11 12:41:25 pinkbyte Exp $
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="A hardware-independent library for executing real-mode x86 code"
+HOMEPAGE="http://www.codon.org.uk/~mjg59/libx86"
+SRC_URI="http://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+	# fix compile failure with linux-headers-2.6.26, bug 235599
+	epatch "${FILESDIR}"/${PN}-0.99-ifmask.patch
+	# Patch for bugs #236888 and #456648
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	tc-export CC AR
+}
+
+src_compile() {
+	local ARGS
+	use amd64 && ARGS="BACKEND=x86emu"
+	emake ${ARGS} LIBRARY=shared shared
+	if use static-libs; then
+		emake ${ARGS} objclean
+		emake ${ARGS} LIBRARY=static static
+	fi
+}
+
+src_install() {
+	local install_static;
+	use static-libs && install_static='install-static'
+	emake \
+		LIBDIR="/usr/$(get_libdir)" \
+		DESTDIR="${D}" \
+		install-header install-shared ${install_static}
+}