$CC -> $(tc-getCC)

5 files changed, 9 insertions, 86 deletions

diff --git a/sys-libs/pwdb/files/digest-pwdb-0.61-r4 b/sys-libs/pwdb/files/digest-pwdb-0.61-r4
deleted file mode 100644
index 825ea69e2f09..000000000000
--- a/sys-libs/pwdb/files/digest-pwdb-0.61-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 47e2dc0d5590390fe7a3937961575b09 pwdb-0.61.tar.gz 136263
diff --git a/sys-libs/pwdb/files/pwdb-0.61-hppa.patch b/sys-libs/pwdb/files/pwdb-0.61-hppa.patch
deleted file mode 100644
index 1a866f3be661..000000000000
--- a/sys-libs/pwdb/files/pwdb-0.61-hppa.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- work/pwdb-0.61/libpwdb/Makefile	2003-03-24 09:42:42.000000000 +0000
-+++ work.old/pwdb-0.61/libpwdb/Makefile	2003-03-24 09:34:04.000000000 +0000
-@@ -50,7 +50,8 @@
- 
- 
- $(LIBDYNAME): $(LIBOBJ)
--	$(LD) -soname $(LIBSONAME) -x -shared -o $(LIBFILENAME) $(LIBOBJ) -lcrypt -lnsl -lc
-+	#$(LD) -soname $(LIBSONAME) -x -shared -o $(LIBFILENAME) $(LIBOBJ) -lcrypt -lnsl -lc
-+	$(CC)  -shared -o $(LIBFILENAME) $(LIBOBJ)  -lcrypt -lnsl -lc
- 	@ln -sf $(LIBFILENAME) $@
- 
- $(LIBSTATIC): $(LIBOBJ)
diff --git a/sys-libs/pwdb/files/pwdb-0.61-selinux.diff.bz2 b/sys-libs/pwdb/files/pwdb-0.61-selinux.diff.bz2
deleted file mode 100644
index 3cfdde6aadac..000000000000
--- a/sys-libs/pwdb/files/pwdb-0.61-selinux.diff.bz2
+++ /dev/null
diff --git a/sys-libs/pwdb/pwdb-0.61-r4.ebuild b/sys-libs/pwdb/pwdb-0.61-r4.ebuild
deleted file mode 100644
index 1545c740dca6..000000000000
--- a/sys-libs/pwdb/pwdb-0.61-r4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.61-r4.ebuild,v 1.23 2004/07/02 08:50:20 eradicator Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="selinux"
-
-SELINUX_PATCH="pwdb-0.61-selinux.diff.bz2"
-
-DESCRIPTION="Password database"
-HOMEPAGE="http://www.firstlinux.com/cgi-bin/package/content.cgi?ID=6886"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="BSD | GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ppc sparc alpha mips hppa ia64"
-
-DEPEND="virtual/libc
-	selinux? ( sys-libs/libselinux )"
-
-src_unpack () {
-	mkdir ${S}
-	cd ${S}
-	unpack ${A}
-	[ "${ARCH}" = "hppa" ] && epatch ${FILESDIR}/${P}-hppa.patch
-	use selinux && epatch ${FILESDIR}/${SELINUX_PATCH}
-}
-
-src_compile() {
-	filter-flags "-fstack-protector"
-
-	# author has specified application to be compiled with `-g` 
-	# no problem, but with ccc `-g` disables optimisation to make
-	# debugging easier, `-g3` enables debugging and optimisation
-	[ "${ARCH}" = "alpha" -a "${CC}" = "ccc" ] && append-flags -g3
-	cp Makefile Makefile.orig
-	cp default.defs default.defs.orig
-	sed -e "s/^DIRS = .*/DIRS = libpwdb/" -e "s:EXTRAS += :EXTRAS += ${CFLAGS} :" \
-		Makefile.orig > Makefile
-	sed -e "s/=gcc/=${CC:-gcc}/g" default.defs.orig > default.defs
-	emake || die
-}
-
-src_install() {
-	dodir /lib /usr/include/pwdb
-	make INCLUDED=${D}/usr/include/pwdb \
-		LIBDIR=${D}/lib \
-		LDCONFIG="echo" \
-		install || die
-
-	preplib /
-	dodir /usr/lib
-	mv ${D}/lib/*.a ${D}/usr/lib
-
-	# See bug $4411 for more info
-	gen_usr_ldscript libpwdb.so
-
-	insinto /etc
-	doins conf/pwdb.conf
-
-	dodoc CHANGES Copyright CREDITS README
-	dohtml -r doc
-	docinto txt
-	dodoc doc/*.txt
-}
-
diff --git a/sys-libs/pwdb/pwdb-0.62.ebuild b/sys-libs/pwdb/pwdb-0.62.ebuild
index 9ac2086a1a35..504ed4d76ba1 100644
--- a/sys-libs/pwdb/pwdb-0.62.ebuild
+++ b/sys-libs/pwdb/pwdb-0.62.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.15 2004/07/02 08:50:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/pwdb/pwdb-0.62.ebuild,v 1.16 2004/11/05 01:40:41 vapier Exp $
 
 inherit eutils flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="BSD | GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE="selinux"
 
 DEPEND="virtual/libc
@@ -26,13 +26,15 @@ src_unpack () {
 
 	use selinux && epatch ${FILESDIR}/${P}-selinux.patch
 
-	sed -i -e "s/^DIRS = .*/DIRS = libpwdb/" -e "s:EXTRAS += :EXTRAS += ${CFLAGS} :" \
+	sed -i \
+		-e "s/^DIRS = .*/DIRS = libpwdb/" \
+		-e "s:EXTRAS += :EXTRAS += ${CFLAGS} :" \
 		Makefile
-	sed -i -e "s/=gcc/=${CC:-gcc}/g" default.defs
+	sed -i -e "s/=gcc/=$(tc-getCC)/g" default.defs
 }
 
 src_compile() {
-	filter-flags "-fstack-protector"
+	filter-flags -fstack-protector
 
 	# author has specified application to be compiled with `-g` 
 	# no problem, but with ccc `-g` disables optimisation to make
@@ -44,7 +46,8 @@ src_compile() {
 
 src_install() {
 	dodir /lib /usr/include/pwdb
-	make INCLUDED=${D}/usr/include/pwdb \
+	make \
+		INCLUDED=${D}/usr/include/pwdb \
 		LIBDIR=${D}/lib \
 		LDCONFIG="echo" \
 		install || die