touch the libc

4 files changed, 27 insertions, 24 deletions

diff --git a/app-arch/rpm2targz/rpm2targz-8.0.ebuild b/app-arch/rpm2targz/rpm2targz-8.0.ebuild
index 9d1775446f89..8f713b9be463 100644
--- a/app-arch/rpm2targz/rpm2targz-8.0.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-8.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-8.0.ebuild,v 1.21 2004/06/24 21:35:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-8.0.ebuild,v 1.22 2004/06/25 23:54:36 vapier Exp $
+
+inherit gcc
 
 DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
 HOMEPAGE="http://www.slackware.com/config/packages.php"
@@ -10,10 +12,10 @@ SRC_URI="ftp://ftp.slackware.com/pub/slackware/slackware-${PV}/source/a/bin/rpm2
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 sparc ppc alpha hppa amd64"
+KEYWORDS="x86 ppc sparc alpha hppa amd64"
 IUSE=""
 
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	app-arch/cpio"
 
 src_unpack() {
@@ -24,10 +26,10 @@ src_unpack() {
 }
 
 src_compile() {
-	${CC:-gcc} ${CFLAGS} -o rpmoffset rpmoffset.c || die
+	$(gcc-getCC) ${CFLAGS} -o rpmoffset rpmoffset.c || die
 }
 
 src_install() {
-	dobin rpmoffset rpm2targz
+	dobin rpmoffset rpm2targz || die
 	dodoc rpm2targz.README
 }
diff --git a/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild b/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild
index f28c48b9e8f6..abaca611199d 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild,v 1.15 2004/06/24 21:35:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0-r1.ebuild,v 1.16 2004/06/25 23:54:36 vapier Exp $
 
-inherit eutils
+inherit eutils gcc
 
 DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
 HOMEPAGE="http://www.slackware.com/config/packages.php"
@@ -10,16 +10,17 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa ~mips amd64 ia64 ~ppc64"
+KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ia64 ~ppc64"
 IUSE=""
 
 # NOTE: rpm2targz autodetects rpm2cpio at runtime, and uses it if available,
 #       so we don't explicitly set it as a dependency.
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	app-arch/cpio
 	sys-apps/file"
-
-RDEPEND="$DEPEND sys-apps/util-linux sys-apps/which"
+RDEPEND="${DEPEND}
+	sys-apps/util-linux
+	sys-apps/which"
 
 S=${WORKDIR}
 
@@ -33,10 +34,10 @@ src_unpack() {
 }
 
 src_compile() {
-	${CC:-gcc} ${CFLAGS} -o rpmoffset rpmoffset.c || die
+	$(gcc-getCC) ${CFLAGS} -o rpmoffset rpmoffset.c || die
 }
 
 src_install() {
-	dobin rpmoffset rpm2targz
+	dobin rpmoffset rpm2targz || die
 	dodoc rpm2targz.README
 }
diff --git a/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild b/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild
index 57625a25ba68..e18d9c6ed0dd 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild,v 1.8 2004/06/24 21:35:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0-r2.ebuild,v 1.9 2004/06/25 23:54:36 vapier Exp $
 
-inherit eutils
+inherit eutils gcc
 
 DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
 HOMEPAGE="http://www.slackware.com/config/packages.php"
@@ -15,7 +15,7 @@ IUSE=""
 
 # NOTE: rpm2targz autodetects rpm2cpio at runtime, and uses it if available,
 #       so we don't explicitly set it as a dependency.
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	app-arch/cpio
 	sys-apps/file"
 RDEPEND="${DEPEND}
@@ -36,10 +36,10 @@ src_unpack() {
 }
 
 src_compile() {
-	${CC:-gcc} ${CFLAGS} -o rpmoffset rpmoffset.c || die
+	$(gcc-getCC) ${CFLAGS} -o rpmoffset rpmoffset.c || die
 }
 
 src_install() {
-	dobin rpmoffset rpm2targz
+	dobin rpmoffset rpm2targz || die
 	dodoc rpm2targz.README
 }
diff --git a/app-arch/rpm2targz/rpm2targz-9.0.ebuild b/app-arch/rpm2targz/rpm2targz-9.0.ebuild
index 1a9a5554c0f7..7b339045f8ea 100644
--- a/app-arch/rpm2targz/rpm2targz-9.0.ebuild
+++ b/app-arch/rpm2targz/rpm2targz-9.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.ebuild,v 1.8 2004/06/24 21:35:44 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm2targz/rpm2targz-9.0.ebuild,v 1.9 2004/06/25 23:54:36 vapier Exp $
 
-inherit eutils
+inherit eutils gcc
 
 DESCRIPTION="Convert a .rpm file to a .tar.gz archive"
 HOMEPAGE="http://www.slackware.com/config/packages.php"
@@ -10,12 +10,12 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc ~alpha ~hppa"
+KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa"
 IUSE=""
 
 # NOTE: rpm2targz autodetects rpm2cpio at runtime, and uses it if available,
 #       so we don't explicitly set it as a dependency.
-DEPEND="virtual/glibc
+DEPEND="virtual/libc
 	app-arch/cpio
 	sys-apps/file"
 
@@ -27,10 +27,10 @@ src_unpack() {
 }
 
 src_compile() {
-	${CC:-gcc} ${CFLAGS} -o rpmoffset rpmoffset.c || die
+	$(gcc-getCC) ${CFLAGS} -o rpmoffset rpmoffset.c || die
 }
 
 src_install() {
-	dobin rpmoffset rpm2targz
+	dobin rpmoffset rpm2targz || die
 	dodoc rpm2targz.README
 }