QA fixes

3 files changed, 36 insertions, 42 deletions

diff --git a/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.3.ebuild b/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.3.ebuild
index d85976f19801..cd553b3689d1 100644
--- a/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.3.ebuild
+++ b/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.3.ebuild
@@ -1,32 +1,30 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.3.ebuild,v 1.11 2004/02/22 16:13:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.3.ebuild,v 1.12 2004/06/19 05:58:26 vapier Exp $
+
+inherit gcc
 
-S=${WORKDIR}/${P}
 DESCRIPTION="CVM modules for use with vmailmgr"
-SRC_URI="http://untroubled.org/cvm-vmailmgr/${P}.tar.gz"
 HOMEPAGE="http://untroubled.org/cvm-vmailmgr/"
+SRC_URI="http://untroubled.org/cvm-vmailmgr/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~sparc"
+IUSE=""
 
 DEPEND="virtual/glibc"
-
 RDEPEND=">=net-mail/vmailmgr-0.96.9-r1
 	>=sys-apps/ucspi-unix-0.34"
 
 src_compile() {
-	cd ${S}
-	echo "gcc ${CFLAGS}" > conf-cc
-	echo "gcc" > conf-ld
+	echo "$(gcc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(gcc-getCC)" > conf-ld
 	emake || die
 }
 
-src_install () {
-	exeinto /usr/bin
-	doexe cvm-vmailmgr cvm-vmailmgr-local cvm-vmailmgr-udp
-	dodoc README ANNOUNCEMENT NEWS
+src_install() {
+	dobin cvm-vmailmgr cvm-vmailmgr-local cvm-vmailmgr-udp || die
 
 	exeinto /var/lib/supervise/cvm-vmailmgr
 	newexe ${FILESDIR}/run-cvm-vmailmgr run
@@ -37,12 +35,10 @@ src_install () {
 	insinto /etc/vmailmgr
 	doins ${FILESDIR}/cvm-vmailmgr-socket
 
-	dodoc ANNOUNCEMENT COPYING FILES NEWS README TARGETS TODO VERSION
+	dodoc ANNOUNCEMENT FILES NEWS README TARGETS TODO VERSION
 }
 
 pkg_postinst() {
-
 	einfo "To start cvm-vmailmgr you need to link"
 	einfo "/var/lib/supervise/cvm-vmailmgr to /service"
-
 }
diff --git a/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.4.ebuild b/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.4.ebuild
index 95d5047b6077..fc37ca6c572a 100644
--- a/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.4.ebuild
+++ b/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.4.ebuild
@@ -1,33 +1,32 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.4.ebuild,v 1.3 2004/01/05 23:30:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.4.ebuild,v 1.4 2004/06/19 05:58:26 vapier Exp $
+
+inherit gcc
 
-S=${WORKDIR}/${P}
 DESCRIPTION="CVM modules for use with vmailmgr"
-SRC_URI="http://untroubled.org/cvm-vmailmgr/${P}.tar.gz"
 HOMEPAGE="http://untroubled.org/cvm-vmailmgr/"
+SRC_URI="http://untroubled.org/cvm-vmailmgr/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~sparc"
+IUSE=""
 
 DEPEND="virtual/glibc
 	>=dev-libs/bglibs-1.009"
-
 RDEPEND=">=net-mail/vmailmgr-0.96.9-r1
 	>=sys-apps/ucspi-unix-0.34"
 
 src_compile() {
-	cd ${S}
 	echo "/usr/lib/bglibs/include" > conf-bgincs
 	echo "/usr/lib/bglibs/lib" > conf-bglibs
-	echo "gcc ${CFLAGS}" > conf-cc
+	echo "$(gcc-getCC) ${CFLAGS}" > conf-cc
 	make || die
 }
 
 src_install () {
-	exeinto /usr/bin
-	doexe cvm-vmailmgr cvm-vmailmgr-local cvm-vmailmgr-udp
+	dobin cvm-vmailmgr cvm-vmailmgr-local cvm-vmailmgr-udp || die
 
 	exeinto /var/lib/supervise/cvm-vmailmgr
 	newexe ${FILESDIR}/run-cvm-vmailmgr run
@@ -38,7 +37,7 @@ src_install () {
 	insinto /etc/vmailmgr
 	doins ${FILESDIR}/cvm-vmailmgr-socket
 
-	dodoc ANNOUNCEMENT COPYING FILES NEWS README TARGETS TODO VERSION
+	dodoc ANNOUNCEMENT FILES NEWS README TARGETS TODO VERSION
 }
 
 pkg_postinst() {
diff --git a/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.6.ebuild b/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.6.ebuild
index 0f38565feed6..d7cc6873253c 100644
--- a/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.6.ebuild
+++ b/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.6.ebuild
@@ -1,25 +1,26 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.6.ebuild,v 1.1 2004/01/06 00:16:06 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cvm-vmailmgr/cvm-vmailmgr-0.6.ebuild,v 1.2 2004/06/19 05:58:26 vapier Exp $
+
+inherit fixheadtails gcc
 
-inherit fixheadtails
-S=${WORKDIR}/${P}
 DESCRIPTION="CVM modules for use with vmailmgr"
-SRC_URI="http://untroubled.org/cvm-vmailmgr/${P}.tar.gz"
 HOMEPAGE="http://untroubled.org/cvm-vmailmgr/"
+SRC_URI="http://untroubled.org/cvm-vmailmgr/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 ~sparc"
+IUSE=""
 
 DEPEND="virtual/glibc
-		net-libs/cvm
-		>=dev-libs/bglibs-1.009"
+	net-libs/cvm
+	>=dev-libs/bglibs-1.009"
 
 RDEPEND=">=net-mail/vmailmgr-0.96.9-r1
-		 >=sys-apps/ucspi-unix-0.34
-		 net-libs/cvm
-		 virtual/glibc"
+	>=sys-apps/ucspi-unix-0.34
+	net-libs/cvm
+	virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
@@ -30,17 +31,15 @@ src_unpack() {
 
 
 src_compile() {
-	cd ${S}
 	echo "/usr/lib/bglibs/include" > conf-bgincs
 	echo "/usr/lib/bglibs/lib" > conf-bglibs
-	echo "${CC} ${CFLAGS}" > conf-cc
-	echo "${CC} -s" > conf-ld
+	echo "$(gcc-getCC) ${CFLAGS}" > conf-cc
+	echo "$(gcc-getCC) -s" > conf-ld
 	make || die
 }
 
-src_install () {
-	exeinto /usr/bin
-	doexe cvm-vmailmgr cvm-vmailmgr-local cvm-vmailmgr-udp cvm-vmlookup
+src_install() {
+	dobin cvm-vmailmgr cvm-vmailmgr-local cvm-vmailmgr-udp cvm-vmlookup || die
 
 	exeinto /var/lib/supervise/cvm-vmailmgr
 	newexe ${FILESDIR}/run-cvm-vmailmgr run
@@ -51,7 +50,7 @@ src_install () {
 	insinto /etc/vmailmgr
 	doins ${FILESDIR}/cvm-vmailmgr-socket
 
-	dodoc ANNOUNCEMENT COPYING FILES NEWS README TARGETS TODO VERSION
+	dodoc ANNOUNCEMENT FILES NEWS README TARGETS TODO VERSION
 }
 
 pkg_postinst() {