4 files changed, 104 insertions, 2 deletions
diff --git a/sys-apps/tcb/ChangeLog b/sys-apps/tcb/ChangeLog
index 169416fd6a63..9e4fcdd0fccf 100644
--- a/sys-apps/tcb/ChangeLog
+++ b/sys-apps/tcb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/tcb
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/ChangeLog,v 1.10 2006/04/27 22:41:53 antarus Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/ChangeLog,v 1.11 2007/01/12 03:13:39 vapier Exp $
+
+*tcb-1.0-r1 (12 Jan 2007)
+
+  12 Jan 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/tcb-1.0-build.patch, +tcb-1.0-r1.ebuild:
+  Cleanup build #161554 and #161556 by ph.
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org> files/digest-tcb-0.9.8.7,
   Manifest:
diff --git a/sys-apps/tcb/files/digest-tcb-1.0-r1 b/sys-apps/tcb/files/digest-tcb-1.0-r1
new file mode 100644
index 000000000000..a7f35493a23c
--- /dev/null
+++ b/sys-apps/tcb/files/digest-tcb-1.0-r1
@@ -0,0 +1,3 @@
+MD5 9cf36b80cafdae41e644000a6e3b88fc tcb-1.0.tar.gz 40355
+RMD160 1dbe92cbc583f66b687526ced87c6ab03d8dadbf tcb-1.0.tar.gz 40355
+SHA256 6565f076f72bc709b5eece037e9c45f0a0f60530e9213dda3ddbb14416bdfbaa tcb-1.0.tar.gz 40355
diff --git a/sys-apps/tcb/files/tcb-1.0-build.patch b/sys-apps/tcb/files/tcb-1.0-build.patch
new file mode 100644
index 000000000000..07082f6022dd
--- /dev/null
+++ b/sys-apps/tcb/files/tcb-1.0-build.patch
@@ -0,0 +1,53 @@
+--- tcb-1.0/libs/Makefile
++++ tcb-1.0/libs/Makefile
+@@ -17,13 +17,13 @@
+ 	$(CC) $(CFLAGS) $(DBGFLAG) -c $< -o $@
+ 
+ $(LIBTCB_LONG): libtcb.o $(LIB_MAP)
+-	$(CC) $(DBGFLAG) -shared -o $@ -Wl,-soname,$(LIBTCB) \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(DBGFLAG) -shared -o $@ -Wl,-soname,$(LIBTCB) \
+ 		-Wl,--version-script=$(LIB_MAP) $< -lc
+ 	ln -sf $@ $(LIBTCB)
+ 	ln -sf $(LIBTCB) libtcb.so
+ 
+ $(LIBNSS): nss.o $(NSS_MAP) $(LIBTCB_LONG)
+-	$(CC) $(DBGFLAG) -shared -o $@ -Wl,--version-script=$(NSS_MAP) \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(DBGFLAG) -shared -o $@ -Wl,-soname,$@ -Wl,--version-script=$(NSS_MAP) \
+ 		$< -L. $(LIBNSL) -ltcb
+ 
+ .c.o:
+--- tcb-1.0/Make.defs
++++ tcb-1.0/Make.defs
+@@ -8,9 +8,9 @@
+ LDFLAGS += $(DBGFLAG) -L../libs
+ 
+ SBINDIR = /sbin
+-SLIBDIR = /lib
+-LIBDIR = /usr/lib
+-LIBEXECDIR = /usr/libexec
+-MANDIR = /usr/man
++SLIBDIR = /@GENTOO_LIBDIR@
++LIBDIR = /usr/@GENTOO_LIBDIR@
++LIBEXECDIR = $(LIBDIR)/misc
++MANDIR = /usr/share/man
+ 
+ SHLIBMODE = 755
+--- tcb-1.0/progs/Makefile
++++ tcb-1.0/progs/Makefile
+@@ -7,13 +7,13 @@
+ all: $(CONVERT) $(UNCONVERT) $(CHKPWD)
+ 
+ $(CONVERT): $(CONVERT).o
+-	$(CC) -o $@ $<
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
+ 
+ $(UNCONVERT): $(UNCONVERT).o
+-	$(CC) -o $@ $< -L../libs -ltcb
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L../libs -ltcb
+ 
+ $(CHKPWD): $(CHKPWD).o
+-	$(CC) -o $@ $< -lcrypt
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -lcrypt
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -c $< -o $@
diff --git a/sys-apps/tcb/tcb-1.0-r1.ebuild b/sys-apps/tcb/tcb-1.0-r1.ebuild
new file mode 100644
index 000000000000..ac52ef1247fe
--- /dev/null
+++ b/sys-apps/tcb/tcb-1.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/tcb/tcb-1.0-r1.ebuild,v 1.1 2007/01/12 03:13:39 vapier Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="Libraries and tools implementing the tcb password shadowing scheme"
+HOMEPAGE="http://www.openwall.com/tcb/"
+SRC_URI="ftp://ftp.openwall.com/pub/projects/tcb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="pam"
+
+DEPEND="pam? ( >=sys-libs/pam-0.75 )"
+
+pkg_setup() {
+	for group in auth chkpwd shadow ; do
+		enewgroup ${group}
+	done
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-build.patch
+	sed -i "s:@GENTOO_LIBDIR@:$(get_libdir):" Make.defs
+	use pam || sed -i '/pam/d' Makefile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog
+}
+
+pkg_postinst() {
+	einfo "You must now run /sbin/tcb_convert to convert your shadow to tcb"
+	einfo "To remove this you must first run /sbin/tcp_unconvert and then unmerge"
+}