Bug #329451: version bump. Bug #330287: setup for USE=gtk, but disable for now as USE=gtk does not even build for me, due to missing support.h. Bug #232190: include udev rules.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

6 files changed, 57 insertions, 49 deletions

diff --git a/app-crypt/trousers/ChangeLog b/app-crypt/trousers/ChangeLog
index 12a7b2f0edad..1f0bc65645b1 100644
--- a/app-crypt/trousers/ChangeLog
+++ b/app-crypt/trousers/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-crypt/trousers
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.25 2010/06/27 22:38:43 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.26 2010/08/06 01:22:57 robbat2 Exp $
+
+*trousers-0.3.6 (06 Aug 2010)
+
+  06 Aug 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +files/61-trousers.rules, -files/trousers-0.2.3-nouseradd.patch,
+  -trousers-0.3.2.1-r1.ebuild, trousers-0.3.5.ebuild,
+  +trousers-0.3.6.ebuild:
+  Bug #329451: version bump. Bug #330287: setup for USE=gtk, but disable for
+  now as USE=gtk does not even build for me, due to missing support.h. Bug
+  #232190: include udev rules.
 
 *trousers-0.3.5 (27 Jun 2010)
 
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index fed8f7d605c6..eca031d57afa 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -1,10 +1,10 @@
+AUX 61-trousers.rules 96 RMD160 eeee1bbc15cba6097716bb462a75ec42459bdd4f SHA1 cdedffb236cf30dd9930bdde5ae06abffc66e348 SHA256 8f25b51dca45b75caa85a00ef476fb40c09d6cc82e2351cb7af24ebc805dd949
 AUX tcsd.confd 372 RMD160 d265222136e80a0fe0cdb535abba0e07078f08c2 SHA1 05a81dc90a2df80b3c0ea7a8cefc3c59098aadd8 SHA256 5a1f9150ce0d8cc3e9e80971e073ee0b1db018ec3af6809087a7c626b9ffa327
 AUX tcsd.initd 958 RMD160 f90e6d4ec4d2dd0bd8218b3b2ef28328461d50b6 SHA1 34ab9b7cbf60e58b1f7b732891d30e053f2039a1 SHA256 388cef25be74c6263b9cb0e5de3bd08fbc0613e1a9fef958b006c571e4b691c8
-AUX trousers-0.2.3-nouseradd.patch 1008 RMD160 dc1d81d6ceaf18d8464c5d7418b6733fae5fb6ab SHA1 404467a26d2e736ac3853969678d47a881579aec SHA256 5fa359ba96ac0c3e6130af1c9269f26fb28551ac6c0b76a4796aa0dfb1ce6dc2
 AUX trousers-0.3.5-nouseradd.patch 439 RMD160 8c412e10335f896535718a51d94499abc854faf9 SHA1 539efce53bd2757f51a98c8bc1cdb020aac9ebdd SHA256 927040d4ef30657717a75318320330f12364a624e0ce6f0d2e6a25c53e5ba11b
-DIST trousers-0.3.2-1.tar.gz 1238691 RMD160 a8d59051fcf8b42f7a789b5719dfa88ad7cddf6d SHA1 0cec8b667e4d173ecf8f486e5dd62d3ff66f101e SHA256 27bb906cc06d29ead85ca95e7268401b914c2eac81663a7db0e241f1178a4ba4
 DIST trousers-0.3.5.tar.gz 1335262 RMD160 e242f79c410c8043e6f119ee44dd92766cdc3adf SHA1 8fee28572c4bc88f6e2bcd30a65b0788f93262c2 SHA256 9145db73d7080e86f1a990db4735715ea5f1eae4d47a1d43f775747a7ca580ad
