Fix compilation with -x86emu and klibc-1.5.12 (bug #231839).

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc9 x86_64

3 files changed, 64 insertions, 5 deletions

diff --git a/sys-apps/v86d/ChangeLog b/sys-apps/v86d/ChangeLog
index 454bde329a1d..03aa45471d9a 100644
--- a/sys-apps/v86d/ChangeLog
+++ b/sys-apps/v86d/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/v86d
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/ChangeLog,v 1.15 2008/05/31 12:37:21 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/ChangeLog,v 1.16 2008/07/15 20:42:00 spock Exp $
+
+*v86d-0.1.5.1 (15 Jul 2008)
+
+  15 Jul 2008; Michał Januszewski <spock@gentoo.org> +v86d-0.1.5.1.ebuild:
+  Fix compilation with -x86emu and klibc-1.5.12 (bug #231839).
 
   31 May 2008; Michał Januszewski <spock@gentoo.org> v86d-0.1.5.ebuild:
   Fix bug #224243.
diff --git a/sys-apps/v86d/Manifest b/sys-apps/v86d/Manifest
index ce4ddfad1a09..5e61470e6d56 100644
--- a/sys-apps/v86d/Manifest
+++ b/sys-apps/v86d/Manifest
@@ -3,17 +3,19 @@ Hash: SHA1
 
 DIST v86d-0.1.3.tar.bz2 67044 RMD160 717aa7b043979bc9aa3fd702bd656fa9c473dcd8 SHA1 372b20cc10e8435343b05dc197d30721eb3faa61 SHA256 bf0ca221bc5e8a6b06f73a1eb6ae1470ec5b34b987669f7abeb499e6402af3b0
 DIST v86d-0.1.4.tar.bz2 67476 RMD160 bb385f43fdbbc33aed2520454f2a4e9228c02d0c SHA1 ab833669305425c97132044feef81c5c594e934e SHA256 d353b7a8830a812eb7ccd31a7f295ba9389f60250971b84b50d9da0e0ac2dfa2
+DIST v86d-0.1.5.1.tar.bz2 67606 RMD160 6be2ff9e426cbc03c824295e6027a192077e7eb0 SHA1 28fb64e67ffc9728006698e35e8a6e70cdc54718 SHA256 f11e92b5ab89b799ae5b7de04f31bf6299cba48d08d90c1f491ffd73ef51e7f0
 DIST v86d-0.1.5.tar.bz2 67541 RMD160 daab2c33f39969aaba5dbd2639d0e6d3982c1ba1 SHA1 b890e1a30e7311f138655d9ee6dc346c25aea909 SHA256 8c8db0b6de0bae2c065a68d31369e750dc03bd875bac78e87763e263f3bc2588
 EBUILD v86d-0.1.3-r1.ebuild 1330 RMD160 0b0855b1b197e8c16ecc512fa86824d527312060 SHA1 10930e153f78896cbae70bc957e4462266d73ef3 SHA256 b75229321363232ae7bc812c25ac7313599d2d9d560bd2345a191bb56f6c05ab
 EBUILD v86d-0.1.3.ebuild 1242 RMD160 eb8a7af1cf6b929d08a089bce9b71468afc3ddf3 SHA1 27b10fb36960bd4bcf56e09a59b777286af492d6 SHA256 600bc21d249ee194e93a4e9ddd019b05b4bbfc6c92c9b59d61bb09e75c486c11
 EBUILD v86d-0.1.4.ebuild 1328 RMD160 8dbaad23d31e8e3f95f249d2fba4da5c86e285dc SHA1 00aa929958c2a344b186903bb66726174b696c08 SHA256 3a65a5587cbfecfecec9291f21a8ceb5d4d5bfacd3cd4b494fb63f4d0c95679e
+EBUILD v86d-0.1.5.1.ebuild 1349 RMD160 2ea13adf5c03cb493dc80eab6eef0a726e4d9432 SHA1 f36ca83e240e5ce04e04af1c54089db222ef2aae SHA256 be43cbe4f670ea8cd92697f36615c8ae83739b09b980c60f55181dbc1a2fbf01
 EBUILD v86d-0.1.5.ebuild 1347 RMD160 43902c084f0ad858dd12798d67304ad71a520bb5 SHA1 1495d618c89461437a04b3a34854cb29a6e81827 SHA256 e9401b0e701a3d4f510cbee0ee474707da7ba0602d0037d3efeede165c9c0bf9
-MISC ChangeLog 2130 RMD160 73be7afaa66eb93fed077f0591257a325380b7a0 SHA1 817d870e616b50e89443d1d52f2f2928f15ed488 SHA256 ad9ff396787ebddfec51af9d900a135c6b5d0fd81c08d89c57cb273f69186709
+MISC ChangeLog 2299 RMD160 adc7076f52bca9e9400136d62fdac5a8d2c3c6f6 SHA1 c3cc0fd96f09c5ce7ae76701869ac910c5d11f1c SHA256 432608591f309c3eaa149d2181a9635e94ab049426bf01f7958bdc4730287f83
 MISC metadata.xml 220 RMD160 6bb03cb6947aadf2672a58c61c1fb7aa405eaf86 SHA1 7810907f03c5a3ee23eeaa4b42699ce17bc5c3a7 SHA256 969b4125e7620e2fe0d616cb3cabbe52bd79e6c4bdd725ce807d5f4c7c1ad75d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhBRnkACgkQchej4aZK9/fNmgCghzD9FeO8sLHeI2bstJZEgbZE
-9qwAn1Rp1qbogVIn4UttV459TwiNC2lh
-=aSu8
+iEYEARECAAYFAkh9C3QACgkQchej4aZK9/c3HgCfVGPa01yn1r2rOXsg5bzpINoN
+QW8An2IlNkaA5Ye4lFcORE5TqnrKxZeb
+=sFkR
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/v86d/v86d-0.1.5.1.ebuild b/sys-apps/v86d/v86d-0.1.5.1.ebuild
new file mode 100644
index 000000000000..15459f8df5d2
--- /dev/null
+++ b/sys-apps/v86d/v86d-0.1.5.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/v86d/v86d-0.1.5.1.ebuild,v 1.1 2008/07/15 20:42:00 spock Exp $
+
+inherit linux-info multilib
+
+DESCRIPTION="A daemon to run x86 code in an emulated environment."
+HOMEPAGE="http://dev.gentoo.org/~spock/projects/uvesafb/"
+SRC_URI="http://dev.gentoo.org/~spock/projects/uvesafb/archive/${P/_/-}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug x86emu"
+
+DEPEND="dev-libs/klibc"
+RDEPEND=""
+
+S="${WORKDIR}/${P//_*/}"
+
+pkg_setup() {
+	if [ -z "$(grep V86D /usr/$(get_libdir)/klibc/include/linux/connector.h)" ]; then
+		eerror "You need to compile klibc against a kernel tree patched with uvesafb"
+		eerror "prior to merging this package."
+		die "Kernel not patched with uvesafb."
+	fi
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	local myconf=""
+	if use x86emu ; then
+		myconf="--with-x86emu"
+	fi
+
+	./configure --with-klibc $(use_with debug) ${myconf}
+	make KDIR=${KV_DIR} || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+
+	dodoc README ChangeLog
+
+	insinto /usr/share/${PN}
+	doins misc/initramfs
+}
+
+pkg_postinst() {
+	elog "If you wish to place v86d into an initramfs image, you might want to use"
+	elog "'/usr/share/${PN}/initramfs' in your kernel's CONFIG_INITRAMFS_SOURCE."
+}