Fixed bug #241484. Removed obsolete version.

(Portage version: 2.1.6.13/cvs/Linux x86_64)

4 files changed, 51 insertions, 59 deletions

diff --git a/x11-misc/xac/ChangeLog b/x11-misc/xac/ChangeLog
index 3a29e55cdc5b..094277823922 100644
--- a/x11-misc/xac/ChangeLog
+++ b/x11-misc/xac/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xac
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xac/ChangeLog,v 1.14 2008/09/23 07:19:03 corsair Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xac/ChangeLog,v 1.15 2009/09/30 15:52:20 josejx Exp $
+
+  30 Sep 2009; Joseph Jezak <josejx@gentoo.org> +files/x86-biosfix.patch,
+  -xac-0.6_pre3.ebuild, xac-0.6_pre4.ebuild:
+  Fixed bug #241484. Removed obsolete version.
 
   23 Sep 2008; Markus Rothe <corsair@gentoo.org> xac-0.6_pre4.ebuild:
   Stable on ppc
diff --git a/x11-misc/xac/files/x86-biosfix.patch b/x11-misc/xac/files/x86-biosfix.patch
new file mode 100644
index 000000000000..918cdf131d55
--- /dev/null
+++ b/x11-misc/xac/files/x86-biosfix.patch
@@ -0,0 +1,40 @@
+diff -u -B -r1.1 -r1.2
+--- src/bioscall.h	25 Aug 2006 19:48:26 -0000	1.1
++++ src/bioscall.h	30 Sep 2009 15:05:49 -0000	1.2
+@@ -1,6 +1,8 @@
+ #ifndef bioscall_h
+ #define bioscall_h
+ 
++#include "int10defs.h"
++
+ /* Print some of the interesting parts of a vm86_regs structure. */
+ void dump_regs(struct vm86_regs *regs);
+ 
+diff -u -B -r1.1 -r1.2
+--- src/lrmi.h	25 Aug 2006 19:48:26 -0000	1.1
++++ src/lrmi.h	30 Sep 2009 15:05:49 -0000	1.2
+@@ -26,6 +26,8 @@
+ #ifndef LRMI_H
+ #define LRMI_H
+ 
++#include "int10defs.h"
++
+ #if defined(__i386__) && (defined(__linux__) || defined(__NetBSD__) \
+ 	|| defined(__FreeBSD__) || defined(__OpenBSD__))
+ 
+diff -Naur
+--- src/int10defs.h 
++++ src/int10defs.h 30 Sep 2009 15:05:49 -0000
+@@ -0,0 +1,12 @@
++/* Fix missing INT10 defines */
++#ifndef IF_MASK
++#define TF_MASK		0x00000100
++#define IF_MASK		0x00000200
++#define IOPL_MASK	0x00003000
++#define NT_MASK		0x00004000
++#define VM_MASK		0x00020000
++#define AC_MASK		0x00040000
++#define VIF_MASK	0x00080000	/* virtual interrupt flag */
++#define VIP_MASK	0x00100000	/* virtual interrupt pending */
++#define ID_MASK		0x00200000
++#endif
diff --git a/x11-misc/xac/xac-0.6_pre3.ebuild b/x11-misc/xac/xac-0.6_pre3.ebuild
deleted file mode 100644
index edf376acc3f5..000000000000
--- a/x11-misc/xac/xac-0.6_pre3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xac/xac-0.6_pre3.ebuild,v 1.6 2009/05/05 18:18:34 ssuominen Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Xorgautoconfig (xac) generates configuration files for X.org"
-HOMEPAGE="http://dev.gentoo.org/~josejx/xac.html"
-LICENSE="GPL-2"
-KEYWORDS="ppc ppc64 ~x86"
-SLOT="0"
-IUSE="livecd"
-DEPEND=">=dev-lang/python-2.3
-	   sys-apps/pciutils"
-RDEPEND=">=dev-lang/python-2.3
-		x11-base/xorg-server"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	### Replace /usr/lib/xac with libdir version
-	sed -i "s:/usr/lib/xac:/usr/$(get_libdir)/xac:" xac
-}
-
-src_compile() {
-	### Compile the C bindings
-	cd "${S}"/src
-	### I'm not sure of a better way to do this yet
-	if use x86; then
-		sed -i "s:if 1:if 0:" setup.py || die "Enabling VBE module failed!"
-	fi
-	./setup.py build || die "Failed to build the C modules"
-}
-
-src_install() {
-	local xac_base="/usr/$(get_libdir)/xac"
-
-	dosbin "${S}"/xac
-
-	### Install the C mods
-	cd "${S}"/src
-	./setup.py install --root "${D}" || die "Failed to install the C modules"
-
-	dodir "${xac_base}"
-	insinto ${xac_base}
-	doins "${S}"/py/*
-
-	### Only install the init scripts if livecd is enabled
-	if use livecd; then
-		newinitd "${S}"/xac.init xac
-		newconfd "${S}"/xac.conf xac
-	fi
-}
diff --git a/x11-misc/xac/xac-0.6_pre4.ebuild b/x11-misc/xac/xac-0.6_pre4.ebuild
index e827fb7bc246..ab5b13f4e68a 100644
--- a/x11-misc/xac/xac-0.6_pre4.ebuild
+++ b/x11-misc/xac/xac-0.6_pre4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xac/xac-0.6_pre4.ebuild,v 1.5 2009/05/05 18:18:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xac/xac-0.6_pre4.ebuild,v 1.6 2009/09/30 15:52:20 josejx Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 DESCRIPTION="Xorgautoconfig (xac) generates configuration files for X.org"
 HOMEPAGE="http://dev.gentoo.org/~josejx/xac.html"
@@ -23,6 +23,9 @@ src_unpack() {
 	### Replace /usr/lib/xac with libdir version
 	sed -i "s:/usr/lib/xac:/usr/$(get_libdir)/xac:" xac
 
+	### Fix the x86 bios call with newer glibc
+	epatch "${FILESDIR}/x86-biosfix.patch"
+
 	### Make setup.py executable
 	chmod +x "${S}/src/setup.py"
 }