version bump. remove old versions - inspiried by bug #105799

(Portage version: 2.0.52-r1)

9 files changed, 63 insertions, 116 deletions

diff --git a/app-crypt/trousers/ChangeLog b/app-crypt/trousers/ChangeLog
index ede455d26c4d..c8ea9176529c 100644
--- a/app-crypt/trousers/ChangeLog
+++ b/app-crypt/trousers/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/trousers
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.7 2005/08/23 21:46:35 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.8 2005/09/17 13:39:17 dragonheart Exp $
+
+*trousers-0.2.3 (17 Sep 2005)
+
+  17 Sep 2005; Daniel Black <dragonheart@gentoo.org>
+  -files/trousers-0.2.0-nouseradd.patch, +files/trousers-0.2.3-ldadd.patch,
+  +files/trousers-0.2.3-nouseradd.patch, -trousers-0.1.11-r1.ebuild,
+  -trousers-0.2.0.ebuild, +trousers-0.2.3.ebuild:
+  version bump. remove old versions - inspiried by bug #105799 thanks to Felix
+  Dorner
 
   23 Aug 2005; Daniel Black <dragonheart@gentoo.org>
   trousers-0.1.11-r1.ebuild, trousers-0.2.0.ebuild, trousers-0.2.1.ebuild:
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 826123212f9e..589429382d9f 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -1,22 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 2aca9dfedba0376e48f7bd528d51c8a3 trousers-0.2.0.ebuild 2504
+MD5 58b764d515345103c9d04313c4c33f91 trousers-0.2.3.ebuild 2543
 MD5 2603eeeb20b24caddac3e9ce6996f357 metadata.xml 251
-MD5 37f07e51ecf22076ad90a57746bfbc8e ChangeLog 1597
 MD5 96f009653b9a482b8a1f7378693908a0 trousers-0.2.1.ebuild 2504
-MD5 a222f65b878fa62ea7f585be41721984 trousers-0.1.11-r1.ebuild 2607
-MD5 22f51c734f799c5519585dfd17183633 files/digest-trousers-0.2.0 67
-MD5 d1b7e938c45e716e4e813560e0394388 files/trousers-0.2.0-nouseradd.patch 1220
+MD5 ebde957ee4c398befad5766810be29b0 files/digest-trousers-0.2.3 67
 MD5 05e27e046284f46a7da59bf3dbbdddf0 files/tcsd.confd 372
 MD5 edcaf716f7fc47ab4eeb301291a53fb4 files/tcsd.initd 958
 MD5 1973b3178958981f8002711e433d4a39 files/digest-trousers-0.2.1 67
