cleanup

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BF20DC51)

3 files changed, 5 insertions, 200 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/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"
-}