Change via into openchrome (bug #363661).

Package-Manager: portage-2.2.0_alpha30/cvs/Linux i686

4 files changed, 87 insertions, 6 deletions

diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog
index 40c92af8d82c..59088a7dd685 100644
--- a/sys-apps/hwsetup/ChangeLog
+++ b/sys-apps/hwsetup/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/hwsetup
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.61 2009/10/04 15:18:13 ssuominen Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.62 2011/04/15 03:49:39 jer Exp $
+
+*hwsetup-1.2-r2 (15 Apr 2011)
+
+  15 Apr 2011; Jeroen Roovers <jer@gentoo.org> +hwsetup-1.2-r2.ebuild,
+  +files/1.2-7-openchrome.patch:
+  Change via into openchrome (bug #363661).
 
   04 Oct 2009; Samuli Suominen <ssuominen@gentoo.org> hwsetup-1.2.ebuild:
   Replace filtering of -Wl,--as-needed with function from flag-o-matic
diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest
index fb01b2022e16..890c12f67850 100644
--- a/sys-apps/hwsetup/Manifest
+++ b/sys-apps/hwsetup/Manifest
@@ -6,15 +6,17 @@ AUX 1.2-3-fastprobe.patch 2817 RMD160 5cadca96d654739d61db18287bf2a71f4d7a00ca S
 AUX 1.2-3-gentoo.patch 1430 RMD160 fae21df5ef10085fe6336c483b5b2c2145f1f787 SHA1 b17b2ae05a819c9be68145f8ba5054dddf276a6d SHA256 1d1b6b3199b4a395febe7a68fc85a59c090ab99918f6a5e02739210e7c182e83
 AUX 1.2-7-dyn_blacklist.patch 1996 RMD160 e299ee153e13f9a80d7a28209cf62268dfb9e8bd SHA1 192ea0961e02a1a84b6efc98a02b360d859d4ca1 SHA256 625c60827eea5f17b5d833276cf7924223e6ab1fa681f8518c4e8e1070465339
 AUX 1.2-7-gentoo.patch 726 RMD160 4fee01b484f303d5a5b36099f72e18e31e165ca5 SHA1 bc793c3c496010db48f5b9ba6e6e6ae90c813676 SHA256 bd244624e9fc761c7c72ecd98a7aa4133e2d4858172ba336f5bc9596a67c8f51
+AUX 1.2-7-openchrome.patch 544 RMD160 f6440e74d6c225b6eed7876464f5e2f53ed2c546 SHA1 a722e801dd41d4b5d74498a25a869f5ec80216c4 SHA256 4701fe9d510f19a5a0d5dc48b6439db0e5ab68e5fecf396f15cbfe4b79d800fa
 AUX 1.2-strip.patch 306 RMD160 51e82ddb0bd75fe3e8764123404942c3ded05aba SHA1 1603a3e694ee09257aae0c6d3940512eae5655dc SHA256 038593c6117ed213451d9a3cb781d1635117d54afb0bcf02f165a49d412cd47c
 DIST hwsetup_1.2-7.tar.gz 10706 RMD160 7895b32c81254b2ca1575ab12dcc6fa39d011e17 SHA1 c91cb22c07755ecbfce8e9e6826e8e2580f103f8 SHA256 aa72b37ce306b5191cabd31eb5f19ab2a5e635697a263c6735d10c7bf99f9589
 EBUILD hwsetup-1.2-r1.ebuild 1935 RMD160 190d4a28dd4d8128867eef1407ef56b40f247896 SHA1 1ea3545343e2f45febcad1027a40b3c62e1bfd03 SHA256 6751eff0e75f7c95ecedddc610070c273a51493643fa1d2a022611de8d976feb
-MISC ChangeLog 9979 RMD160 33ee1c93e15eed05caaa3a8e9a7f835d719576b9 SHA1 047d5a7f65198e04c84fc2225dba0e0a709010e0 SHA256 ae4f2a182d5e7c7356f5bd4d8d3ac85b5d34be493596a2a0da191f97d687e131
+EBUILD hwsetup-1.2-r2.ebuild 1980 RMD160 4820dc7a73bbeb4056fef8f3ad109eb3e7ba4a1d SHA1 001ef3dba50e03e51a481212b18e48efa4f1445e SHA256 7cec223300954c34666c67599ef3e64c1fcce53675660991270a5c53ece23dd8
+MISC ChangeLog 10153 RMD160 2f3efe5c196084cc36166e1411046f7b93476322 SHA1 7443c288c867c69332996c9ddc6f2362ef02f858 SHA256 49fd2bc0612dda32eecb9784b957f0b325e407170a447149c1498fb78f69517a
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2nsPsACgkQVWmRsqeSphM2BwCdEvgBkABb7YNvwYiTaxwducpP
-c44AmgJY3rRkwQBy7zp+ABpUmQVAKBxl
-=LnNX
+iEYEARECAAYFAk2nwFkACgkQVWmRsqeSphOcPwCfUYq3gcXrYJuML/qcuhn0Kl23
+scgAnAueEnkd0b6iSscWbbsrpYdwXWAj
+=O0hI
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/hwsetup/files/1.2-7-openchrome.patch b/sys-apps/hwsetup/files/1.2-7-openchrome.patch
new file mode 100644
index 000000000000..641c3447aa49
--- /dev/null
+++ b/sys-apps/hwsetup/files/1.2-7-openchrome.patch
@@ -0,0 +1,11 @@
+--- a/hwsetup-1.2/hwsetup.c
++++ b/hwsetup-1.2/hwsetup.c
+@@ -456,7 +456,7 @@
+      else if(strcasestr(xi.xdesc,"Newport")) strcpy(xi.xmodule,"newport");
+      else if(strcasestr(xi.xdesc,"Siliconmotion")||strcasestr(xi.xdesc,"Silicon Motion")) strcpy(xi.xmodule,"siliconmotion");
+      else if(strcasestr(xi.xdesc,"Chips")) strcpy(xi.xmodule,"chips");
+-     else if(strcasestr(xi.xdesc,"VIA ")) strcpy(xi.xmodule,"via");
++     else if(strcasestr(xi.xdesc,"VIA ")) strcpy(xi.xmodule,"openchrome");
+     }
+    else strcpy(xi.xmodule,xvesa4);
+   }
diff --git a/sys-apps/hwsetup/hwsetup-1.2-r2.ebuild b/sys-apps/hwsetup/hwsetup-1.2-r2.ebuild
new file mode 100644
index 000000000000..1c09f88dff2b
--- /dev/null
+++ b/sys-apps/hwsetup/hwsetup-1.2-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.2-r2.ebuild,v 1.1 2011/04/15 03:49:39 jer Exp $
+
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_PV=${PV}-7
+DESCRIPTION="Hardware setup program from Knoppix - used only on LiveCD"
+HOMEPAGE="http://www.knopper.net/"
+SRC_URI="http://debian-knoppix.alioth.debian.org/sources/${PN}_${MY_PV}.tar.gz"
+#http://developer.linuxtag.net/knoppix/sources/${PN}_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 -mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="zlib"
+
+COMMON_DEPEND="zlib? ( sys-libs/zlib )
+	sys-apps/pciutils"
+DEPEND="${COMMON_DEPEND}
+	sys-libs/libkudzu"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/hwdata-gentoo"
+
+pkg_setup() {
+	ewarn "This package is designed for use on the LiveCD only and will do "
+	ewarn "unspeakably horrible and unexpected things on a normal system."
+	ewarn "YOU HAVE BEEN WARNED!!!"
+}
+
+src_unpack() {
+	unpack ${A}
+	epatch \
+		"${FILESDIR}"/${MY_PV}-dyn_blacklist.patch \
+		"${FILESDIR}"/${PV}-3-fastprobe.patch \
+		"${FILESDIR}"/${MY_PV}-gentoo.patch \
+		"${FILESDIR}"/${PV}-strip.patch \
+		"${FILESDIR}"/${MY_PV}-openchrome.patch
+}
+
+src_compile() {
+	if use zlib ; then
+		sed -i \
+			-e '/^LIBS=/s,-lpci,-lz -lpci,g' \
+			Makefile
+	elif built_with_use --missing false sys-apps/pciutils zlib ; then
+		die "You need to build with USE=zlib to match sys-apps/pcituils"
+	fi
+	emake LDFLAGS="${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	einstall DESTDIR="${D}" PREFIX=/usr MANDIR=/usr/share/man || die "Install failed"
+	keepdir /etc/sysconfig
+}
+
+pkg_postinst() {
+	ewarn "This package is intended for usage on the Gentoo release media.  If"
+	ewarn "you are not building a CD, remove this package.  It will not work"
+	ewarn "properly on a running system, as Gentoo does not use any of the"
+	ewarn "Knoppix-style detection except for CD builds."
+}