Use rpm.eclass instead of rpm2targz, bug #103278. Tidy old ebuilds

(Portage version: 1.589-cvs)

11 files changed, 13 insertions, 202 deletions

diff --git a/app-admin/tmpwatch/ChangeLog b/app-admin/tmpwatch/ChangeLog
index ce4927e12db7..6441bad9731c 100644
--- a/app-admin/tmpwatch/ChangeLog
+++ b/app-admin/tmpwatch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/tmpwatch
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/ChangeLog,v 1.46 2005/08/23 02:43:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/ChangeLog,v 1.47 2005/08/25 03:30:51 ka0ttic Exp $
+
+  25 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> -tmpwatch-2.9.0.ebuild,
+  -tmpwatch-2.9.1.1.ebuild, -tmpwatch-2.9.2.1.ebuild,
+  -tmpwatch-2.9.3.1.ebuild, tmpwatch-2.9.4.1.ebuild:
+  Use rpm.eclass instead of rpm2targz, bug #103278. Tidy old ebuilds
 
   23 Aug 2005; Aron Griffis <agriffis@gentoo.org> tmpwatch-2.9.4.1.ebuild:
   stable on ia64
diff --git a/app-admin/tmpwatch/Manifest b/app-admin/tmpwatch/Manifest
index de7707470764..b6c18dc54d86 100644
--- a/app-admin/tmpwatch/Manifest
+++ b/app-admin/tmpwatch/Manifest
@@ -1,15 +1,7 @@
+MD5 a47ff12053ee78c83bf41acf7d64bff6 tmpwatch-2.9.4.1.ebuild 1250
 MD5 7d34ccd9bfe45b0510662b13aca93b79 tmpwatch-2.9.2.2.ebuild 1427
-MD5 2b6b23aabff259d9f444c96a4d03ce23 tmpwatch-2.9.3.1.ebuild 1428
+MD5 cc62ef3c72dd4a20331d585751212cc2 ChangeLog 5485
 MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 1df44de20b696ec47cf1cae0593673f2 ChangeLog 5235
-MD5 162639345d0069dc931440d6ad1438c6 tmpwatch-2.9.2.1.ebuild 1428
-MD5 36c4a5946871944f476e3a2e23f85e7c tmpwatch-2.9.0.ebuild 1227
-MD5 b9075184d91f77a6c9ad2a4468ec8b3b tmpwatch-2.9.4.1.ebuild 1429
-MD5 97947b667beab19d9fb9da9f960d7f03 tmpwatch-2.9.1.1.ebuild 1370
-MD5 67e8740c6efad67a6444412b58d2208f files/digest-tmpwatch-2.9.3.1 68
-MD5 ed9c3f3744c20d2c5946a551ac3bd2ce files/digest-tmpwatch-2.9.4.1 68
-MD5 8fed4664f92ea7e8842eaeeff5ac1afb files/digest-tmpwatch-2.9.2.1 68
 MD5 704d114213dba07ca8bbb2a1fe8baca7 files/digest-tmpwatch-2.9.2.2 68
-MD5 b070831994ddfe3b392417b547670687 files/digest-tmpwatch-2.9.1.1 68
+MD5 ed9c3f3744c20d2c5946a551ac3bd2ce files/digest-tmpwatch-2.9.4.1 68
 MD5 c2b96ff8dc2c589482deaa38b4a03016 files/tmpwatch.cron 1365
