remove crufty version, and set the DEPEND to conflict with libutempter

Package-Manager: portage-2.1.1_pre2-r6

3 files changed, 24 insertions, 72 deletions

diff --git a/sys-apps/utempter/Manifest b/sys-apps/utempter/Manifest
index ca7a22ef894b..1741a63c411e 100644
--- a/sys-apps/utempter/Manifest
+++ b/sys-apps/utempter/Manifest
@@ -1,9 +1,28 @@
-MD5 6fc45b9da870216af90103683e74cd65 ChangeLog 5865
-MD5 d3293569252b4437ee84ef41b158aa00 files/digest-utempter-0.5.5.5-r1 68
-MD5 750feafe77d6007602c6abbacdce262f files/digest-utempter-0.5.5.6 68
+AUX utempter-0.5.5.5-soname-makefile-fix.patch 932 RMD160 dbfa97ca96a30b17bf07b5bd0d6c9caa71fafaac SHA1 7195c241ea7b590a925a921c03a7d428e3155824 SHA256 6e64b7334ffb2d70ed18ca8c4370bb03794a2a1f53c145559b790a8d2eb970c3
 MD5 b2dc09a11b51ceac5735f963a718fa32 files/utempter-0.5.5.5-soname-makefile-fix.patch 932
+RMD160 dbfa97ca96a30b17bf07b5bd0d6c9caa71fafaac files/utempter-0.5.5.5-soname-makefile-fix.patch 932
+SHA256 6e64b7334ffb2d70ed18ca8c4370bb03794a2a1f53c145559b790a8d2eb970c3 files/utempter-0.5.5.5-soname-makefile-fix.patch 932
+AUX utempter-0.5.5.6-no_utmpx.patch 768 RMD160 15453894e18a310a1569fd0f861dde38fc709a45 SHA1 bfa242c0069a9696f6a33e6dab6f1fe1e9647666 SHA256 d6e7b51a23c35d30adc75be556fb018ae7113c8c172c0e31946b28a5c265f0e8
 MD5 396ef6fc60078c73be6790271ca67bde files/utempter-0.5.5.6-no_utmpx.patch 768
+RMD160 15453894e18a310a1569fd0f861dde38fc709a45 files/utempter-0.5.5.6-no_utmpx.patch 768
+SHA256 d6e7b51a23c35d30adc75be556fb018ae7113c8c172c0e31946b28a5c265f0e8 files/utempter-0.5.5.6-no_utmpx.patch 768
+AUX utempter-0.5.5.6-soname-makefile-fix.patch 839 RMD160 ec820c1d6f02c9c240c5e8f851d9bed392b34950 SHA1 8b97c824458cdb9cbf09f0e242762928a3392b2f SHA256 ad1db5b94ad40f50da0862331ec08055d8606f1cd918865beedd2f7b4cc3d595
 MD5 e23f853248988e2aff2ada1ae20a335c files/utempter-0.5.5.6-soname-makefile-fix.patch 839
+RMD160 ec820c1d6f02c9c240c5e8f851d9bed392b34950 files/utempter-0.5.5.6-soname-makefile-fix.patch 839
+SHA256 ad1db5b94ad40f50da0862331ec08055d8606f1cd918865beedd2f7b4cc3d595 files/utempter-0.5.5.6-soname-makefile-fix.patch 839
+DIST utempter-0.5.5-6.src.rpm 21099
+EBUILD utempter-0.5.5.6.ebuild 1353 RMD160 a542fb41a62bd843f5bd045911ba9cd46a25d934 SHA1 6ae0aec0ff1a97f030eded247ed8dc6d4189fa73 SHA256 743710f8bdd2320815e2b7ca00e92d0507d82bbb5689735a77af3b725c4092c7
+MD5 4d92df94369516b5bb8ca44e7392f798 utempter-0.5.5.6.ebuild 1353
+RMD160 a542fb41a62bd843f5bd045911ba9cd46a25d934 utempter-0.5.5.6.ebuild 1353
+SHA256 743710f8bdd2320815e2b7ca00e92d0507d82bbb5689735a77af3b725c4092c7 utempter-0.5.5.6.ebuild 1353
+MISC ChangeLog 6049 RMD160 a11681c736466c89ed5a44c94b9de291959b9c46 SHA1 7585b215d1824e9a2c168d9c6fc9cbcd93d8ad55 SHA256 fc85f006e5417124c419f5f40b9478d16983cfda2e769ae1dfed96bf96839705
+MD5 8b6fc16099c81e531d1030620da75466 ChangeLog 6049
+RMD160 a11681c736466c89ed5a44c94b9de291959b9c46 ChangeLog 6049
+SHA256 fc85f006e5417124c419f5f40b9478d16983cfda2e769ae1dfed96bf96839705 ChangeLog 6049
+MISC metadata.xml 244 RMD160 a869a660236001523f00f960a5cead1412e7075c SHA1 5bfe881f7855733216bbb9fb3308967ee58bae4e SHA256 04d6ab951f4f1b907a649aff9405818e8aa8f0b81e2ac7095687b9836547a297
 MD5 1fe2f84f5f9d41bc80bb795ef8845ff2 metadata.xml 244
