Cleanup, bump to eap5, modify home and src_uri per bug#537700

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

9 files changed, 26 insertions, 360 deletions

diff --git a/app-crypt/tpm-emulator/ChangeLog b/app-crypt/tpm-emulator/ChangeLog
index ff21c0cfc3b0..866157c2b577 100644
--- a/app-crypt/tpm-emulator/ChangeLog
+++ b/app-crypt/tpm-emulator/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/tpm-emulator
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/ChangeLog,v 1.20 2013/05/10 06:27:54 patrick Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/ChangeLog,v 1.21 2015/01/26 09:26:38 alonbl Exp $
+
+  26 Jan 2015; Alon Bar-Lev <alonbl@gentoo.org>
+  -files/tpm-emulator-0.5.1-parallel-make.patch,
+  -files/tpm-emulator.confd-0.5.1, -files/tpm-emulator.initd-0.5.1,
+  -tpm-emulator-0.5.1-r1.ebuild, -tpm-emulator-0.5.1.ebuild,
+  -tpm-emulator-0.5.ebuild, tpm-emulator-0.7.4-r1.ebuild:
+  Cleanup, bump to eap5, modify home and src_uri per bug#537700
 
   10 May 2013; Patrick Lauer <patrick@gentoo.org> tpm-emulator-0.7.4-r1.ebuild:
   Quoting
diff --git a/app-crypt/tpm-emulator/Manifest b/app-crypt/tpm-emulator/Manifest
index 12ca53003555..c388b90ee2cd 100644
--- a/app-crypt/tpm-emulator/Manifest
+++ b/app-crypt/tpm-emulator/Manifest
@@ -1,16 +1,18 @@
-AUX tpm-emulator-0.5.1-parallel-make.patch 1910 SHA256 2af0336f84a5e9f38413fef5cebea825b8e57423f0a080a59598d8c1e1929789 SHA512 65f3bbb5a75fc910c37e30e196b04b16fc29dd80aa3256cf2ecbb561cc0a15a22f5535f899cc30a1758d48a46e792179ee9303bb1bb66ad1bac57adc18a33b1c WHIRLPOOL 6aa8b4380d5e11b19665bff211dddc865c8e87b0bf383b820984fb1237fb3777eec5799958d3708b152afbb253556aa4a833354143abd760a1e4f09308b5a236
-AUX tpm-emulator.confd-0.5.1 34 SHA256 3af4a1b3f83919225c4a66f3de3159bed4e8eec4d55e9da848018c5ea66541ee SHA512 61b5145d3fa5b778ba09e66a25ea183165fafbdafe54aa77d171aed2a87f6b5febc918d33603a9bf58320e9ff3f79e3ec58d03d4674562d31c1c90b942faf504 WHIRLPOOL e95e8e0326f2c64695b63ba8242bf0ff9cdf256411b05b9aff9553b5bb69266d5a8bc1aef0cca701502ad94852cec254dfa0e74fdf546952f13afdabd9cc3598
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tpm-emulator.confd-0.7.4 34 SHA256 3af4a1b3f83919225c4a66f3de3159bed4e8eec4d55e9da848018c5ea66541ee SHA512 61b5145d3fa5b778ba09e66a25ea183165fafbdafe54aa77d171aed2a87f6b5febc918d33603a9bf58320e9ff3f79e3ec58d03d4674562d31c1c90b942faf504 WHIRLPOOL e95e8e0326f2c64695b63ba8242bf0ff9cdf256411b05b9aff9553b5bb69266d5a8bc1aef0cca701502ad94852cec254dfa0e74fdf546952f13afdabd9cc3598
 AUX tpm-emulator.initd 1098 SHA256 006cbc727471aa46e6b39783a32456c3a43cb1adf25a54ddf0e9b9c9ab92c10c SHA512 6fa77549cfa71908ac33a8f1101a7761bac326f541baa20159e4cb0d55c0836540449ce9204c973e3cf857e476aa21f8d7c68c68b5efe191aad8dec63a08b74c WHIRLPOOL 95e4dbab6f9b2a5c56f62990b1ec84de1e6f797bd2b91ca21a7dc942bde1abf8301bdebe79f144b0253ec9eda2731cfe4c5d8a1762291a408476040874e0ffb9
