New version, x86 fixes.

Package-Manager: portage-2.1.2-r9

4 files changed, 78 insertions, 8 deletions

diff --git a/x11-misc/xac/ChangeLog b/x11-misc/xac/ChangeLog
index 3bb636d6032e..cd91387ee60c 100644
--- a/x11-misc/xac/ChangeLog
+++ b/x11-misc/xac/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xac
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xac/ChangeLog,v 1.5 2007/02/13 00:58:48 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xac/ChangeLog,v 1.6 2007/02/18 06:54:01 josejx Exp $
+
+*xac-0.6_pre2 (18 Feb 2007)
+
+  18 Feb 2007; Joseph Jezak <josejx@gentoo.org> +xac-0.6_pre2.ebuild:
+  New version, x86 fixes.
 
   13 Feb 2007; Joseph Jezak <josejx@gentoo.org> +files/xac-lz.patch,
   xac-0.6_pre1.ebuild:
diff --git a/x11-misc/xac/Manifest b/x11-misc/xac/Manifest
index 4a543f1d2709..facd3f79d708 100644
--- a/x11-misc/xac/Manifest
+++ b/x11-misc/xac/Manifest
@@ -6,14 +6,19 @@ MD5 d3365a54844ad881f902dee8f63e0e07 files/xac-lz.patch 321
 RMD160 d007a797d39ec7bbf4c0b2977d21460f0220aeb7 files/xac-lz.patch 321
 SHA256 ea9cb8776eb66fd6a64d9cb79a2b59cd1a6a182064790cb89a5878c548ac4e6e files/xac-lz.patch 321
 DIST xac-0.6_pre1.tar.bz2 37354 RMD160 8ad91a89019be277a79955387d3a9e85b43081e7 SHA1 eaebad491693c41e2b4cf3320813fbc0e93f39d4 SHA256 e9f23c1d4be448cce3a71315fb414fa4aec7b5bf7bd743505fd2c11edd70d481
+DIST xac-0.6_pre2.tar.bz2 37261 RMD160 520a0671eb329f7be0ba8f47ca5ce2a9982bb947 SHA1 9f4fd7b1bec1d1c92b2d32383c48080cf87a5040 SHA256 d2240d5ccb7fc6a1e15e072841add08f11d8651eae26771525e15653a246f330
 EBUILD xac-0.6_pre1.ebuild 1424 RMD160 9bc97a3d08ebb579efb5669aa33ade7bc97a71a5 SHA1 301d2bcefd4d2c7dcca87ae679d0e67ee1d087d5 SHA256 e65ff1da89ffbb0a98f817e338443f76697a75a5d62daa401662f18a579185a6
 MD5 63ff31db45eb513be15ac26f9c4c3dfb xac-0.6_pre1.ebuild 1424
 RMD160 9bc97a3d08ebb579efb5669aa33ade7bc97a71a5 xac-0.6_pre1.ebuild 1424
 SHA256 e65ff1da89ffbb0a98f817e338443f76697a75a5d62daa401662f18a579185a6 xac-0.6_pre1.ebuild 1424
