fix a few QA violations

3 files changed, 8 insertions, 54 deletions

diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.22-r1.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.22-r1.ebuild
index 181939f77d8e..7e459bf81d4c 100644
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.22-r1.ebuild
+++ b/net-mail/cmd5checkpw/cmd5checkpw-0.22-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cmd5checkpw/cmd5checkpw-0.22-r1.ebuild,v 1.11 2004/06/06 20:53:23 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cmd5checkpw/cmd5checkpw-0.22-r1.ebuild,v 1.12 2004/06/19 05:49:45 vapier Exp $
 
-inherit eutils
+inherit eutils gcc
 
 DESCRIPTION="A checkpassword compatible authentication program that used CRAM-MD5 authentication mode."
 SRC_URI="http://members.elysium.pl/brush/cmd5checkpw/dist/${P}.tar.gz"
@@ -10,15 +10,13 @@ HOMEPAGE="http://members.elysium.pl/brush/cmd5checkpw/"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ~ppc sparc mips alpha arm hppa amd64 ia64"
+KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64"
 IUSE=""
 
 DEPEND="virtual/glibc"
 
 douser() {
-	if  [ -z "`getent passwd cmd5checkpw`" ]; then
-		enewuser cmd5checkpw 212 /bin/false /dev/null bin
-	fi
+	enewuser cmd5checkpw 212 /bin/false /dev/null bin
 }
 
 pkg_preinst() {
@@ -37,8 +35,8 @@ src_compile() {
 		-e "s:cp cmd5checkpw.8 /usr/man/man8/:cp cmd5checkpw.8 \${D}/usr/share/man/man8/:" \
 		< Makefile.orig > Makefile
 	cd ${S}
-	echo "${CC} ${CFLAGS}" > conf-cc
-	echo "${CC} ${LDFLAGS}" > conf-ld
+	echo "$(gcc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(gcc-getCC) ${LDFLAGS}" > conf-ld
 	make || die
 }
 
@@ -53,6 +51,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	chmod 400 /etc/poppasswd
-	chown cmd5checkpw /etc/poppasswd
+	chmod 400 ${ROOT}/etc/poppasswd
+	chown cmd5checkpw ${ROOT}/etc/poppasswd
 }
diff --git a/net-mail/cmd5checkpw/cmd5checkpw-0.22.ebuild b/net-mail/cmd5checkpw/cmd5checkpw-0.22.ebuild
deleted file mode 100644
index 3385fa29d6de..000000000000
--- a/net-mail/cmd5checkpw/cmd5checkpw-0.22.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cmd5checkpw/cmd5checkpw-0.22.ebuild,v 1.10 2004/04/27 20:50:02 agriffis Exp $
-
-DESCRIPTION="A checkpassword compatible authentication program that used CRAM-MD5 authentication mode."
-HOMEPAGE="http://members.elysium.pl/brush/cmd5checkpw/"
-SRC_URI="http://members.elysium.pl/brush/cmd5checkpw/dist/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
-
-DEPEND="virtual/glibc"
-
-pkg_preinst() {
-	if ! grep -q ^cmd5checkpw: /etc/passwd
-	then
-		useradd -d /dev/null -g bin  -s /dev/null cmd5checkpw \
-			|| die "problem adding user cmd5checkpw"
-	fi
-}
-
-src_compile() {
-	cp Makefile Makefile.orig
-	sed \
-		-e "s:-c -g -Wall -O3:${CFLAGS}:" \
-		-e "s:cp cmd5checkpw /bin/:cp cmd5checkpw \${D}/bin/:" \
-		-e "s:cp cmd5checkpw.8 /usr/man/man8/:cp cmd5checkpw.8 \${D}/usr/share/man/man8/:" \
-		< Makefile.orig > Makefile
-	cd ${S}
-	echo "gcc ${CFLAGS}" > conf-cc
-	make || die
-}
-
-src_install() {
-	dodir /etc /bin /usr/share/man/man8
-	cp ${FILESDIR}/poppasswd ${D}/etc
-	make install
-	chown cmd5checkpw ${D}/etc/poppasswd
-	chmod 400 ${D}/etc/poppasswd
-	chown cmd5checkpw ${D}/bin/cmd5checkpw
-	chmod a+s ${D}/bin/cmd5checkpw
-}
diff --git a/net-mail/cmd5checkpw/files/digest-cmd5checkpw-0.22 b/net-mail/cmd5checkpw/files/digest-cmd5checkpw-0.22
deleted file mode 100644
index 53de5a450fbb..000000000000
--- a/net-mail/cmd5checkpw/files/digest-cmd5checkpw-0.22
+++ /dev/null
@@ -1 +0,0 @@
-MD5 40092caf3608cbc8bd23220b2b28cb52 cmd5checkpw-0.22.tar.gz 24323