Version bump per bug #254441. Drop old stuff. Add x11 as backup herd. Fix also bug #265099 for 1.1.

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

10 files changed, 50 insertions, 194 deletions

diff --git a/sys-apps/vbetool/ChangeLog b/sys-apps/vbetool/ChangeLog
index 6072e5212226..08e4a4308972 100644
--- a/sys-apps/vbetool/ChangeLog
+++ b/sys-apps/vbetool/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/vbetool
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vbetool/ChangeLog,v 1.16 2009/02/05 05:43:04 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vbetool/ChangeLog,v 1.17 2009/11/09 13:38:37 scarabeus Exp $
+
+*vbetool-1.1 (09 Nov 2009)
+
+  09 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> -vbetool-0.2.ebuild,
+  -vbetool-0.3.ebuild, -files/vbetool-0.3-pci-compile-fix.patch,
+  -vbetool-0.5.ebuild, -vbetool-0.5-r1.ebuild, -vbetool-0.7.ebuild,
+  +vbetool-1.1.ebuild, metadata.xml:
+  Version bump per bug #254441. Drop old stuff. Add x11 as backup herd. Fix
+  also bug #265099 for 1.1.
 
   05 Feb 2009; Jeremy Olexa <darkside@gentoo.org> vbetool-0.2.ebuild,
   vbetool-0.3.ebuild, vbetool-0.5.ebuild, vbetool-0.5-r1.ebuild,
diff --git a/sys-apps/vbetool/Manifest b/sys-apps/vbetool/Manifest
index f352fd7bc08d..5dfc5695298e 100644
--- a/sys-apps/vbetool/Manifest
+++ b/sys-apps/vbetool/Manifest
@@ -1,15 +1,7 @@
-AUX vbetool-0.3-pci-compile-fix.patch 479 RMD160 14e39c139cd467130d3ffaa2a8580b89cc21a0d3 SHA1 b59aa55aef505071900224bffe7325a0344251db SHA256 eacf3db48ada1bd7fe03470e5c1c83462e820eecc03a6089166fdd779df1b756
 AUX vbetool-1.0-build.patch 537 RMD160 3eefedd572e069588a9f716ead3772b4b8f55fbb SHA1 948a731ad49b1be5b103cedfe5a8ccbf6cac0ced SHA256 48583507d03f140a185573b249abe1eefbd085e70c67f8ceb10327badb86deee
-DIST vbetool_0.2.orig.tar.gz 68660 RMD160 17c4f7203cb8786e07de7ec37e65df04a1783e5c SHA1 80f3cf3db1bb07a81663a9ca26cd2e3336986d29 SHA256 f60cd59b3d3d37094da067338fe570b3af020f90be609984c87fc0ac6300d7d4
-DIST vbetool_0.3-1.tar.gz 92194 RMD160 30bb3782349441683b45bd920c8098d4c34482fe SHA1 3dd1220ed58cfa1f00f7892935b514245b988d6b SHA256 5e2ba48bae07b7702c32baaa775aa196dcb870d64d832ad2a97d58c92edd6031
-DIST vbetool_0.5-1.tar.gz 168198 RMD160 861d557415a2610c38f8ea88a2f14f6093617ab9 SHA1 6a6615e95217a15efb9fe5ab996e3fd57757b405 SHA256 a0a723b6d8587109360c8ef8df2f9d93fff508a28c174e0dd07db0cc46eb4dab
-DIST vbetool_0.7-1.tar.gz 176277 RMD160 b5a5d3a0794f8dbb06c78373e15c26d9536d8303 SHA1 49c86aa6fb877f35a0b336d6aa1d6b204c2cc66f SHA256 cef7c78594aded9ccc523d970cdec8fe8c4570a24bfc4a80989b8c0f2f67fd1c
+DIST vbetool-1.1.tar.gz 182826 RMD160 dd9c8f2e8fbd469384195afdcc8480b5bd7a1ec8 SHA1 c7ba7c0635160c47fb1b94fd7c7cbe39cb717d22 SHA256 4d26ddc43144593742349e69481e3536ce3482faaa9ad4494fdc7c8b7662f954
 DIST vbetool_1.0-0ubuntu1.tar.gz 106319 RMD160 00cf47c88af83d94bb3c7c1f72a25d07407d91f8 SHA1 0b896cda7d2fa740666ee6cb10f2b2e7e2bb9496 SHA256 806985c853caf6ae5edd9075bb4f132d35de23c439e6d18fc1326e457858e0b9