-MD5 3548d7d9f8c92fe30e12fc980096c311 utempter-0.5.5.5-r1.ebuild 1302
-MD5 2795ef0b29b8b096a6fe1b114b82c0f2 utempter-0.5.5.6.ebuild 1320
+RMD160 a869a660236001523f00f960a5cead1412e7075c metadata.xml 244
+SHA256 04d6ab951f4f1b907a649aff9405818e8aa8f0b81e2ac7095687b9836547a297 metadata.xml 244
+MD5 750feafe77d6007602c6abbacdce262f files/digest-utempter-0.5.5.6 68
+RMD160 d106e332349c7950c5cdc08158befa070f2e0600 files/digest-utempter-0.5.5.6 68
+SHA256 df1d4bd506c92ac07986caf2f0a67a4aa2d112e5409d98fb87c48b8ddbda2cee files/digest-utempter-0.5.5.6 68
diff --git a/sys-apps/utempter/files/digest-utempter-0.5.5.5-r1 b/sys-apps/utempter/files/digest-utempter-0.5.5.5-r1
deleted file mode 100644
index 9d04dab1a569..000000000000
--- a/sys-apps/utempter/files/digest-utempter-0.5.5.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5b5bcf2a802067ce1a6d258b5c52e1e6 utempter-0.5.5-5.src.rpm 20957
diff --git a/sys-apps/utempter/utempter-0.5.5.5-r1.ebuild b/sys-apps/utempter/utempter-0.5.5.5-r1.ebuild
deleted file mode 100644
index 35271049c66f..000000000000
--- a/sys-apps/utempter/utempter-0.5.5.5-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/utempter/utempter-0.5.5.5-r1.ebuild,v 1.7 2005/05/14 13:35:54 seemant Exp $
-
-inherit rpm eutils flag-o-matic
-
-MY_P=${P%.*}-${PV##*.}
-S=${WORKDIR}/${P%.*}
-DESCRIPTION="App that allows non-privileged apps to write utmp (login) info"
-HOMEPAGE="http://www.redhat.com/"
-SRC_URI="mirror://gentoo/${MY_P}.src.rpm"
-
-LICENSE="|| ( MIT LGPL-2 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
-IUSE=""
-
-RDEPEND="virtual/libc"
-DEPEND="!virtual/utempter"
-
-PROVIDE="virtual/utempter"
-
-pkg_setup() {
-	enewgroup utmp 406
-}
-
-src_unpack() {
-	rpm_src_unpack
-	cd ${S}
-	epatch ${FILESDIR}/${P}-soname-makefile-fix.patch
-}
-
-src_compile() {
-	append-ldflags -Wl,-z,now
-
-	make RPM_OPT_FLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	make \
-		RPM_BUILD_ROOT="${D}" \
-		LIBDIR=/usr/$(get_libdir) \
-		install || die
-	dobin utmp
-
-	fowners root:utmp /usr/sbin/utempter
-	fperms 2755 /usr/sbin/utempter
-}
-
-
-pkg_postinst() {
-	if [ "${ROOT}" = "/" ]
-	then
-		if [ -f /var/log/wtmp ]
-		then
-			chown root:utmp /var/log/wtmp
-			chmod 664 /var/log/wtmp
-		fi
-
-		if [ -f /var/run/utmp ]
-		then
-			chown root:utmp /var/run/utmp
-			chmod 664 /var/run/utmp
-		fi
-	fi
-}