-AUX tpm-emulator.initd-0.5.1 1306 SHA256 7fe76f8c0104dba719c0f51b900a7d68353579a8d2bbf77960d42ed90e14286e SHA512 e852b14e15258de132f67fc7b1e39f9df6016906d7aa2f6a9bd9251ada427ba65c58ec343294dde81a61fbb37b74ff40a43ac09602cb39021d4fa44a41e95a75 WHIRLPOOL 41b446dc590f57c6286f39323e3850a1a072ee6f248409720bffa3c3a964faf669b061020a606f0bee6be3faf951627696d72b77e88743cc6ed786fe84453bb0
 AUX tpm-emulator.initd-0.7.4 1227 SHA256 c564c457674b1ecebc7f7b1442305bc4b41dd8f6c908b906068b7e2a81279842 SHA512 4973d79234cefc09c2ff0ccbb6e06c0dbf817833e4e371b2077378136e85b18a205cfaf75eaca4a27865f5a143713f7bc5305a41b885a9b219f23b35513e1bf9 WHIRLPOOL 6a53a5d4c9aeca2270cf9907c9cbf309f74d5d35f183bdb51f69669681e061f4a648ab1d2fea076430d94733c62a978047eae99c031d29082875737dfb74541c
 AUX tpm-emulator.udev 68 SHA256 b19ebed090177546d76eacbdd52ab68f32c3a3c46598e437b3fd5780efa9c164 SHA512 9c10833f011f26e051c379a352b5f68d2db67aad2144d1e35386a6099306b1d48f8446722b2d871aa625132be2c08e227d351a51aaa0ad73dcc3fa44636da311 WHIRLPOOL c32168a1726b00dc4042592a8b90cb43991acc5976a35611e1331284d4934154ebba7c4ca72adfdeeda6422851fafe300ef59ad1ff1659fb2ee4c905534ed058
-DIST tpm_emulator-0.5.1.tar.gz 146565 SHA256 b83f9fe00d77c9d88bcce0dfbd26e9b29992846fa8f995bdfff7bce88a98906c SHA512 be8c3954884dcf66e627d4fcdc913efa455c211bd026d5f262ef1ae07146e4edcfefa8c7ddbad019701b35a4207b5516d76756d25d4f72b0b82885d9c335b98e WHIRLPOOL 0db82a0c0eda895c36685146fc84d1e4273b4c1eb46f86e3b227be0e1d76b85f4ccb34ba584004536d74ebab07af61f22e5f2ce849ba15db3a46282fe379cb13
-DIST tpm_emulator-0.5.tar.gz 267193 SHA256 b6d88a601d47cfb98d00f5fc8abe3aeadd8e205781d5fd745cf7cd47d158fade SHA512 0573ebc9c9bcca91d2b29de369c77f3a24497ac59cdb378057fd709da54a21eca8d6074b2a5b8277313bb2948a67d8c93f114519f7f32d7621fabcc97f08e711 WHIRLPOOL 6e5bd9bcc8bb9ba9f94e63bd815badd458f522482f68a3e835e5acce038e363a9bd7abab218076318ccca61943b202036fb6b8e28148868413d490d7e31bb71a
 DIST tpm_emulator-0.7.4.tar.gz 214145 SHA256 4e48ea0d83dd9441cc1af04ab18cd6c961b9fa54d5cbf2c2feee038988dea459 SHA512 4928b5b82f57645be9408362706ff2c4d9baa635b21b0d41b1c82930e8c60a759b1ea4fa74d7e6c7cae1b7692d006aa5cb72df0c3b88bf049779aa2b566f9d35 WHIRLPOOL c75d49e834f8df6c810d7cb7ca3553e742fde0fd6050af7f7aeda8bbdf652084dda6600719eb0b816e1d51bbc5d9f0e119ea40ce3e59af05fd8d55971056fd6f