-EBUILD vbetool-0.2.ebuild 673 RMD160 0c7ff738ac40e29d1b0207cf20be817c9dcfc1f7 SHA1 b57685a38a9d7b7371000db68e660412ee5530b5 SHA256 7a1ea3df6220c89aa9c47de9b12912d78786dacbb48b2b63b7100c30fad92e45
-EBUILD vbetool-0.3.ebuild 860 RMD160 0bbe631d5144b0532c766eba271919e4de03823b SHA1 3af7bb6a62812132086da6289afbb791f22c7db9 SHA256 4d7d0893bfe75916ffbde056724db79afd5f9d164286480dabdc751f2e35c6dc
-EBUILD vbetool-0.5-r1.ebuild 1051 RMD160 f39b6ce30ad42159d489ce147be55e9762967a97 SHA1 82d24e17ca49bd6191431dc1261e1222e9dc44ed SHA256 85459418f904e39352968e1e3f1021cca7f914b4ea701a88422a354f59e6a47c
-EBUILD vbetool-0.5.ebuild 957 RMD160 45832198795ffc49930ed3c50288a68115f11f4b SHA1 cf90db907cf484096e59b290f31ece0c2b521ae5 SHA256 c4b1bc762a4d88a1f08df0d1e878ed9cd04960cf71b8e8c42a31710007a84e0f
-EBUILD vbetool-0.7.ebuild 1266 RMD160 afa911502200bfc1cc2e41d7fc85c77110ba8c9a SHA1 5571ffbd46562a9e495f9000f66cae86033a4f5e SHA256 43d7c6b8b0e50aa7997412543c5c970042d8b7ea9ce938729e39161ee40bf462
 EBUILD vbetool-1.0.ebuild 1076 RMD160 b0c27fc10daad2fe908b351cd0841da68692ecc4 SHA1 bac0ea393726d9eab6251368ce2124636de80ffc SHA256 db7b529f867956ff4c0e1b8f7405fb16ab76abf4b58dff99ae09266234a3c6d4
