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

(Portage version: 2.2_rc48/cvs/Linux x86_64)

9 files changed, 46 insertions, 182 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/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"
+}