-EBUILD trousers-0.3.2.1-r1.ebuild 2713 RMD160 df011e7bc831178e7d1b24a153df0512e50eded9 SHA1 ae3227c35bb547954c481d1b14f8b04a8c87c533 SHA256 70922b537a3d7c32895b0c01584e7fc82ccbc45e384e582657b42583f62c3bde
-EBUILD trousers-0.3.5.ebuild 2669 RMD160 807ba3ebb482f16f224251a8a5fa57554bdedb40 SHA1 7962b0053faa39f7365fb84c084e8d217ba8d3a0 SHA256 e9471178998fd3da1091ceeddc36cf6245454123ff5145f554bb7c50cc2d16e2
-MISC ChangeLog 5015 RMD160 1880c20f0654b17bd9224252db8a6dea94def631 SHA1 a56f15d3c9a94980fed0bf592f4741b4dddc97c3 SHA256 19c4e132fa3abfc6ecadb7fe878bd8d9a35b467f17d8078479f98e92b27bb4b1
+DIST trousers-0.3.6.tar.gz 1335084 RMD160 744b9ca1d64d64722b4ddcc8b7db95d11e284018 SHA1 1bb65fe1a031f9606d871562ead35fa5909ae584 SHA256 91025f60248af44df192e8df16fa6b0c0f1e48c54f6dc51626567ed95758b0d6
+EBUILD trousers-0.3.5.ebuild 2968 RMD160 6b6bd99ce95373fad3204b665c7b74a271e6f1ba SHA1 fbb26f42467fa4b530fbec4312c44fff84bda27f SHA256 edc18c6d8c2ccb628073b5fba98ab27cccf20bd60ecbfd74392883f78f64c347
+EBUILD trousers-0.3.6.ebuild 2970 RMD160 21c946649274c2789440baf0305da5c062d84da7 SHA1 f472be7f30089b3abf17b5359df556c2e94aa9b5 SHA256 0f268172d7db7c7cc82b1d43abf9678b12d5df55f783f0325aa24a6668e989cc
+MISC ChangeLog 5429 RMD160 215714beca80f54d78f613bdc4e7b0c0b97ce90f SHA1 471c128b6e82d9981899e9b62d8472dadd1e04a1 SHA256 2eca46220a6fbba82f39141003041def55a26a08c23169b43c2f5f6afeea5594
 MISC metadata.xml 251 RMD160 9c13ff790c7419d4e0d2d370036b7f4e4594ea4f SHA1 563aa19984b291a6cade6d6487dbf4a2a17e6874 SHA256 1739a4e8833a2a5b9501182eb830cbd3e26014ccef5e9ae1b4d7a0686c665c1b
diff --git a/app-crypt/trousers/files/61-trousers.rules b/app-crypt/trousers/files/61-trousers.rules
new file mode 100644
index 000000000000..20e89cbe3acd
--- /dev/null
+++ b/app-crypt/trousers/files/61-trousers.rules
@@ -0,0 +1,2 @@
+KERNEL=="tpm[0-9]*", MODE="0660", OWNER="tss", GROUP="tss", SYMLINK+="tpm"
+# vim: ft=udevrules:
diff --git a/app-crypt/trousers/files/trousers-0.2.3-nouseradd.patch b/app-crypt/trousers/files/trousers-0.2.3-nouseradd.patch
deleted file mode 100644
index 3b44ed320111..000000000000
--- a/app-crypt/trousers/files/trousers-0.2.3-nouseradd.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- dist/Makefile.am.orig	2005-07-30 19:33:46.000000000 +1000
-+++ dist/Makefile.am	2005-07-30 19:34:09.000000000 +1000
-@@ -9,8 +9,6 @@
- 	/bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf
- 
- install-exec-hook:
--	/usr/sbin/groupadd tss || true
--	/usr/sbin/useradd -r tss -g tss || true
- 	/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
---- dist/Makefile.in.orig	2005-07-30 19:33:52.000000000 +1000
-+++ dist/Makefile.in	2005-07-30 19:34:22.000000000 +1000
-@@ -369,8 +369,6 @@
- 	/bin/chmod 0600 ${DESTDIR}/@sysconfdir@/tcsd.conf
- 
- install-exec-hook:
--	/usr/sbin/groupadd tss || true
--	/usr/sbin/useradd -r tss -g tss || true
- 	/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
diff --git a/app-crypt/trousers/trousers-0.3.5.ebuild b/app-crypt/trousers/trousers-0.3.5.ebuild
index 67364ebd4306..104ad5494b68 100644
--- a/app-crypt/trousers/trousers-0.3.5.ebuild
+++ b/app-crypt/trousers/trousers-0.3.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.5.ebuild,v 1.1 2010/06/27 22:38:43 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.5.ebuild,v 1.2 2010/08/06 01:22:57 robbat2 Exp $
 
 EAPI="3"
 
@@ -14,10 +14,12 @@ SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="doc" # gtk
+
+# gtk support presently does NOT compile.
+#	gtk? ( >=x11-libs/gtk+-2 )
 
 RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
 	>=dev-libs/openssl-0.9.7"
 
 DEPEND="${RDEPEND}
@@ -67,12 +69,17 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-nouseradd.patch"
+	epatch "${FILESDIR}/${PN}-0.3.5-nouseradd.patch"
 
 	sed -e "s/ -Werror//" -i configure.in
 	eautoreconf
 }
 
