Merge live/snapshot ebuilds, and touch it up a bit.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

6 files changed, 147 insertions, 55 deletions

diff --git a/sys-apps/superiotool/ChangeLog b/sys-apps/superiotool/ChangeLog
index 641d978aadd3..a95f7b994040 100644
--- a/sys-apps/superiotool/ChangeLog
+++ b/sys-apps/superiotool/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/superiotool
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/superiotool/ChangeLog,v 1.3 2011/01/09 22:19:08 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/superiotool/ChangeLog,v 1.4 2011/12/05 17:53:39 vapier Exp $
+
+*superiotool-99999999 (05 Dec 2011)
+*superiotool-6637 (05 Dec 2011)
+
+  05 Dec 2011; Mike Frysinger <vapier@gentoo.org> +superiotool-6637.ebuild,
+  -superiotool-9999.ebuild, +superiotool-99999999.ebuild,
+  +files/make-tarball.sh:
+  Merge live/snapshot ebuilds, and touch it up a bit.
 
   09 Jan 2011; Christian Ruppert <idl0r@gentoo.org> superiotool-9999.ebuild:
   Define SUPERIOTOOL_VERSION through ESVN_WC_REVISION.
diff --git a/sys-apps/superiotool/Manifest b/sys-apps/superiotool/Manifest
index 31f7cfb32291..8c7c68db47cd 100644
--- a/sys-apps/superiotool/Manifest
+++ b/sys-apps/superiotool/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-EBUILD superiotool-9999.ebuild 1001 RMD160 dc0db9a61a04bf7645360cca5613dc3be3459acf SHA1 2cb59c37a4e86b6483c23b64814e8350628e5826 SHA256 34d565adca88df05f80f59474ceb0161cc39627546ec67e4730c30b5b51b0e3e
-MISC ChangeLog 616 RMD160 3e41aa2aada9f9c5a310120ae59616eebedea8c9 SHA1 e716169fe069f35877f35b7f957e71c11a749804 SHA256 11bca2a30bff1d45de1bbe5f379d3dabe4da7f4416f034fc59ce01c23dee8ed3
+AUX make-tarball.sh 671 RMD160 d4d883ec27071f89a87a08e421f20af5c8ec2709 SHA1 0e27d11f6f8e60547739407c479c7619eb2081e4 SHA256 ee2fe95929d7ff12b9aa2c61bc4b73497bfac4be754aa7a573f024a0bbf21b68
+DIST superiotool-6637.tar.xz 27364 RMD160 6a54fe45717a15bc3751455c310a16e3fa34ee9e SHA1 4e0c5c4c9778edd86443dcaf84cc102da351410c SHA256 e21e091c7679c2eeac66aa49499c02587d64a41b3b36449f4ec06dafc8f0ba21
+EBUILD superiotool-6637.ebuild 1064 RMD160 c51b9f121319ef188ac033fae85d8bd3257d8426 SHA1 027fb0d1c07424d02a774a29c6969f2add6c66e9 SHA256 4c4450a34e6e1a2e595aae8863f3c6134b4ae01dec46cc8490cb69a21ab12459
+EBUILD superiotool-99999999.ebuild 1068 RMD160 424acbbd35f2c53b0cae011994f0dce6d5f52039 SHA1 36cf0edad9649e4dea34367bc54ab6fa280626ea SHA256 2412cba27fdedec6c8842352c131e9664fa75052bddf5fae016ef61b841fef17
+MISC ChangeLog 901 RMD160 0fa58a3ce84c015c63d002d3668cb9e47c2561fc SHA1 9c16056acfe387c02197522761a276d1aa974b53 SHA256 09eee602d911cf6817f86b41c82a0d052852b8a7b906c2ff3ef81957e8793938
 MISC metadata.xml 340 RMD160 531220a3ddda5a3afd78c8fc95faa4826626836b SHA1 05888826752a393aa1b2269ca4cee2e2f822b651 SHA256 0a22aa604e813654c1ad4f56ad40e32e51c66abd554d0ef7f2ce00012e65db34
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59sbUACgkQfXuS5UK5QB1yLwP+MzkfpPjmPjF1q/lZqonknZfJ
-HrS6cYM8qju16dC9LjGs4eUvHeAq+NjQOwtCrZqtirotxK/AUzNc1+wS1uTqaycK
-SE4rwlSsYQrCZXdPzRk3m187sCfZ0fSvr+5fLnZRraoBaMaejeYJ6N8JQRqbCzN9
-pnsntltOQe/jDHYlcrk=
-=ukq5
+iF4EAREIAAYFAk7dBSkACgkQaC/OocHi7JYBcwD/Xh9v8FRF1HLAlxUmsTAqf6NQ
+G7SQIINm/K2Rt7iChbkA/35OL1KzRM8PBHpyj23vjMgeIkOOa71RwEcLy1imVt3N
+=K947
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/superiotool/files/make-tarball.sh b/sys-apps/superiotool/files/make-tarball.sh
new file mode 100755
index 000000000000..3711db140db3
--- /dev/null
+++ b/sys-apps/superiotool/files/make-tarball.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+. /etc/init.d/functions.sh
+
+svnrev() { svn info "$1" | awk '$1 == "Revision:" { print $NF }'; }
+
+PN=superiotool
+SVN_ROOT=${2:-/usr/local/src}
+srcdir=${SVN_ROOT}/${PN}
+PV=${1:-$(svnrev "${srcdir}")}
+
+P=${PN}-${PV}
+T=/tmp
+
+if [[ -d ${srcdir} ]] ; then
+	cd "${T}" || die
+
+	rm -rf ${P}
+
+	ebegin "Exporting ${srcdir} ${PV} to ${P}"
+	svn export -q -r ${PV} ${srcdir} ${P}
+	eend $? || die
+
+	ebegin "Creating ${P}.tar.xz"
+	tar cf - ${P} | xz > ${P}.tar.xz
+	eend $?
+
+	einfo "Tarball now ready at: ${T}/${P}.tar.xz"
+else
+	einfo "You need to run:"
+	einfo " cd ${base}"
+	einfo " svn co svn://coreboot.org/coreboot/trunk/util/superiotool"
+	die "need svn checkout dir"
+fi
diff --git a/sys-apps/superiotool/superiotool-6637.ebuild b/sys-apps/superiotool/superiotool-6637.ebuild
new file mode 100644
index 000000000000..a5597192f2e8
--- /dev/null
+++ b/sys-apps/superiotool/superiotool-6637.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/superiotool/superiotool-6637.ebuild,v 1.1 2011/12/05 17:53:39 vapier Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs eutils
+
+if [[ ${PV} == "99999999" ]] ; then
+	ESVN_REPO_URI="svn://coreboot.org/coreboot/trunk/util/${PN}"
+	inherit subversion
+	SRC_URI=""
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="util to detect Super I/O chips and functionality"
+HOMEPAGE="http://www.coreboot.org/Superiotool"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="pci"
+
+RDEPEND="pci? ( sys-apps/pciutils )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_prepare() {
+	sed -i \
+		-e 's:-Werror ::' \
+		-e 's:-O2 ::' \
+		-e 's:\s\+\?-lz\s\+\?::' \
+		-e "/^CONFIG_PCI =/s:=.*:=$(usex pci yes no):" \
+		-e '/PREFIX/s:=.*:= /usr:' \
+		Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		SVNDEF="-D'SUPERIOTOOL_VERSION=\"${ESVN_WC_REVISION}\"'"
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc README
+}
diff --git a/sys-apps/superiotool/superiotool-9999.ebuild b/sys-apps/superiotool/superiotool-9999.ebuild
deleted file mode 100644
index 44f47af753c0..000000000000
--- a/sys-apps/superiotool/superiotool-9999.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/superiotool/superiotool-9999.ebuild,v 1.3 2011/01/09 22:19:08 idl0r Exp $
-
-EAPI=3
-
-inherit toolchain-funcs subversion
-
-DESCRIPTION="user-space utility to detect Super I/O chips and functionality to
-get more information about it"
-HOMEPAGE="http://coreboot.org"
-SRC_URI=""
-ESVN_REPO_URI="svn://coreboot.org/coreboot/trunk/util/${PN}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="pci"
-
-DEPEND="pci? ( sys-apps/pciutils )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -i -e 's:-Werror ::' \
-		-e 's:-O2 ::' \
-		-e 's:\s\+\?-lz\s\+\?::' \
-		Makefile || die
-}
-
-src_compile() {
-	local config_pci
-
-	if use pci; then
-		config_pci="yes"
-	else
-		config_pci="no"
-	fi
-
-	emake CC=$(tc-getCC) CONFIG_PCI=${config_pci} \
-		SVNDEF="-D'SUPERIOTOOL_VERSION=\"${ESVN_WC_REVISION}\"'" || die
-}
-
-src_install() {
-	dosbin superiotool || die
-	doman superiotool.8
-	dodoc README
-}
diff --git a/sys-apps/superiotool/superiotool-99999999.ebuild b/sys-apps/superiotool/superiotool-99999999.ebuild
new file mode 100644
index 000000000000..0fcf8caa6130
--- /dev/null
+++ b/sys-apps/superiotool/superiotool-99999999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/superiotool/superiotool-99999999.ebuild,v 1.1 2011/12/05 17:53:39 vapier Exp $
+
+EAPI="4"
+
+inherit toolchain-funcs eutils
+
+if [[ ${PV} == "99999999" ]] ; then
+	ESVN_REPO_URI="svn://coreboot.org/coreboot/trunk/util/${PN}"
+	inherit subversion
+	SRC_URI=""
+else
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="util to detect Super I/O chips and functionality"
+HOMEPAGE="http://www.coreboot.org/Superiotool"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="pci"
+
+RDEPEND="pci? ( sys-apps/pciutils )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils"
+
+src_prepare() {
+	sed -i \
+		-e 's:-Werror ::' \
+		-e 's:-O2 ::' \
+		-e 's:\s\+\?-lz\s\+\?::' \
+		-e "/^CONFIG_PCI =/s:=.*:=$(usex pci yes no):" \
+		-e '/PREFIX/s:=.*:= /usr:' \
+		Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		SVNDEF="-D'SUPERIOTOOL_VERSION=\"${ESVN_WC_REVISION}\"'"
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc README
+}