$CC -> $(tc-getCC)

diff --git a/sys-libs/pwdb/Manifest b/sys-libs/pwdb/Manifest
index 03c7995bf2357b9b158a6d2e5e7dce790f851576..9e2488383102fcff2950472bba2a96b4cb480051 100644 (file)
--- a/sys-libs/pwdb/Manifest
+++ b/sys-libs/pwdb/Manifest
@@ -1,11 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 14ee08d4b2c3f66ae67e63abdf469831 ChangeLog 3612
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 18cb9d5fcba16ee63bec44f000570786 pwdb-0.61-r4.ebuild 1702
-MD5 938d9f21a26ab8b9c7912e4515bc185a pwdb-0.62.ebuild 1673
-MD5 bfc6ac3622c2b25c39d9f48d8474c2dc files/digest-pwdb-0.61-r4 61
+MD5 f8fddfcd81da47e8e18ae37cd6ec4347 pwdb-0.62.ebuild 1680
 MD5 8cc9a65a57937cd962ff641cf94e40c3 files/digest-pwdb-0.62 61
 MD5 0d0c7a6216f5cf079472dfe36ea9d71c files/passwd 143
-MD5 cd2a9858f40c4a6e7098424f5785b7bc files/pwdb-0.61-hppa.patch 487
-MD5 79659c4025929dac91dc8afc808eec2a files/pwdb-0.61-selinux.diff.bz2 1993
 MD5 bf4eb22a793eb0683d8c62b4677d66f8 files/pwdb-0.62-selinux.patch 10567
 MD5 f2d1888e60ba62137f53ed5378eb7e25 files/pwdb-0.62-use-gcc-as-linker.patch 508
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBitpFHTu7gpaalycRAjdBAJ0Z51vLhCPUTWERtEAhjVdnW9Zf0ACgg6Zy
+vefky7yZJpV5hZnD9B4dCmE=
+=Zn71
+-----END PGP SIGNATURE-----

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 (file)
index 825ea69..0000000
--- 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 (file)
index 1a866f3..0000000
--- 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 (file)
index 3cfdde6..0000000
Binary files a/sys-libs/pwdb/files/pwdb-0.61-selinux.diff.bz2 and /dev/null differ

diff --git a/sys-libs/pwdb/pwdb-0.61-r4.ebuild b/sys-libs/pwdb/pwdb-0.61-r4.ebuild
deleted file mode 100644 (file)
index 1545c74..0000000
--- 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 9ac2086a1a359ad3346b402b77d332aa68bb1f35..504ed4d76ba1e743bebe3b0920e2df5568672e16 100644 (file)
--- 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

diff --git a/sys-libs/slang/Manifest b/sys-libs/slang/Manifest
index 9be47486c02bc5fae56d8db788d859551ae7e1ab..f5bd190ffd800752c1bdc9c46708d72d15555146 100644 (file)
--- a/sys-libs/slang/Manifest
+++ b/sys-libs/slang/Manifest
@@ -3,15 +3,9 @@ Hash: SHA1
 
 MD5 c2f4d54b5e00765874ba216692db12c6 ChangeLog 4772
 MD5 d24403622d172658c4e564baec674de9 metadata.xml 281
-MD5 a4262200090acfbe30511d59d5177da1 slang-1.4.5-r1.ebuild 1042
-MD5 e944db465cf771d07c6522c0fbf6d0b1 slang-1.4.5-r2.ebuild 1188
 MD5 669cc071226583ff25e3c2f24f78bc4c slang-1.4.9-r1.ebuild 1856
-MD5 b94b8fe00fc41fca7e7552f11286ebf6 slang-1.4.9.ebuild 1187
-MD5 b33b25719286e6314758026cdaf75fb2 files/digest-slang-1.4.5-r1 63
-MD5 b33b25719286e6314758026cdaf75fb2 files/digest-slang-1.4.5-r2 63
 MD5 074ddbf39cb8b9708ca9de2b1fb24366 files/digest-slang-1.4.9-r1 64
 MD5 5617c722a455c1aa405c699ff361bd58 files/slang-1.4.9.dif 1808
-MD5 074ddbf39cb8b9708ca9de2b1fb24366 files/digest-slang-1.4.9 64
 MD5 11daf6d137e1d6ec0e3475e55522cd06 files/slang-1.4.9-autoconf.dif 4143
 MD5 007cb225c11034b59197bdb5d507aa84 files/slang-1.4.9-fsuid.dif 808
 MD5 e2ddc20bfbb1ac10becb53e1707b067c files/slang-debian-utf8.patch 21377
@@ -20,7 +14,7 @@ MD5 4be647282e8c01060db9d1707098bd1d files/slang-utf8-fix.patch 855
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBh569HTu7gpaalycRAtIoAJ9BG0xntww4rJ5jpq3xPRs9+Y6MwACeJ/Et
-sLNXOo3mZF4g+fM8mgS+5j8=
-=SL0v
+iD8DBQFBitqMHTu7gpaalycRAn0BAKCbagzurPA2PXfX9v6Y1gFYZqsLTQCeM8A3
+zDFBB7gNDqOej/sdzdC8LUY=
+=csuF
 -----END PGP SIGNATURE-----