+src_configure() {
+	#econf --with-gui=$(usev gtk || echo openssl) || die "econf failed"
+	econf --with-gui=openssl || die "econf failed"
+}
+
 src_install() {
 	keepdir /var/lib/tpm
 	make DESTDIR="${D}" install || die
@@ -80,6 +87,9 @@ src_install() {
 	use doc && dodoc doc/*
 	newinitd "${FILESDIR}/tcsd.initd" tcsd
 	newconfd "${FILESDIR}/tcsd.confd" tcsd
+	insinto /etc/udev/rules.d
+	doins "${FILESDIR}"/61-trousers.rules
+	fowners tss:tss /var/lib/tpm
 }
 
 pkg_postinst() {
diff --git a/app-crypt/trousers/trousers-0.3.2.1-r1.ebuild b/app-crypt/trousers/trousers-0.3.6.ebuild
index f45d7202659a..15452dc7b8bd 100644
--- a/app-crypt/trousers/trousers-0.3.2.1-r1.ebuild
+++ b/app-crypt/trousers/trousers-0.3.6.ebuild
@@ -1,31 +1,31 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.2.1-r1.ebuild,v 1.1 2009/09/06 22:50:29 ikelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.6.ebuild,v 1.1 2010/08/06 01:22:57 robbat2 Exp $
 
-EAPI="2"
+EAPI="3"
 
-inherit autotools base eutils linux-info
+inherit autotools eutils linux-info
 
-MY_P="${PN}-${PV%.*}-${PV##*.}"
+#MY_P="${PN}-${PV%.*}-${PV##*.}"
 
 DESCRIPTION="An open-source TCG Software Stack (TSS) v1.1 implementation"
 HOMEPAGE="http://trousers.sf.net"
-SRC_URI="mirror://sourceforge/trousers/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="doc" # gtk
+
+# gtk support presently does NOT compile.
+#	gtk? ( >=x11-libs/gtk+-2 )
 
 RDEPEND=">=dev-libs/glib-2
-	>=x11-libs/gtk+-2
 	>=dev-libs/openssl-0.9.7"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(	"${FILESDIR}/${PN}-0.2.3-nouseradd.patch" )
+# S="${WORKDIR}/${P}git"
 
 pkg_setup() {
 	# Check for driver (not sure it can be an rdep, because ot depends on the
@@ -39,16 +39,16 @@ pkg_setup() {
 		ewarn "No kernel configuration could be found."
 	fi
 	has_version app-crypt/tpm-emulator && tpm_module="yes"
-	if [[ -n "${tpm_kernel_present}" ]] ; then
+	if [[ -n "${tpm_kernel_present}" ]]; then
 		einfo "Good, you seem to have in-kernel TPM support."
-	elif [[ -n "${tpm_module}" ]] ; then
+	elif [[ -n "${tpm_module}" ]]; then
 		einfo "Good, you seem to have TPM support with the external module."
-		if [[ -n "${tpm_kernel_version}" ]] ; then
+		if [[ -n "${tpm_kernel_version}" ]]; then
 			elog
 			elog "Note that since you have a >=2.6.12 kernel, you could use"
 			elog "the in-kernel driver instead of (CONFIG_TCG_TPM)."
 		fi
-	elif [[ -n "${tpm_kernel_version}" ]] ; then
+	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,"
@@ -69,12 +69,17 @@ pkg_setup() {
 }
 
 src_prepare() {
-	base_src_prepare
+	epatch "${FILESDIR}/${PN}-0.3.5-nouseradd.patch"
 
-	sed -e "s/-Werror //" -i configure.in
+	sed -e "s/ -Werror//" -i configure.in
 	eautoreconf
 }
 
+src_configure() {
+	#econf --with-gui=$(usev gtk || echo openssl) || die "econf failed"
+	econf --with-gui=openssl || die "econf failed"
+}
+
 src_install() {
 	keepdir /var/lib/tpm
 	make DESTDIR="${D}" install || die
@@ -82,6 +87,9 @@ src_install() {
 	use doc && dodoc doc/*
 	newinitd "${FILESDIR}/tcsd.initd" tcsd
 	newconfd "${FILESDIR}/tcsd.confd" tcsd
+	insinto /etc/udev/rules.d
+	doins "${FILESDIR}"/61-trousers.rules
+	fowners tss:tss /var/lib/tpm
 }
 
 pkg_postinst() {