-MISC ChangeLog 2648 RMD160 b05aeea3f2224b8454f76481923fde9160399a43 SHA1 7b5fe51284f1284d3683d3f414ae43ee639fb8ed SHA256 004a301c96027600f77fb653512b3aebd6c15a3e6ad7c3b4f6e420b6e022a14e
-MISC metadata.xml 223 RMD160 ffa99612cf27469c417944deed0e0c9155e64331 SHA1 607c637402dd253406aa6ee684471a702c5d1a99 SHA256 d6bb9ba68629616062b4433ab3b8fb01dfcafae5bb47804d9e06cdd6c66daa44
+EBUILD vbetool-1.1.ebuild 824 RMD160 b5a365300e454f9b12880786dae79051e555b93c SHA1 b326adcdff35f9648ab0818ea7992b0877dc8853 SHA256 292e5151efc5223933f92c418174974cf7355e1eb5ab40218a7fa8f8fe7d1136
+MISC ChangeLog 3028 RMD160 0ae6fa9db21511e0888b1db14008356af28699f1 SHA1 79e40baf394c74188808ff1e6822617481ad1d62 SHA256 a54eb799fa1a7d838b79d2a891a9f28c3979931f7a6e54dbcb881ad4a40d8070
+MISC metadata.xml 219 RMD160 84efb9648c4ab01a0d473081af67d3ddc6f96c76 SHA1 da9add7d1d8e1bfc161691db81bcac1aae2084e8 SHA256 4bf551cec942acf07d28760388fe51e995989d0839943e5660e9507a8a77a854
diff --git a/sys-apps/vbetool/files/vbetool-0.3-pci-compile-fix.patch b/sys-apps/vbetool/files/vbetool-0.3-pci-compile-fix.patch
deleted file mode 100644
index 2470ddce34be..000000000000
--- a/sys-apps/vbetool/files/vbetool-0.3-pci-compile-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nuar vbetool-0.3.orig/vbetool.c vbetool-0.3/vbetool.c
---- vbetool-0.3.orig/vbetool.c	2005-03-02 02:39:21.000000000 +0100
-+++ vbetool-0.3/vbetool.c	2005-08-19 17:10:05.000000000 +0200
-@@ -8,7 +8,6 @@
- version 2
- */
- 
--#include <pci/pci.h>
- #include <assert.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -17,6 +16,7 @@
- #include <sys/ioctl.h>
- #include <sys/types.h>
- #include <sys/io.h>
-+#include <pci/pci.h>
- #include <sys/kd.h>
- #include <sys/stat.h>
- #include <errno.h>
diff --git a/sys-apps/vbetool/metadata.xml b/sys-apps/vbetool/metadata.xml
index 5d9f5be9d49d..ad3f22a0b39f 100644
--- a/sys-apps/vbetool/metadata.xml
+++ b/sys-apps/vbetool/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>x11</herd>
 <maintainer>
   <email>robbat2@gentoo.org</email>
 </maintainer>