-MD5 a0c59b3b9088b1773498e993ccdad67c files/digest-trousers-0.1.11-r1 68
+MD5 9c23455efed7516635345b411ff20496 files/trousers-0.2.3-ldadd.patch 1280
 MD5 4b7644dcacf663d68866ec1580d4de57 files/trousers-0.2.1-nouseradd.patch 988
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDC5lJmdTrptrqvGERAkYZAJ0dbzqNzC0a6QWnhIsekC9IJ6g7LACeMAmK
-YNGwof4jmGP5Z2kcVm2VcyI=
-=Aysb
------END PGP SIGNATURE-----
+MD5 4b7644dcacf663d68866ec1580d4de57 files/trousers-0.2.3-nouseradd.patch 988
diff --git a/app-crypt/trousers/files/digest-trousers-0.1.11-r1 b/app-crypt/trousers/files/digest-trousers-0.1.11-r1
deleted file mode 100644
index 091d9b2bdf23..000000000000
--- a/app-crypt/trousers/files/digest-trousers-0.1.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b3687784a2070a18ba27a91318261d93 trousers-0.1.11.tar.gz 1349939
diff --git a/app-crypt/trousers/files/digest-trousers-0.2.0 b/app-crypt/trousers/files/digest-trousers-0.2.0
deleted file mode 100644
index 53a59af91559..000000000000
--- a/app-crypt/trousers/files/digest-trousers-0.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 35c97c7cd8df050e1b4afaa7f8de6930 trousers-0.2.0.tar.gz 1363030
diff --git a/app-crypt/trousers/files/digest-trousers-0.2.3 b/app-crypt/trousers/files/digest-trousers-0.2.3
new file mode 100644
index 000000000000..216c6970b39b
--- /dev/null
+++ b/app-crypt/trousers/files/digest-trousers-0.2.3
@@ -0,0 +1 @@
+MD5 1e7a5e4c0026ca75700ea7eb896bd44c trousers-0.2.3.tar.gz 1407974
diff --git a/app-crypt/trousers/files/trousers-0.2.3-ldadd.patch b/app-crypt/trousers/files/trousers-0.2.3-ldadd.patch
new file mode 100644
index 000000000000..720e1ce73536
--- /dev/null
+++ b/app-crypt/trousers/files/trousers-0.2.3-ldadd.patch
@@ -0,0 +1,37 @@
+--- ./tools/Makefile.am.orig	2005-09-17 21:33:18.000000000 +1000
++++ ./tools/Makefile.am	2005-09-17 21:34:16.000000000 +1000
+@@ -1,9 +1,9 @@
+ noinst_PROGRAMS=ps_inspect ps_convert
+ 
+ ps_inspect_SOURCES=ps_inspect.c
+-ps_inspect_LDFLAGS=-L../src/tspi -ltspi
++ps_inspect_LDADD=../src/tspi/libtspi.la
+ ps_inspect_CFLAGS=-I../src/include
+ 
+ ps_convert_SOURCES=ps_convert.c
+-ps_convert_LDFLAGS=-L../src/tspi -ltspi
++ps_convert_LDADD=../src/tspi/libtspi.la
+ ps_convert_CFLAGS=-I../src/include
+--- src/trspi/Makefile.am.orig	2005-09-17 22:45:56.000000000 +1000
++++ src/trspi/Makefile.am	2005-09-17 22:46:48.000000000 +1000
+@@ -1,7 +1,7 @@
+-noinst_LIBRARIES=libtrousers.a
++noinst_LTLIBRARIES=libtrousers.la
+ 
+-libtrousers_a_SOURCES=trousers.c crypto/@CRYPTO_PACKAGE@/crypto.c
+-libtrousers_a_CFLAGS=-DAPPID=\"TSPI\"
++libtrousers_la_SOURCES=trousers.c crypto/@CRYPTO_PACKAGE@/crypto.c
++libtrousers_la_CFLAGS=-DAPPID=\"TSPI\"
+ 
+ clean:
+ 	rm -f libtrousers.a *.o crypto/*/*.o
+--- src/tspi/Makefile.am.orig	2005-09-17 22:47:14.000000000 +1000
++++ src/tspi/Makefile.am	2005-09-17 22:48:13.000000000 +1000
+@@ -1,6 +1,6 @@
+ lib_LTLIBRARIES=libtspi.la
+ 
+-libtspi_la_LIBADD=../trspi/libtrousers.a
++libtspi_la_LIBADD=../trspi/libtrousers.la
+ 
+ # On setting -version-info, from the libtool manual:
+ #
diff --git a/app-crypt/trousers/files/trousers-0.2.0-nouseradd.patch b/app-crypt/trousers/files/trousers-0.2.3-nouseradd.patch
index 05455ff306e9..27d71151e074 100644
--- a/app-crypt/trousers/files/trousers-0.2.0-nouseradd.patch
+++ b/app-crypt/trousers/files/trousers-0.2.3-nouseradd.patch
@@ -1,12 +1,6 @@
---- Makefile.in.orig	2005-07-06 18:20:07.000000000 +1000
-+++ Makefile.in	2005-07-06 18:23:05.000000000 +1000
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.8.3 from Makefile.am.
-+# Makefile.in generated by automake 1.8.5 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -357,8 +357,6 @@
+--- Makefile.am.orig	2005-07-30 19:33:46.000000000 +1000
++++ Makefile.am	2005-07-30 19:34:09.000000000 +1000
+@@ -9,8 +9,6 @@
  	/bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf
  
  install-exec-hook:
@@ -15,9 +9,9 @@
  	/bin/chown tss:tss ${DESTDIR}/@sbindir@/tcsd
  	/bin/sh -c 'if [ ! -e ${DESTDIR}/@localstatedir@/lib/tpm ];then mkdir -p ${DESTDIR}/@localstatedir@/lib/tpm; fi'
  	/bin/chown tss:tss ${DESTDIR}/@localstatedir@/lib/tpm
---- Makefile.am.orig	2005-07-06 18:20:02.000000000 +1000
-+++ Makefile.am	2005-07-06 18:20:39.000000000 +1000
-@@ -9,8 +9,6 @@
+--- Makefile.in.orig	2005-07-30 19:33:52.000000000 +1000
++++ Makefile.in	2005-07-30 19:34:22.000000000 +1000
+@@ -369,8 +369,6 @@
  	/bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf
  
  install-exec-hook:
diff --git a/app-crypt/trousers/trousers-0.1.11-r1.ebuild b/app-crypt/trousers/trousers-0.1.11-r1.ebuild
deleted file mode 100644
index 0bff90a7275c..000000000000
--- a/app-crypt/trousers/trousers-0.1.11-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.1.11-r1.ebuild,v 1.3 2005/08/23 21:46:35 dragonheart Exp $
-
-inherit eutils linux-info
-
-DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
-HOMEPAGE="http://trousers.sf.net"
-SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc"
-
-RDEPEND="virtual/libc
-	>=dev-libs/glib-2
-	dev-libs/atk
-	x11-libs/pango
-	>=x11-libs/gtk+-2
-	>=dev-libs/openssl-0.9.7"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	# Check for driver (not sure it can be an rdep, because ot depends on the
-	# version of virtual/linux-sources... Is that supported by portage?)
-	linux-info_pkg_setup
-	local tpm_kernel_version tpm_kernel_present tpm_module
-	kernel_is ge 2 6 12 && tpm_kernel_version="yes"
-	linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
-	has_version app-crypt/tpm-module && tpm_module="yes"
-	if [ -n "${tpm_kernel_present}" ] ; then
-		einfo "Good, you seem to have in-kernel TPM support."
-	elif [ -n "${tpm_module}" ] ; then
-		einfo "Good, you seem to have TPM support with the external module."
-		if [ -n "${tpm_kernel_version}" ] ; then
-			einfo
-			einfo "Note that since you have a >=2.6.12 kernel, you could use"
-			einfo "the in-kernel driver instead (CONFIG_TCG_TPM)."
-		fi
-	elif [ -n "${tpm_kernel_version}" ] ; then
-		eerror
-		eerror "To use this package, you will have to activate TPM support"
-		eerror "in your kernel configuration. That's at least CONFIG_TCG_TPM,"
-		eerror "plus probably a chip specific driver (like CONFIG_TCG_ATMEL)."
-		eerror
-	else
-		eerror
-		eerror "To use this package, you should install a TPM driver."
-		eerror "You can have the following options:"
-		eerror "  - install app-crypt/tpm-module"
-		eerror "  - install app-crypt/tpm-emulator"
-		eerror "  - switch to a >=2.6.12 kernel and compile the kernel module"
-		eerror
-	fi
-
-	# New user/group for the daemon
-	enewgroup tss
-	enewuser tss -1 -1 /var/lib/tpm tss
-}
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e 's:@localstatedir@/tpm:@localstatedir@/lib/tpm:' \
-		"${S}/dist/tcsd.conf.in"
-}
-
-src_install() {
-	keepdir /var/lib/tpm
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog NICETOHAVES README TODO
-	if use doc ; then
-		insinto /usr/share/doc/${PF}
-		doins doc/*
-	fi
-	newinitd "${FILESDIR}/tcsd.initd" tcsd
-	newconfd "${FILESDIR}/tcsd.confd" tcsd
-	into /etc/udev/rules.d/
-	echo 'KERNEL="tpm*", OWNER="tss", GROUP="tss", MODE="0600"' > ${D}/etc/udev/rules.d/30-tpm.rules
-}
diff --git a/app-crypt/trousers/trousers-0.2.0.ebuild b/app-crypt/trousers/trousers-0.2.3.ebuild
index 69d182ddbc2d..3f866d299d5d 100644
--- a/app-crypt/trousers/trousers-0.2.0.ebuild
+++ b/app-crypt/trousers/trousers-0.2.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.2.0.ebuild,v 1.2 2005/08/23 21:46:35 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.2.3.ebuild,v 1.1 2005/09/17 13:39:17 dragonheart Exp $
 
-inherit eutils linux-info
+inherit eutils linux-info autotools
 
 DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
 HOMEPAGE="http://trousers.sf.net"
@@ -14,8 +14,6 @@ IUSE="doc"
 
 RDEPEND="virtual/libc
 	>=dev-libs/glib-2
-	dev-libs/atk
-	x11-libs/pango
 	>=x11-libs/gtk+-2
 	>=dev-libs/openssl-0.9.7"
 
@@ -65,6 +63,9 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}/dist
 	epatch ${FILESDIR}/${P}-nouseradd.patch
+	cd ${S}
+	epatch ${FILESDIR}/${P}-ldadd.patch
+	eautoreconf
 }
 
 src_install() {