-EBUILD tpm-emulator-0.5.1-r1.ebuild 2285 SHA256 e0d2ce56bb06c5c69200ee25444ff2bbc1d4f6fca6a889e4e5efd29874b5312d SHA512 e9940c3013a89c3b1a460641e4461911806f19807019a471d2f11ee2585fd544d92daf3fccd14b36253e1a7e4b196eaafabc500301db36e92fe0be7478f07d06 WHIRLPOOL 3506b92169535dfc45a509d6a28c207c7e78da4029a5958bfaa0aeb1b4c30a92e5fef7df64cd1c0cb6067cf97c9ca907d7ecd421709cc5bbd9fc17a50a680b98
-EBUILD tpm-emulator-0.5.1.ebuild 2284 SHA256 1a4e2a6db31b001a35de4ff73b9eba2e414909ce47be01aaf968ffa6e8e39d34 SHA512 8800c9f783e809d439c8530a89a78fc410870f5b4abf1d317f4832f6b17b3fb01e567acd9c05b59684a202f0030dbfa0e457775e9a2823e591266e32048ecbe3 WHIRLPOOL 75c5cd2e6fdf2a97e5ca5dcae79ff69e704fd60ea6edcfc5ee8f328707322737611e15400af273c917e3d267675b5712e8a102fcf2702184a6cfac7c0f5124e7
-EBUILD tpm-emulator-0.5.ebuild 1603 SHA256 581f0ede67de1a703452b2c092c950347dcc898e714b0204497cd3193ab1d225 SHA512 b9239618868613a2b1b14de5b399b974a4ae492d21aa132291cda792118e4bc52767465705c56b15f81e1a01124bcb0f6260dd361dd69e7eda60708b3e80f134 WHIRLPOOL 240a119885804446884080cb9171d101b743a52634d63f39f230b2979cf2fb2e7280eda40070faebc1f02395dfb0cb24c94c77194c1e6a52c127ac36d643a38c
-EBUILD tpm-emulator-0.7.4-r1.ebuild 1674 SHA256 98e98b50671a17263e8a20ae0c537d7123686c3487358713ba346b4990422a9c SHA512 ff00a39e0f2c91e821ed0da63c389bc4567521c089834f72b23a8737d2de3cf9bec35d0c09476628520c1a200d3a508f741251e776966280eec5e3797f8808a3 WHIRLPOOL 6165a2ec1272b65134326cbafd70907a3e4fd94807e23800c87facac365bfc013ff1f76b2a54e823ecad76b1a0da1e34ec8cabd82c792149ea8eaa92c9577188
-MISC ChangeLog 3623 SHA256 665e64b172d1534016a3291b2d0a220b8f3806b573954fb33ef6ce5dfe7c6ae7 SHA512 d3be5b77a9dd3838063ff746836991a0405e9de2d90ef2742f99bfefacf7106647e3de4b404fab8e1f77006d9208074ceb6b27441f8f6603d9cde11fdc684819 WHIRLPOOL 28e03be94e9698791888ac4f6e61a7fd22b0afe29ddf9f7d0466dc39ad9699049da97ce569b3d5c5762dbfd83edcafed090e1a2c4a5e504c6867473980fde615
+EBUILD tpm-emulator-0.7.4-r1.ebuild 1680 SHA256 cbea9b27fc44d7e89afef6de5834e4dede71edbb79dc63e2db7875130bee72ee SHA512 f24416759d8b507a74c2a9336c182aafea9a3040eab96ca905e02b4a42c1264bb93ffc22f4653f860721e3434a804ee31b7215b41633019ae5d9852a02bcade1 WHIRLPOOL 3be8a4db650b11e44a2fb1a1c00bf26b545ae30355e67efed7d0570a80593682cb09983c3ebc83400ceacee4b54af38fb7d0e0a1e3f80b5b46cdec03b9b46791
+MISC ChangeLog 3971 SHA256 c1d0e04aeee01f4902df911151e5ec3f822c0303600f7b849b7ee2368c248323 SHA512 cfbac3e5755662f1fdf183c787fbb2240190c053c485f4600e28a69814e34af61f04dd92c2ee3145840ef2c69d71b55795d049a17aa009690f35759427db74f7 WHIRLPOOL 14d9143aae45343059c2d6aedae4d609af850f0c4cba2af03765dbf098df6dc2f76b5ce8f2d8d691365674106397b36e02b15ab26655d80d770c5602b9bc22ca
 MISC metadata.xml 159 SHA256 fabd15e2740a2a68e0bda738d0cd4300b133ff11239802afe7e60aa3862c9c03 SHA512 96a1f7f082adc57e52a1a32666e1206e68f8ff03c728fdb7666ff98c255905977491fc4dfc37bc8bdf5da0eb50cdc408adec357bbd75bd980bc90659cc157194 WHIRLPOOL 82fca1c4b75b090abdb0a4233c8e49fc43535ca6e470f725c1872653ea922b6693e9646bc3ee1fd6f1293ebedad661642cec13b2817fb5315268300f7675a751
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlTGCFIACgkQXYk9GL8g3FFh6AD/fe6Af63OqDStBTq4l9ay1o/a
+nFpkLmFI1bqvhWs67EIA/jvkBIfTmvw4Il5ibf84yOafzLulZEaSaUFPEY8h0fFR
+=SJga
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator-0.5.1-parallel-make.patch b/app-crypt/tpm-emulator/files/tpm-emulator-0.5.1-parallel-make.patch
deleted file mode 100644
index 0a82a7159e0b..000000000000
--- a/app-crypt/tpm-emulator/files/tpm-emulator-0.5.1-parallel-make.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-commit b3d254296c1d3dbc6058f294041481af8972a661
-Author: Andreas Niederl <rico32@gmx.net>
-Date:   Sun Aug 30 16:52:57 2009 +0200
-
-    fix version target in Makefile
-
-diff --git a/Makefile b/Makefile
-index 9260014..de54e52 100644
---- a/Makefile
-+++ b/Makefile
-@@ -12,33 +12,35 @@ VERSION_SUFFIX := .1
- 
- SUBDIRS := tpmd tpmd_dev tddl
- 
--all: version all-recursive
-+all: all-recursive
- 
--version:
--	@echo "#ifndef _TPM_VERSION_H_" > tpm/tpm_version.h
--	@echo "#define _TPM_VERSION_H_" >> tpm/tpm_version.h
--	@echo "#define VERSION_MAJOR $(VERSION_MAJOR)" >> tpm/tpm_version.h
--	@echo "#define VERSION_MINOR $(VERSION_MINOR)" >> tpm/tpm_version.h
--	@echo "#define VERSION_BUILD $(VERSION_BUILD)" >> tpm/tpm_version.h
--	@echo "#endif /* _TPM_VERSION_H_ */" >> tpm/tpm_version.h
-+version := tpm/tpm_version.h
-+
-+$(version):
-+	@echo "#ifndef _TPM_VERSION_H_"                 > $@
-+	@echo "#define _TPM_VERSION_H_"                >> $@
-+	@echo "#define VERSION_MAJOR $(VERSION_MAJOR)" >> $@
-+	@echo "#define VERSION_MINOR $(VERSION_MINOR)" >> $@
-+	@echo "#define VERSION_BUILD $(VERSION_BUILD)" >> $@
-+	@echo "#endif /* _TPM_VERSION_H_ */"           >> $@
- 
- clean: clean-recursive
--	rm -f tpm/tpm_version.h
-+	rm -f $(version)
- 
- install: install-recursive
- 
--all-recursive clean-recursive install-recursive:
-+all-recursive clean-recursive install-recursive: $(version)
- 	@target=`echo $@ | sed s/-recursive//`; \
- 	for subdir in $(SUBDIRS); do \
- 		echo "Making $$target in $$subdir"; \
- 		$(MAKE) -C $$subdir $$target || exit -1; \
- 	done
- 
--user: version
-+user: $(version)
- 	@$(MAKE) -C tpmd all || exit -1
- 	@$(MAKE) -C tddl all || exit -1
- 
--modules: version
-+modules: $(version)
- 	@$(MAKE) -C tpmd_dev all || exit -1
- 
- user_install: user
-@@ -62,5 +64,5 @@ dist: $(DISTSRC)
- 	tar -chzf $(DISTDIR).tar.gz $(DISTDIR)
- 	@rm -rf $(DISTDIR)
- 
--.PHONY: all version clean install dist
-+.PHONY: all clean install dist
- 
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator.confd-0.5.1 b/app-crypt/tpm-emulator/files/tpm-emulator.confd-0.5.1
deleted file mode 100644
index da24e57840b9..000000000000
--- a/app-crypt/tpm-emulator/files/tpm-emulator.confd-0.5.1
+++ /dev/null
@@ -1,2 +0,0 @@
-STARTUP_MODE="save"
-#DEBUG="true"
diff --git a/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.5.1 b/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.5.1
deleted file mode 100644
index 1e93950b59ae..000000000000
--- a/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.5.1
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/files/tpm-emulator.initd-0.5.1,v 1.2 2012/12/23 01:25:26 alonbl Exp $
-
-opts="save clear deactivated"
-
-STARTUP_MODE="${STARTUP_MODE:-'save'}"
-
-LOGFILE=/var/log/tpm/tpm-emulator.log
-
-
-depend() {
-	use logger
-	after coldplug
-}
-
-checkconfig() {
-	lsmod | grep -q "^tpmd_dev\b" \
-		|| modprobe tpmd_dev &>/dev/null \
-		|| eerror "Failed to load module tpmd_dev, assuming you have it built-in to kernel.";
-
-	if [ ! -c /dev/tpm ] && [ ! -c /dev/tpm0 ] ; then
-		eerror "No TPM device found!"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	ebegin "Starting tpm-emulator daemon with mode '$STARTUP_MODE' (tpmd)"
-	checkconfig || eend $?
-	start-stop-daemon --start --chuid tss \
-		--background --stdout $LOGFILE --stderr $LOGFILE \
-		--exec /usr/sbin/tpmd -- -f ${DEBUG:+-d} $STARTUP_MODE
-	sleep 1
-	chmod g+w /var/run/tpm/tpmd_socket:0
-	eend $?
-}
-
-save() {
-	STARTUP_MODE='save';
-	svc_restart 
-}
-
-clear() {
-	STARTUP_MODE='clear';
-	svc_restart 
-}
-
-deactivated() {
-	STARTUP_MODE='deactivated';
-	svc_restart 
-}
-
-stop() {
-	ebegin "Stopping tpm-emulator daemon (tpmd)"
-	start-stop-daemon --stop --exec /usr/sbin/tpmd --user tss > /dev/null
-	eend $?
-}
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild
deleted file mode 100644
index 3f477e8e525c..000000000000
--- a/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/tpm-emulator-0.5.1-r1.ebuild,v 1.3 2012/12/11 15:44:01 axs Exp $
-
-EAPI=2
-inherit toolchain-funcs linux-mod eutils multilib udev user
-
-MY_P=${P/-/_}
-DESCRIPTION="Emulator driver for tpm"
-HOMEPAGE="https://developer.berlios.de/projects/tpm-emulator"
-
-SRC_URI="mirror://berlios/tpm-emulator/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="modules"
-DEPEND="dev-libs/gmp
-	virtual/pkgconfig"
-RDEPEND=""
-S=${WORKDIR}/${P/-/_}
-
-#fixups at:
-#https://developer.berlios.de/feature/index.php?func=detailfeature&feature_id=3304&group_id=2491
-
-pkg_setup() {
-	use modules && linux-mod_pkg_setup
-	MODULE_NAMES="tpmd_dev(crypt::${S}/tpmd_dev)"
-	BUILD_TARGETS="all"
-	BUILD_PARAMS="CC=$(tc-getCC)"
-	enewuser tss -1 -1 /var/lib/tpm tss
-}
-
-src_prepare() {
-	sed -i 's/LDFLAGS :=/override LDFLAGS +=/g' tpmd/Makefile
-	sed -i 's#/var/tpm#/var/run/tpm#g' tpmd/tpmd.c tddl/tddl.c tpmd_dev/tpmd_dev.c
-
-	# use kernel object directory found by linux-info getversion() (bug 241956)
-	sed -i 's#/lib/modules/\$(KERNEL_RELEASE)/build#'"${KV_OUT_DIR}#" tpmd_dev/Makefile
-
-	# reorder -lgmp so --as-needed works (bug 264073)
-	sed -i 's/LDFLAGS/LDLIBS/' tpmd/Makefile
-
-	# fix parallel make
-	epatch "${FILESDIR}"/${P}-parallel-make.patch
-}
-
-src_compile() {
-	emake user || die "Failed to build userspace"
-	if use modules; then
-		linux-mod_src_compile || die "Failed to build kernelspace"
-	fi
-}
-
-src_install() {
-	if [ -x /usr/bin/scanelf -a -f tpm_emulator.ko ]; then
-		[ -z "$(/usr/bin/scanelf -qs __guard tpm_emulator.ko)" ] || \
-			die 'cannot have gmp compiled with hardened flags'
-		[ -z "$(/usr/bin/scanelf -qs __stack_smash_handler tpm_emulator.ko)" ] || \
-			die 'cannot have gmp compiled with hardened flags'
-	fi
-
-	use modules && linux-mod_src_install
-	dodoc README
-
-	emake user_install DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" \
-		|| die "Failed to install userspace"
-
-	newinitd "${FILESDIR}"/${PN}.initd-0.5.1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-0.5.1 ${PN}
-
-	udev_newrules "${FILESDIR}"/${PN}.udev 60-${PN}.rules
-
-	keepdir /var/run/tpm
-	fowners tss /var/run/tpm
-
-	keepdir /var/log/tpm
-	fowners tss:tss /var/log/tpm
-}
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.5.1.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.5.1.ebuild
deleted file mode 100644
index 26c61395e5fa..000000000000
--- a/app-crypt/tpm-emulator/tpm-emulator-0.5.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/tpm-emulator-0.5.1.ebuild,v 1.3 2012/05/31 03:31:59 zmedico Exp $
-
-EAPI=2
-inherit toolchain-funcs linux-mod eutils multilib user
-
-MY_P=${P/-/_}
-DESCRIPTION="Emulator driver for tpm"
-HOMEPAGE="https://developer.berlios.de/projects/tpm-emulator"
-
-SRC_URI="mirror://berlios/tpm-emulator/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="modules"
-DEPEND="dev-libs/gmp"
-RDEPEND=""
-S="${WORKDIR}"/${P/-/_}
-
-#fixups at:
-#https://developer.berlios.de/feature/index.php?func=detailfeature&feature_id=3304&group_id=2491
-
-pkg_setup() {
-	use modules && linux-mod_pkg_setup
-	MODULE_NAMES="tpmd_dev(crypt::${S}/tpmd_dev)"
-	BUILD_TARGETS="all"
-	BUILD_PARAMS="CC=$(tc-getCC)"
-	enewuser tss -1 -1 /var/lib/tpm tss
-}
-
-src_prepare() {
-	sed -i 's/LDFLAGS :=/override LDFLAGS +=/g' tpmd/Makefile
-	sed -i 's#/var/tpm#/var/run/tpm#g' tpmd/tpmd.c tddl/tddl.c tpmd_dev/tpmd_dev.c
-
-	# use kernel object directory found by linux-info getversion() (bug 241956)
-	sed -i 's#/lib/modules/\$(KERNEL_RELEASE)/build#'"${KV_OUT_DIR}#" tpmd_dev/Makefile
-
-	# reorder -lgmp so --as-needed works (bug 264073)
-	sed -i 's/LDFLAGS/LDLIBS/' tpmd/Makefile
-
-	# fix parallel make
-	epatch "${FILESDIR}"/${P}-parallel-make.patch
-}
-
-src_compile() {
-	emake user || die "Failed to build userspace"
-	if use modules; then
-		linux-mod_src_compile || die "Failed to build kernelspace"
-	fi
-}
-
-src_install() {
-	if [ -x /usr/bin/scanelf -a -f tpm_emulator.ko ]; then
-		[ -z "$(/usr/bin/scanelf -qs __guard tpm_emulator.ko)" ] || \
-			die 'cannot have gmp compiled with hardened flags'
-		[ -z "$(/usr/bin/scanelf -qs __stack_smash_handler tpm_emulator.ko)" ] || \
-			die 'cannot have gmp compiled with hardened flags'
-	fi
-
-	use modules && linux-mod_src_install
-	dodoc README
-
-	emake user_install DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" \
-		|| die "Failed to install userspace"
-
-	newinitd "${FILESDIR}"/${PN}.initd-0.5.1 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-0.5.1 ${PN}
-
-	insinto /etc/udev/rules.d
-	newins "${FILESDIR}"/${PN}.udev 60-${PN}.rules
-
-	keepdir /var/run/tpm
-	fowners tss /var/run/tpm
-
-	keepdir /var/log/tpm
-	fowners tss:tss /var/log/tpm
-}
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.5.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.5.ebuild
deleted file mode 100644
index 5614514b3e2f..000000000000
--- a/app-crypt/tpm-emulator/tpm-emulator-0.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/tpm-emulator-0.5.ebuild,v 1.5 2012/05/31 03:31:59 zmedico Exp $
-
-inherit toolchain-funcs linux-mod eutils user
-
-MY_P=${P/-/_}
-DESCRIPTION="Emulator driver for tpm"
-HOMEPAGE="https://developer.berlios.de/projects/tpm-emulator"
-
-SRC_URI="mirror://berlios/tpm-emulator/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-DEPEND="dev-libs/gmp"
-RDEPEND=""
-S=${WORKDIR}/${P/-/_}
-
-#fixups at:
-#https://developer.berlios.de/feature/index.php?func=detailfeature&feature_id=3304&group_id=2491
-
-pkg_setup() {
-	linux-mod_pkg_setup
-	MODULE_NAMES="tpmd_dev(crypt::${S}/tpmd_dev)"
-	BUILD_TARGETS="all"
-	BUILD_PARAMS="CC=$(tc-getCC)"
-	enewuser tss
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i 's/LDFLAGS :=/override LDFLAGS +=/g' tpmd/Makefile
-	sed -i 's#/var/tpm#/var/run/tpm#g' tpmd/tpmd.c tddl/tddl.c tpm_dev/linux_module.c
-}
-
-src_install() {
-	if [ -x /usr/bin/scanelf ]; then
-		[ -z "$(/usr/bin/scanelf -qs __guard tpm_emulator.ko)" ] || \
-			die 'cannot have gmp compiled with hardened flags'
-		[ -z "$(/usr/bin/scanelf -qs __stack_smash_handler tpm_emulator.ko)" ] || \
-			die 'cannot have gmp compiled with hardened flags'
-	fi
-
-	linux-mod_src_install
-	dodoc README
-	dosbin tpmd/tpmd
-	dolib.so tddl/libtddl.so
-	insinto /usr/include
-	doins tddl/tddl.h
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	insinto /etc/udev/rules.d
-	newins "${FILESDIR}/${PN}.udev" "60-${PN}.rules"
-	keepdir /var/run/tpm
-	fowners tss /var/run/tpm
-}
diff --git a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
index 6eba498d5169..9ba23982f0c2 100644
--- a/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
+++ b/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild,v 1.2 2013/05/10 06:27:54 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-emulator/tpm-emulator-0.7.4-r1.ebuild,v 1.3 2015/01/26 09:26:38 alonbl Exp $
 
-EAPI=2
+EAPI=5
 inherit user linux-mod cmake-utils udev
 
 MY_P=${P/-/_}
 DESCRIPTION="Emulator driver for tpm"
-HOMEPAGE="https://developer.berlios.de/projects/tpm-emulator"
-SRC_URI="mirror://berlios/tpm-emulator/${MY_P}.tar.gz"
+HOMEPAGE="http://sourceforge.net/projects/tpm-emulator.berlios/"
+SRC_URI="mirror://sourceforge/tpm-emulator/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"