cleanup

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xBF20DC51

4 files changed, 10 insertions, 218 deletions

diff --git a/app-crypt/trousers/ChangeLog b/app-crypt/trousers/ChangeLog
index 9debafbd6932..544f6b05df37 100644
--- a/app-crypt/trousers/ChangeLog
+++ b/app-crypt/trousers/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/trousers
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.47 2014/07/04 15:05:39 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/ChangeLog,v 1.48 2014/07/15 11:40:40 alonbl Exp $
+
+  15 Jul 2014; Alon Bar-Lev <alonbl@gentoo.org> -trousers-0.3.6-r1.ebuild,
+  -trousers-0.3.6.ebuild:
+  cleanup
 
   04 Jul 2014; Sven Vermeulen <swift@gentoo.org> trousers-0.3.10-r1.ebuild,
   trousers-0.3.10.ebuild, trousers-0.3.6-r1.ebuild, trousers-0.3.6.ebuild:
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index 5b0deb6b4eb3..da41662e82b6 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -7,27 +7,14 @@ AUX tcsd.initd 954 SHA256 c3944c51317c8e1a3019ec062f091cdb2e11b974852a22e0fb8f0e
 AUX tcsd.service 131 SHA256 704dbb2b06a3e357fe2363d2cc88632ccd18dcdf14dc7640cd67272df5a52ade SHA512 e516bde8ce45fe4ad687aaaabae475da9c20a9fbd8ebee736d09ceb6efa597efb6f3bb99840a4c0d2c9eb77c2824df6ee45985b46dc8cf924b4eed67eeec1468 WHIRLPOOL 851f6ef31d93a7fd119cc4bc70c28410539fb572158e8238b72ea177e5a75e2a48382807ac14203eb48a21e5432c5c0c35cf25619557d9ba741328f3f79ebfc0
 AUX trousers-0.3.5-nouseradd.patch 439 SHA256 927040d4ef30657717a75318320330f12364a624e0ce6f0d2e6a25c53e5ba11b SHA512 d5f218fb2cd50e81eed2fc3fb48c613f33e17be9be39368e6d0aef5cd2237ef4505736bebc00b30e3133cab81ac2551edbdb8d83aaab0614cbc1747b34bff806 WHIRLPOOL eb01c789159dab0b662065ce155e27f7dbbb5bf5a41c470598be08dcb41fafd77c242c77618f2c118d943b716dea95934bed19c7fd5634442a9b17bd74a943dd
 DIST trousers-0.3.10.tar.gz 1658652 SHA256 eb9569de5c66d9698f6c3303de03777b95ec72827f68b7744454bfa9227bc530 SHA512 1835246f846d20bc1b2731d68440a9ca45865fcd52ad847d95485e4b126fae8bec09feaad559c27d83e243d92b8adc3a67934bff2034b318df075842fe9df4f0 WHIRLPOOL 7a27ef57b0038178cbf384c9fdec2d2e3e58dbeb5e5bc1503d2a7058a8312df54fa72b87968554631e4b5e483ae5e8c5e0a2367346bf3ae001b523a507ceff40
-DIST trousers-0.3.6.tar.gz 1335084 SHA256 91025f60248af44df192e8df16fa6b0c0f1e48c54f6dc51626567ed95758b0d6 SHA512 a9eba2f8e06b163c29e2e9079e62240d96dc630d12fbe61aa0c6b2bc93f88d7f528ae0cabae1de82aba9676e91c2c338da2ce1690bbf21b768af803f7cdff6c3 WHIRLPOOL b13e46f3e2f95bd28a4ad3f7686638709d2484b56ac96f98823f56aafd1be852275a1831ae82a1b11b4eb3e4e9ad051012e59368425374b918e41ecf41d70f01
 EBUILD trousers-0.3.10-r1.ebuild 3096 SHA256 1672cf72cca0fdba7dbc16b7f3e3390dcc8de2702f77a4de30af8acf2bb9efb9 SHA512 11913de46b3095bfc29fe942720606e357bf8404ec7710243dcec5082513b5891d899761d83b45f3bc09794dcf5a83bf369a8da6ae22a0a8b322ca08be2409ee WHIRLPOOL 765b1de56c0f1163bd30a06c49b91ce16a4b90d7d13411468252003425071f1cb6833d511958de131e6a0aea664ecc98b1277d74b5f548eed7e29aedf462be68
 EBUILD trousers-0.3.10.ebuild 3019 SHA256 311b5bd36d60c3eb1d7163f1cea6b613e70015542ced3b8ae3a44e63e42c9722 SHA512 0f0c948762aa62aa061d0b636a21d3c93f64be26273415eadea2dfb6f00e1b5f9463ef73c3dd76ccf5b411fc514652bf2b6d5a4b2bcf6b7e195b2d63a8f2a972 WHIRLPOOL 9837c65d8bf8bd0b8be256d19bbe284bd7bb733a075fdd137608cfba2e5e4b9460cd9f5a4c612e4e263a8970976f9ec8a07c2022ab1ce2ceba580ac605710949
