More bug fixes, removed init scripts when not building for a livecd.

Package-Manager: portage-2.1.2-r9

4 files changed, 81 insertions, 8 deletions

diff --git a/x11-misc/xac/ChangeLog b/x11-misc/xac/ChangeLog
index cd91387ee60c..19a00aad9504 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.6 2007/02/18 06:54:01 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xac/ChangeLog,v 1.7 2007/02/19 04:45:14 josejx Exp $
+
+*xac-0.6_pre3 (19 Feb 2007)
+
+  19 Feb 2007; Joseph Jezak <josejx@gentoo.org> +xac-0.6_pre3.ebuild:
+  More bug fixes, removed init scripts when not building for a livecd.
 
 *xac-0.6_pre2 (18 Feb 2007)
 
diff --git a/x11-misc/xac/Manifest b/x11-misc/xac/Manifest
index facd3f79d708..53cfbdf8b961 100644
--- a/x11-misc/xac/Manifest
+++ b/x11-misc/xac/Manifest
@@ -7,6 +7,7 @@ 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
+DIST xac-0.6_pre3.tar.bz2 37323 RMD160 f87f568b87d740038b366c333cd2988b2e4a5d1b SHA1 bb8cb44bf35f381e46cea76498e7c3041709d477 SHA256 2d00c95147b6d85a0a1ba5f88cb2c26f6c6091198dd2ced3f5964a05b4d10e76
 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
@@ -15,10 +16,14 @@ EBUILD xac-0.6_pre2.ebuild 1350 RMD160 65f37a391ac3b06195107bbd68f1fbbe15e9fe1f
 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
+EBUILD xac-0.6_pre3.ebuild 1441 RMD160 1855a325f8ebbad08749ee7b175a071266c8bfb6 SHA1 17f35dd92b04f560bf1b30c34b1c848fe27cacbe SHA256 e5336b0ab10501c9d4477665c16bc36bff6d1c907a8b36ff345185d2bc9c9bc9
+MD5 ac9dd386e520cad327d20397f9e2489b xac-0.6_pre3.ebuild 1441
+RMD160 1855a325f8ebbad08749ee7b175a071266c8bfb6 xac-0.6_pre3.ebuild 1441
+SHA256 e5336b0ab10501c9d4477665c16bc36bff6d1c907a8b36ff345185d2bc9c9bc9 xac-0.6_pre3.ebuild 1441
+MISC ChangeLog 1165 RMD160 1ebfb5185f2f2fae29ee5b3ce68c9fb3ea894be2 SHA1 892e7133fc1c501c80ab778da3ed1931da805b16 SHA256 b195e791e89b3526efde99da8e303f3859d76ce28689ee686fb9bed86e02b63b
+MD5 93f58700af6201c50636add66c49d220 ChangeLog 1165
+RMD160 1ebfb5185f2f2fae29ee5b3ce68c9fb3ea894be2 ChangeLog 1165
+SHA256 b195e791e89b3526efde99da8e303f3859d76ce28689ee686fb9bed86e02b63b ChangeLog 1165
 MISC metadata.xml 341 RMD160 65f19548673cc40a70deb63fed35dcd69f814264 SHA1 dec9e40c16b77590d480fe730a4f62bf7b4ac0b2 SHA256 58482424a769a19d3c578f77e0123ea373e31aac8d0040bf7bd1f10b5d877039
 MD5 843c93b3d1805c997e4990b1f38977e5 metadata.xml 341
 RMD160 65f19548673cc40a70deb63fed35dcd69f814264 metadata.xml 341
@@ -29,10 +34,13 @@ SHA256 e1c01acb3a704270087fc4f69272176c14ebc2681dc821117493a80959d33132 files/di
 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
+MD5 65782890f2cc3f8555e3e091edd12d95 files/digest-xac-0.6_pre3 238
+RMD160 e06868f41c1e26e478f1fef86274ec7d48042976 files/digest-xac-0.6_pre3 238
+SHA256 d5a50ad83a0c11672bbcccee5217faf0cc7e8b039d880c67c328e204d9b08618 files/digest-xac-0.6_pre3 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF1/gNcsIHjyDViGQRAtTDAJwLD7qChDZ1ETD8UohvU2F1io5w2wCgyqi+
-8qlfDmto+hgZn+fQj/Pq14s=
-=OR1y
+iD8DBQFF2StdcsIHjyDViGQRAvlDAKC9fedZ1z2myg+uXNjdp9KHFm3ucQCfasfV
+NfgVbC8c+6Rm8/gPGGKpxHU=
+=BU0Q
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xac/files/digest-xac-0.6_pre3 b/x11-misc/xac/files/digest-xac-0.6_pre3
new file mode 100644
index 000000000000..b2e497b35026
--- /dev/null
+++ b/x11-misc/xac/files/digest-xac-0.6_pre3
@@ -0,0 +1,3 @@
+MD5 bf78269ab3251927ed36e5f764b3556d xac-0.6_pre3.tar.bz2 37323
+RMD160 f87f568b87d740038b366c333cd2988b2e4a5d1b xac-0.6_pre3.tar.bz2 37323
+SHA256 2d00c95147b6d85a0a1ba5f88cb2c26f6c6091198dd2ced3f5964a05b4d10e76 xac-0.6_pre3.tar.bz2 37323
diff --git a/x11-misc/xac/xac-0.6_pre3.ebuild b/x11-misc/xac/xac-0.6_pre3.ebuild
new file mode 100644
index 000000000000..0f2f8adc8ac6
--- /dev/null
+++ b/x11-misc/xac/xac-0.6_pre3.ebuild
@@ -0,0 +1,57 @@
+# 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_pre3.ebuild,v 1.1 2007/02/19 04:45:14 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="livecd"
+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/*
+
+	### Only install the init scripts if livecd is enabled
+	if use livecd; then
+		exeinto /etc/init.d
+		newexe "${S}"/xac.init xac
+		insinto /etc/conf.d
+		newins "${S}"/xac.conf xac
+	fi
+}