diff --git a/sys-apps/vbetool/vbetool-0.2.ebuild b/sys-apps/vbetool/vbetool-0.2.ebuild
deleted file mode 100644
index bb950360a490..000000000000
--- a/sys-apps/vbetool/vbetool-0.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vbetool/vbetool-0.2.ebuild,v 1.2 2009/02/05 05:43:04 darkside Exp $
-
-DESCRIPTION="Run real-mode video BIOS code to alter hardware state (i.e. reinitialize video card)"
-HOMEPAGE="http://www.codon.org.uk/~mjg59/vbetool/"
-SRC_URI="${HOMEPAGE}${PN}_${PV}.orig.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND="sys-apps/pciutils"
-
-src_compile() {
-	LIBS="-lpci" econf || die "could not configure"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc LRMI
-}
diff --git a/sys-apps/vbetool/vbetool-0.3.ebuild b/sys-apps/vbetool/vbetool-0.3.ebuild
deleted file mode 100644
index e95bbc7fedf6..000000000000
--- a/sys-apps/vbetool/vbetool-0.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vbetool/vbetool-0.3.ebuild,v 1.2 2009/02/05 05:43:04 darkside Exp $
-
-inherit eutils
-
-DESCRIPTION="Run real-mode video BIOS code to alter hardware state (i.e. reinitialize video card)"
-HOMEPAGE="http://www.codon.org.uk/~mjg59/vbetool/"
-#SRC_URI="${HOMEPAGE}${PN}_${PV}.orig.tar.gz"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P//-/_}-1.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RDEPEND="sys-apps/pciutils"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-pci-compile-fix.patch
-}
-
-src_compile() {
-	LIBS="-lpci" econf || die "could not configure"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc LRMI
-}
diff --git a/sys-apps/vbetool/vbetool-0.5-r1.ebuild b/sys-apps/vbetool/vbetool-0.5-r1.ebuild
deleted file mode 100644
index 312552c9790b..000000000000
--- a/sys-apps/vbetool/vbetool-0.5-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vbetool/vbetool-0.5-r1.ebuild,v 1.2 2009/02/05 05:43:04 darkside Exp $
-
-inherit eutils
-
-DESCRIPTION="Run real-mode video BIOS code to alter hardware state (i.e. reinitialize video card)"
-HOMEPAGE="http://www.codon.org.uk/~mjg59/vbetool/"
-#SRC_URI="${HOMEPAGE}${PN}_${PV}.orig.tar.gz"
-#SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P//-/_}-1.tar.gz"
-SRC_URI="http://www.srcf.ucam.org/~mjg59/${PN}/${P//-/_}-1.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-RDEPEND="sys-apps/pciutils"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-0.4"
-
-#src_unpack() {
-#	unpack ${A}
-#	epatch ${FILESDIR}/${P}-pci-compile-fix.patch
-#}
-
-src_compile() {
-	# when on non-x86 machines, we need to use the x86 emulator
-	LIBS="-lpci" econf `use_with !x86 x86emu` || die "could not configure"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc LRMI
-}
diff --git a/sys-apps/vbetool/vbetool-0.5.ebuild b/sys-apps/vbetool/vbetool-0.5.ebuild
deleted file mode 100644
index 9597a696b508..000000000000
--- a/sys-apps/vbetool/vbetool-0.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vbetool/vbetool-0.5.ebuild,v 1.2 2009/02/05 05:43:04 darkside Exp $
-
-inherit eutils
-
-DESCRIPTION="Run real-mode video BIOS code to alter hardware state (i.e. reinitialize video card)"
-HOMEPAGE="http://www.codon.org.uk/~mjg59/vbetool/"
-#SRC_URI="${HOMEPAGE}${PN}_${PV}.orig.tar.gz"
-#SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P//-/_}-1.tar.gz"
-SRC_URI="http://www.srcf.ucam.org/~mjg59/${PN}/${P//-/_}-1.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-RDEPEND="sys-apps/pciutils"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-0.4"
-
-#src_unpack() {
-#	unpack ${A}
-#	epatch ${FILESDIR}/${P}-pci-compile-fix.patch
-#}
-
-src_compile() {
-	LIBS="-lpci" econf || die "could not configure"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc LRMI
-}
diff --git a/sys-apps/vbetool/vbetool-0.7.ebuild b/sys-apps/vbetool/vbetool-0.7.ebuild
deleted file mode 100644
index c8b187c1a4d0..000000000000
--- a/sys-apps/vbetool/vbetool-0.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/vbetool/vbetool-0.7.ebuild,v 1.4 2009/02/05 05:43:04 darkside Exp $
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Run real-mode video BIOS code to alter hardware state (i.e. reinitialize video card)"
-HOMEPAGE="http://www.codon.org.uk/~mjg59/vbetool/"
-#SRC_URI="${HOMEPAGE}${PN}_${PV}.orig.tar.gz"
-#SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P//-/_}-1.tar.gz"
-SRC_URI="http://www.srcf.ucam.org/~mjg59/${PN}/${P//-/_}-1.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="zlib"
-RDEPEND="zlib? ( sys-libs/zlib ) sys-apps/pciutils"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/${PN}-0.7"
-
-#src_unpack() {
-#	unpack ${A}
-#	epatch ${FILESDIR}/${P}-pci-compile-fix.patch
-#}
-
-src_compile() {
-	if use zlib
-	then
-		append-ldflags -lz
-	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
-	# when on non-x86 machines, we need to use the x86 emulator
-	LIBS="-lpci" econf `use_with !x86 x86emu` || die "could not configure"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install failed"
-	dodoc LRMI
-}
diff --git a/sys-apps/vbetool/vbetool-1.1.ebuild b/sys-apps/vbetool/vbetool-1.1.ebuild
new file mode 100644
index 000000000000..dd27c6368b6d
--- /dev/null
+++ b/sys-apps/vbetool/vbetool-1.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/vbetool/vbetool-1.1.ebuild,v 1.1 2009/11/09 13:38:37 scarabeus Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="Run real-mode video BIOS code to alter hardware state (i.e. reinitialize video card)"
+HOMEPAGE="http://www.codon.org.uk/~mjg59/vbetool/"
+SRC_URI="http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-1.1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib
+		sys-apps/pciutils
+		>=dev-libs/libx86-1.1-r1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0-build.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-x86emu
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+}