-MD5 185828eaf60e27de261fa50a676a47b6 files/digest-tmpwatch-2.9.0 68
diff --git a/app-admin/tmpwatch/files/digest-tmpwatch-2.9.0 b/app-admin/tmpwatch/files/digest-tmpwatch-2.9.0
deleted file mode 100644
index 8192dfd6b802..000000000000
--- a/app-admin/tmpwatch/files/digest-tmpwatch-2.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c1d980ad4f082b0f69c7d373628a4a33 tmpwatch-2.9.0-2.src.rpm 20943
diff --git a/app-admin/tmpwatch/files/digest-tmpwatch-2.9.1.1 b/app-admin/tmpwatch/files/digest-tmpwatch-2.9.1.1
deleted file mode 100644
index ee1413a108d8..000000000000
--- a/app-admin/tmpwatch/files/digest-tmpwatch-2.9.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2175b53fce8162cf1e637da4fd20c25a tmpwatch-2.9.1-0.src.rpm 21813
diff --git a/app-admin/tmpwatch/files/digest-tmpwatch-2.9.2.1 b/app-admin/tmpwatch/files/digest-tmpwatch-2.9.2.1
deleted file mode 100644
index 805c258c3796..000000000000
--- a/app-admin/tmpwatch/files/digest-tmpwatch-2.9.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4df275a0e3cb5517b01d6a1d79ff9991 tmpwatch-2.9.2-1.src.rpm 19347
diff --git a/app-admin/tmpwatch/files/digest-tmpwatch-2.9.3.1 b/app-admin/tmpwatch/files/digest-tmpwatch-2.9.3.1
deleted file mode 100644
index a7f7cb7da694..000000000000
--- a/app-admin/tmpwatch/files/digest-tmpwatch-2.9.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d0031bd81e2c70444f7c1155cfa22297 tmpwatch-2.9.3-1.src.rpm 19752
diff --git a/app-admin/tmpwatch/tmpwatch-2.9.0.ebuild b/app-admin/tmpwatch/tmpwatch-2.9.0.ebuild
deleted file mode 100644
index e0f5b86ab48a..000000000000
--- a/app-admin/tmpwatch/tmpwatch-2.9.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/tmpwatch-2.9.0.ebuild,v 1.12 2005/01/01 11:31:57 eradicator Exp $
-
-RPM_V="2"
-
-DESCRIPTION="Utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time."
-HOMEPAGE="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/"
-SRC_URI="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/${P}-${RPM_V}.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha ia64 ~amd64 ppc64"
-IUSE=""
-
-DEPEND="virtual/libc
-	app-arch/rpm2targz"
-
-src_unpack() {
-	cd ${WORKDIR}
-	rpm2targz ${DISTDIR}/${P}-${RPM_V}.src.rpm || die "rpm2targz failed"
-	tar zxf ${P}-${RPM_V}.src.tar.gz || die
-	tar zxf ${P}.tar.gz || die
-
-	cd ${S}
-	sed -i "s:..RPM_OPT_FLAGS.:${CFLAGS}:" Makefile \
-		|| die "sed Makefile failed"
-	sed -i 's|/sbin/fuser|/bin/fuser|' tmpwatch.c \
-		|| die "sed tmpwatch.c failed"
-	sed -i 's|/sbin|/bin|' tmpwatch.8 || die "sed tmpwatch.8 failed"
-}
-
-src_install() {
-	preplib /usr
-	dosbin tmpwatch || die "dosbin failed"
-	doman tmpwatch.8 || die "doman failed"
-}
diff --git a/app-admin/tmpwatch/tmpwatch-2.9.1.1.ebuild b/app-admin/tmpwatch/tmpwatch-2.9.1.1.ebuild
deleted file mode 100644
index 813e01cb9e78..000000000000
--- a/app-admin/tmpwatch/tmpwatch-2.9.1.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/tmpwatch-2.9.1.1.ebuild,v 1.9 2005/01/01 11:31:57 eradicator Exp $
-
-inherit versionator
-
-RPM_P="${PN}-$(replace_version_separator 3 '-')"
-MY_P="${RPM_P%-*}"
-
-DESCRIPTION="Utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time."
-HOMEPAGE="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/"
-SRC_URI="mirror://gentoo/${MY_P}-0.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha ~ia64 amd64 ~ppc64"
-IUSE=""
-
-DEPEND="virtual/libc
-	app-arch/rpm2targz"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	cd "${WORKDIR}"
-	rpm2targz "${DISTDIR}/${MY_P}-0.src.rpm" || die "rpm2targz failed"
-	tar zxf "${MY_P}-0.src.tar.gz" || die
-	tar zxf "${MY_P}.tar.gz" || die
-
-	cd "${S}"
-	sed -i -e "s:..RPM_OPT_FLAGS.:${CFLAGS}:" \
-		-e "s:^CVS:#CVS:g" Makefile \
-		|| die "sed Makefile failed"
-	sed -i 's|/sbin/fuser|/bin/fuser|' tmpwatch.c \
-		|| die "sed tmpwatch.c failed"
-	sed -i 's|/sbin|/bin|' tmpwatch.8 || die "sed tmpwatch.8 failed"
-}
-
-src_install() {
-	preplib
-	dosbin tmpwatch || die "dosbin failed"
-	doman tmpwatch.8 || die "doman failed"
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/${PN}.cron" "${PN}" || die
-}
diff --git a/app-admin/tmpwatch/tmpwatch-2.9.2.1.ebuild b/app-admin/tmpwatch/tmpwatch-2.9.2.1.ebuild
deleted file mode 100644
index 61aaba0c46ea..000000000000
--- a/app-admin/tmpwatch/tmpwatch-2.9.2.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/tmpwatch-2.9.2.1.ebuild,v 1.7 2005/04/08 10:28:55 corsair Exp $
-
-inherit versionator
-
-RPM_P="${PN}-$(replace_version_separator 3 '-')"
-MY_P="${RPM_P%-*}"
-
-DESCRIPTION="Utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time."
-HOMEPAGE="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/"
-SRC_URI="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/${RPM_P}.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha ~ia64 amd64 ppc64 ~sparc"
-IUSE=""
-
-DEPEND="virtual/libc
-	app-arch/rpm2targz"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	cd "${WORKDIR}"
-	rpm2targz "${DISTDIR}/${RPM_P}.src.rpm" || die "rpm2targz failed"
-	tar zxf "${RPM_P}.src.tar.gz" || die
-	tar zxf "${MY_P}.tar.gz" || die
-
-	cd "${S}"
-	sed -i -e "s:..RPM_OPT_FLAGS.:${CFLAGS}:" \
-		-e "s:^CVS:#CVS:g" Makefile \
-		|| die "sed Makefile failed"
-	sed -i 's|/sbin/fuser|/bin/fuser|' tmpwatch.c \
-		|| die "sed tmpwatch.c failed"
-	sed -i 's|/sbin|/bin|' tmpwatch.8 || die "sed tmpwatch.8 failed"
-}
-
-src_install() {
-	preplib
-	dosbin tmpwatch || die "dosbin failed"
-	doman tmpwatch.8 || die "doman failed"
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/${PN}.cron" "${PN}" || die
-}
diff --git a/app-admin/tmpwatch/tmpwatch-2.9.3.1.ebuild b/app-admin/tmpwatch/tmpwatch-2.9.3.1.ebuild
deleted file mode 100644
index 05b9456df604..000000000000
--- a/app-admin/tmpwatch/tmpwatch-2.9.3.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/tmpwatch-2.9.3.1.ebuild,v 1.5 2005/07/26 21:26:51 kloeri Exp $
-
-inherit versionator
-
-RPM_P="${PN}-$(replace_version_separator 3 '-')"
-MY_P="${RPM_P%-*}"
-
-DESCRIPTION="Utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time."
-HOMEPAGE="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/"
-SRC_URI="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/${RPM_P}.src.rpm"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND="virtual/libc
-	app-arch/rpm2targz"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	cd "${WORKDIR}"
-	rpm2targz "${DISTDIR}/${RPM_P}.src.rpm" || die "rpm2targz failed"
-	tar zxf "${RPM_P}.src.tar.gz" || die
-	tar zxf "${MY_P}.tar.gz" || die
-
-	cd "${S}"
-	sed -i -e "s:..RPM_OPT_FLAGS.:${CFLAGS}:" \
-		-e "s:^CVS:#CVS:g" Makefile \
-		|| die "sed Makefile failed"
-	sed -i 's|/sbin/fuser|/bin/fuser|' tmpwatch.c \
-		|| die "sed tmpwatch.c failed"
-	sed -i 's|/sbin|/bin|' tmpwatch.8 || die "sed tmpwatch.8 failed"
-}
-
-src_install() {
-	preplib
-	dosbin tmpwatch || die "dosbin failed"
-	doman tmpwatch.8 || die "doman failed"
-
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}/${PN}.cron" "${PN}" || die
-}
diff --git a/app-admin/tmpwatch/tmpwatch-2.9.4.1.ebuild b/app-admin/tmpwatch/tmpwatch-2.9.4.1.ebuild
index 39d0594d1c78..650fbe8834cc 100644
--- a/app-admin/tmpwatch/tmpwatch-2.9.4.1.ebuild
+++ b/app-admin/tmpwatch/tmpwatch-2.9.4.1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/tmpwatch-2.9.4.1.ebuild,v 1.6 2005/08/23 02:43:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/tmpwatch/tmpwatch-2.9.4.1.ebuild,v 1.7 2005/08/25 03:30:51 ka0ttic Exp $
 
-inherit versionator
+inherit rpm versionator
 
 RPM_P="${PN}-$(replace_version_separator 3 '-')"
 MY_P="${RPM_P%-*}"
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time."
 HOMEPAGE="http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/"
@@ -16,16 +17,8 @@ SLOT="0"
 KEYWORDS="alpha ~amd64 ia64 ppc ppc64 ~sparc x86"
 IUSE=""
 
-DEPEND="virtual/libc
-	app-arch/rpm2targz"
-
-S="${WORKDIR}/${MY_P}"
-
 src_unpack() {
-	cd "${WORKDIR}"
-	rpm2targz "${DISTDIR}/${RPM_P}.src.rpm" || die "rpm2targz failed"
-	tar zxf "${RPM_P}.src.tar.gz" || die
-	tar zxf "${MY_P}.tar.gz" || die
+	rpm_src_unpack
 
 	cd "${S}"
 	sed -i -e "s:..RPM_OPT_FLAGS.:${CFLAGS}:" \