-EBUILD trousers-0.3.6-r1.ebuild 3061 SHA256 30745e91b6c14780e3ba93a669209431de11280659e7c82fb12c409e76d2385e SHA512 3f7ad1f3082fc49fee0f43bc215cba8c76d720a86e24268a64144fe71564c7e35941ff544b4fd6e0ca088431991c543118e22bcca271d39eb2805e49d8acccbf WHIRLPOOL f56dad18bf94f0175b191fa9307b789ede2bb4c844a4f46038d4be425ffa47c8bb7d623fcc1304b16af54a193b916123717b70acfc9c7f98e789a3207e8706db
-EBUILD trousers-0.3.6.ebuild 3020 SHA256 07f965173fc3db879177efa72d43cff4506bc2f994a0bff122d5fe139a213a74 SHA512 ef4298b7edbbdea67266e5b7d7951fb5e87c2ea56b36deac5347689c1f30636e50844d13da0e1bddca90acd763de9d45efd7eea1392dce379888f19027ae681c WHIRLPOOL aea5c2a0b49ae53b33680ce98a4c9ad0b85f71cf664d83b503ec04896f175a4ca0872ea061b9162975c5cdfe3e6707d4693d801415da1dc0cf3272e27ab2add2
-MISC ChangeLog 8330 SHA256 67e8e39dc6f865348c4630418dbafcd9e179ae2a9f52d5253d1e06d4b3613627 SHA512 556bdd37180845d8ac2cef307f6d6003f6e1e0fb2e0fb6f20cd8849d021a7450849868c6080e42ea34d2fe5b70a9b0f3dacba11d6f4633cd9d6bdf76e87637d6 WHIRLPOOL 02f428d914a8b9d27481dc81206107a4d5db42462fc638e32d1c9010247d7a1e539e8f39d4f5c020007f52fc1fbb26da3eab14cd2244b8ea9c0c0b09780ad75f
+MISC ChangeLog 8443 SHA256 eccaee2e8c16e5e8174e2d59217d5d532f827b087a20bf0a74d767a6f25cc32c SHA512 449f4cdf1e97e83c6e7222bc0f607b82f6858f75ce39e7d02474ae6ac38bbcae9e772ee28ac828ec04fea299afb176650f3af388fefd9ffe9f48ee0278beaf8d WHIRLPOOL c985eee2c58a0fe43bfc39a9d03239e6d5517a505482da2b9abf271ba3d98188f77b349561d313da61f3afc3b1221f9818c2af5f100777c9b1bf69e946e0772a
 MISC metadata.xml 241 SHA256 e2bdcf9828d343566ed4718acd860b34d38c2b7a86656d4fc1a7d819889fbf91 SHA512 99e8603796d9d6d5fe9b9ddd4d3c468a77d706a665df2cd75db5e96630dd2a8866f85cab017fa3ed87d230b87d8546176e624835e64d101accc7d9dc10b95593 WHIRLPOOL 23d89eb8ee02379cc1b46ed4efc25eeb153e0dca6c59993e6806e9a281c0c85405fd30c00877c5e35d87216eb9ed504fc996972dd71dec2889ea5e2880b15572
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTtsKSAAoJEC7dUkA7aK9HCqYP/Rva+nLR+szq1VnS0lzMvgu1
-hVFTs6RvH+nEvTcVds7PsxlyRLZr8xDlSrooOvUueG5G4CE8FtV18PVKNk/gw9Yj
-EA1KcD3ip1TFiv1Cu1dB86TnNPGpTns2NXc5m3NlKAvTLZMQszrm1kN3mP4gedB9
-OF9t42TD/Q9PfFz5l14v0ywBLX+L6FLf/C8jPVAhorofO2h6WYS1MiyAax+Kn+0g
-aYurjLSzPbka40kaRVdXT2YtUCCRxlS/RRzqb0B0xCTK8fvs/iXA9WhRRiVmhuXg
-AyYRF06UFdMHNGMLqiAQe+FTU1MBdsbjVTIIvByVzjHfK9VHVxBeKtyevHzpzubg
-8trOMvPaHbnYaGIjaaPbSxQA3Go1EJZImmGmwJochmUQ4ek+9bnZqAIxq4Wb0YHJ
-YzIZGcMjWNbwH+ryQmhKg110VPysin1FThN53+U6rA6Iwkyh7uEyUJWV+jtmbEpk
-7b7LSWiZ2ksiHUOTgpDuxkOkqXMh/JXal6FTKPhjEf5VdOpaeLhvJljmKfkOSgsx
-k1/DvKDil03RQQPRsqX+EPJ3eS01F6hQG4ZsVkWHY1p8G4wDpxQn+uulra6K/Y3v
-3E/1Y77BojRNmdeRZzcI/+ix2Po+dHlJlmy7J21D7LAos7e42PncHN2rtbYiqzZU
-JOmZ8goNAzbTzSGBBgNF
-=2mqK
+iF4EAREIAAYFAlPFE0oACgkQXYk9GL8g3FH2YAD/UP12pV1ICvUP7mWckpDwtiGQ
+m12/h41iNXmNGbO7k1QA+gKllP/9+2sbYUJmW/79N06h9jMQ8ZnadjsqFdXHeVQF
+=sFi7
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/trousers/trousers-0.3.6-r1.ebuild b/app-crypt/trousers/trousers-0.3.6-r1.ebuild
deleted file mode 100644
index 61d09040576e..000000000000
--- a/app-crypt/trousers/trousers-0.3.6-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.6-r1.ebuild,v 1.5 2014/07/04 15:05:39 swift Exp $
-
-EAPI="3"
-
-inherit autotools eutils linux-info user udev toolchain-funcs
-
-#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/${P}.tar.gz"
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc selinux" # gtk
-
-# gtk support presently does NOT compile.
-#	gtk? ( >=x11-libs/gtk+-2 )
-
-RDEPEND=">=dev-libs/glib-2
-	>=dev-libs/openssl-0.9.7:0
-	selinux? ( sec-policy/selinux-tcsd )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# S="${WORKDIR}/${P}git"
-
-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"
-	if linux_config_exists; then
-		linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
-	else
-		ewarn "No kernel configuration could be found."
-	fi
-	has_version app-crypt/tpm-emulator && 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
-			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
-		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-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_prepare() {
-	epatch "${FILESDIR}/${PN}-0.3.5-nouseradd.patch"
-
-	sed -i -r \
-		-e '/CFLAGS/s/ -(Werror|m64)//' \
-		configure.in || die
-	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
-	dodoc AUTHORS ChangeLog NICETOHAVES README TODO
-	use doc && dodoc doc/*
-	newinitd "${FILESDIR}/tcsd.initd" tcsd
-	newconfd "${FILESDIR}/tcsd.confd" tcsd
-	udev_dorules "${FILESDIR}"/61-trousers.rules
-	fowners tss:tss /var/lib/tpm
-}
-
-pkg_postinst() {
-	elog "If you have problems starting tcsd, please check permissions and"
-	elog "ownership on /dev/tpm* and ~tss/system.data"
-}
diff --git a/app-crypt/trousers/trousers-0.3.6.ebuild b/app-crypt/trousers/trousers-0.3.6.ebuild
deleted file mode 100644
index 50fac1709ae5..000000000000
--- a/app-crypt/trousers/trousers-0.3.6.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/trousers/trousers-0.3.6.ebuild,v 1.7 2014/07/04 15:05:39 swift Exp $
-
-EAPI="3"
-
-inherit autotools eutils linux-info user
-
-#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/${P}.tar.gz"
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="doc selinux" # gtk
-
-# gtk support presently does NOT compile.
-#	gtk? ( >=x11-libs/gtk+-2 )
-
-RDEPEND=">=dev-libs/glib-2
-	>=dev-libs/openssl-0.9.7
-	selinux? ( sec-policy/selinux-tcsd )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-# S="${WORKDIR}/${P}git"
-
-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"
-	if linux_config_exists; then
-		linux_chkconfig_present TCG_TPM && tpm_kernel_present="yes"
-	else
-		ewarn "No kernel configuration could be found."
-	fi
-	has_version app-crypt/tpm-emulator && 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
-			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
-		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-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_prepare() {
-	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
-	dodoc AUTHORS ChangeLog NICETOHAVES README TODO
-	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() {
-	elog "If you have problems starting tcsd, please check permissions and"
-	elog "ownership on /dev/tpm* and ~tss/system.data"
-}