-MISC ChangeLog 868 RMD160 2b8693b76f712fc4cbf7acfb857355f21de2e914 SHA1 d387536d1634f301c5c7727138eb0e80624f0f66 SHA256 4cdf0971110700712c2c5d6848257b10118cc30f53dcb1f17373eeeffd1efed9
-MD5 a60671bb2775a49cc81612cc81e2a296 ChangeLog 868
-RMD160 2b8693b76f712fc4cbf7acfb857355f21de2e914 ChangeLog 868
-SHA256 4cdf0971110700712c2c5d6848257b10118cc30f53dcb1f17373eeeffd1efed9 ChangeLog 868
+EBUILD xac-0.6_pre2.ebuild 1350 RMD160 65f37a391ac3b06195107bbd68f1fbbe15e9fe1f SHA1 289819f68e91e58007f3c0b10f0c0fef36d8b167 SHA256 6a54a31caaea5a93573e5ef4361f8dc08baa347a4b0c6fb1a14373f7cb1f55b5
+MD5 c2ef2bae54146a1e34637a211f0acc86 xac-0.6_pre2.ebuild 1350
+RMD160 65f37a391ac3b06195107bbd68f1fbbe15e9fe1f xac-0.6_pre2.ebuild 1350
+SHA256 6a54a31caaea5a93573e5ef4361f8dc08baa347a4b0c6fb1a14373f7cb1f55b5 xac-0.6_pre2.ebuild 1350
+MISC ChangeLog 994 RMD160 1ebd90467df90c3819e69ac0160ce74e77d3533e SHA1 edbe318a9ef99753df138f32545dfd81c68e14ec SHA256 425dcc1d042aee81b370ae91dd893cd70cfc900c2424a55dc70671636d0298af
+MD5 6bf61dd4606d7f2ba412fc55e699306d ChangeLog 994
+RMD160 1ebd90467df90c3819e69ac0160ce74e77d3533e ChangeLog 994
+SHA256 425dcc1d042aee81b370ae91dd893cd70cfc900c2424a55dc70671636d0298af ChangeLog 994
 MISC metadata.xml 341 RMD160 65f19548673cc40a70deb63fed35dcd69f814264 SHA1 dec9e40c16b77590d480fe730a4f62bf7b4ac0b2 SHA256 58482424a769a19d3c578f77e0123ea373e31aac8d0040bf7bd1f10b5d877039
 MD5 843c93b3d1805c997e4990b1f38977e5 metadata.xml 341
 RMD160 65f19548673cc40a70deb63fed35dcd69f814264 metadata.xml 341
@@ -21,10 +26,13 @@ SHA256 58482424a769a19d3c578f77e0123ea373e31aac8d0040bf7bd1f10b5d877039 metadata
 MD5 34e340d4070ed0752c22f0eb855c7826 files/digest-xac-0.6_pre1 238
 RMD160 28d5fd0fcb3558c4524fe69dd75652e666d041ed files/digest-xac-0.6_pre1 238
 SHA256 e1c01acb3a704270087fc4f69272176c14ebc2681dc821117493a80959d33132 files/digest-xac-0.6_pre1 238
+MD5 464eedd543866a72e96004cfee70b361 files/digest-xac-0.6_pre2 238
+RMD160 d5721c44ad074b108e98502382fbeec894e7787f files/digest-xac-0.6_pre2 238
+SHA256 651ab17b3a24715e9e6d2ea8061f35a16adbf767d272d04c53054896ec73540c files/digest-xac-0.6_pre2 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF0Q1OcsIHjyDViGQRAlhZAKDccU/6v5S72K9qXlaS+ZJJaomqzACeOk4h
-ipCjcPMqqf4sQVksy3l+W6o=
-=nA9p
+iD8DBQFF1/gNcsIHjyDViGQRAtTDAJwLD7qChDZ1ETD8UohvU2F1io5w2wCgyqi+
+8qlfDmto+hgZn+fQj/Pq14s=
+=OR1y
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xac/files/digest-xac-0.6_pre2 b/x11-misc/xac/files/digest-xac-0.6_pre2
new file mode 100644
index 000000000000..6bafce5e0dbd
--- /dev/null
+++ b/x11-misc/xac/files/digest-xac-0.6_pre2
@@ -0,0 +1,3 @@
+MD5 709bb20a464a9293860cfbfe716c8907 xac-0.6_pre2.tar.bz2 37261
+RMD160 520a0671eb329f7be0ba8f47ca5ce2a9982bb947 xac-0.6_pre2.tar.bz2 37261
+SHA256 d2240d5ccb7fc6a1e15e072841add08f11d8651eae26771525e15653a246f330 xac-0.6_pre2.tar.bz2 37261
diff --git a/x11-misc/xac/xac-0.6_pre2.ebuild b/x11-misc/xac/xac-0.6_pre2.ebuild
new file mode 100644
index 000000000000..bf49f6a5b17f
--- /dev/null
+++ b/x11-misc/xac/xac-0.6_pre2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xac/xac-0.6_pre2.ebuild,v 1.1 2007/02/18 06:54:01 josejx 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=""
+DEPEND=">=dev-lang/python-2.3
+	   sys-apps/pciutils"
+RDEPEND=">=dev-lang/python-2.3
+		 || ( x11-base/xorg-server virtual/x11 )"
+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/*
+
+	exeinto /etc/init.d
+	newexe "${S}"/xac.init xac
+	insinto /etc/conf.d
+	newins "${S}"/xac.conf xac
+}