fix some really nasty QA violations

4 files changed, 41 insertions, 43 deletions

diff --git a/net-im/bitlbee/Manifest b/net-im/bitlbee/Manifest
index 37e7d7b12b8d..ae7ca05b9c92 100644
--- a/net-im/bitlbee/Manifest
+++ b/net-im/bitlbee/Manifest
@@ -1,15 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 ef3409c438b11de40230ed4d168146d1 ChangeLog 6244
-MD5 57e383fc9b10ceab7280573a9a0b6408 bitlbee-0.90.ebuild 2777
-MD5 4cca8815767c30a961607822df473659 bitlbee-0.84.ebuild 2439
+MD5 ff5a985624b2778f87547207c8005f57 bitlbee-0.84.ebuild 2394
+MD5 60abf731985048835f7a7687d18781f3 bitlbee-0.90.ebuild 2736
+MD5 5840ef0c5909cf172622dc4a7094b63f bitlbee-0.85a.ebuild 2403
 MD5 fc51bd6f3a89c98a4a447e9b1725e488 metadata.xml 465
-MD5 6f5bc80fcfb9c9a9a4c801cadcd9dc48 bitlbee-0.85a.ebuild 2447
 MD5 348ecbcec9cf34e7164b0f0189ea5963 files/bitlbee-0.80-xinetd.patch 730
 MD5 ccb2adcfc701f086102639f5d5b38802 files/bitlbee-0.82-segv.diff 415
-MD5 2332b3b72a6b0501882bacd09921c3ce files/bitlbee-0.84-passport.diff 976
 MD5 144e462c0af1d82a3412a237519b32ca files/bitlbee-xinetd.patch 519
 MD5 6ea807f03873746fb89cc62f5552cb9e files/bitlbeed.confd 556
 MD5 658374790b73d4b9550b497f55d0b9ed files/bitlbeed.init 730
-MD5 3c50c03225e8618f3bc586dca3d2644b files/digest-bitlbee-0.90 64
 MD5 b5361a82a904f5e2bf9c5a6d0717f374 files/digest-bitlbee-0.84 64
-MD5 6668146d14da88ef8240b49671db3e9b files/yahoo.diff 25463
+MD5 2332b3b72a6b0501882bacd09921c3ce files/bitlbee-0.84-passport.diff 976
+MD5 3c50c03225e8618f3bc586dca3d2644b files/digest-bitlbee-0.90 64
 MD5 3697485d9a040cc81ff7f9d766ec1436 files/digest-bitlbee-0.85a 65
+MD5 6668146d14da88ef8240b49671db3e9b files/yahoo.diff 25463
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.8 (GNU/Linux)
+
+iD8DBQFA089/HTu7gpaalycRAqi+AJ0S+BCHQ5j4yxU0atTZ2Su4GY3guQCg7brD
+KH0oOl0b7v9cJPsBb5xfG5Q=
+=APJL
+-----END PGP SIGNATURE-----
diff --git a/net-im/bitlbee/bitlbee-0.84.ebuild b/net-im/bitlbee/bitlbee-0.84.ebuild
index 1ba53a093142..329fbbc51820 100644
--- a/net-im/bitlbee/bitlbee-0.84.ebuild
+++ b/net-im/bitlbee/bitlbee-0.84.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.84.ebuild,v 1.4 2004/04/26 04:45:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.84.ebuild,v 1.5 2004/06/19 05:30:21 vapier Exp $
 
-inherit eutils
+inherit eutils gcc
 
-DESCRIPTION="Bitlbee is an irc to IM gateway that support multiple IM protocols"
+DESCRIPTION="irc to IM gateway that support multiple IM protocols"
 HOMEPAGE="http://www.bitlbee.org"
 SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz"
 
@@ -56,19 +56,15 @@ src_compile() {
 
 	# make bitlbeed forking server
 	cd utils
-	[ -n "${CC}" ] \
-		&& ${CC} ${CFLAGS} bitlbeed.c -o bitlbeed \
-		|| gcc ${CFLAGS} bitlbeed.c -o bitlbeed
-
+	$(gcc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed || die "bitlbeed failed to compile"
 }
 
 src_install() {
-	mkdir -p ${D}/var/lib/bitlbee
+	dodir /var/lib/bitlbee
 	make install DESTDIR=${D} || die "install failed"
 	make install-etc DESTDIR=${D} || die "install failed"
 	keepdir /var/lib/bitlbee
 
-	dodoc COPYING
 	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README,TODO}
 	dohtml -A sgml doc/*.sgml
 	doman doc/bitlbee.8
@@ -90,6 +86,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	chown nobody:nobody /var/lib/bitlbee
-	chmod 700 /var/lib/bitlbee
+	chown nobody:nobody ${ROOT}/var/lib/bitlbee
+	chmod 700 ${ROOT}/var/lib/bitlbee
 }
diff --git a/net-im/bitlbee/bitlbee-0.85a.ebuild b/net-im/bitlbee/bitlbee-0.85a.ebuild
index 8cbb8ce8b2b2..c2eff4302c21 100644
--- a/net-im/bitlbee/bitlbee-0.85a.ebuild
+++ b/net-im/bitlbee/bitlbee-0.85a.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.85a.ebuild,v 1.5 2004/04/26 04:45:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.85a.ebuild,v 1.6 2004/06/19 05:30:21 vapier Exp $
 
-inherit eutils
+inherit eutils gcc
 
-DESCRIPTION="Bitlbee is an irc to IM gateway that support multiple IM protocols"
-HOMEPAGE="http://www.bitlbee.org"
+DESCRIPTION="irc to IM gateway that support multiple IM protocols"
+HOMEPAGE="http://www.bitlbee.org/"
 SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ~alpha ~ia64 ~ppc"
+KEYWORDS="x86 ~ppc sparc ~alpha ~ia64"
 IUSE="debug jabber msn oscar yahoo"
 
 DEPEND="virtual/glibc
@@ -56,19 +56,15 @@ src_compile() {
 
 	# make bitlbeed forking server
 	cd utils
-	[ -n "${CC}" ] \
-		&& ${CC} ${CFLAGS} bitlbeed.c -o bitlbeed \
-		|| gcc ${CFLAGS} bitlbeed.c -o bitlbeed
-
+	$(gcc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed || die "bitlbeed failed to compile"
 }
 
 src_install() {
-	mkdir -p ${D}/var/lib/bitlbee
+	dodir /var/lib/bitlbee
 	make install DESTDIR=${D} || die "install failed"
 	make install-etc DESTDIR=${D} || die "install failed"
 	keepdir /var/lib/bitlbee
 
-	dodoc COPYING
 	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README,TODO}
 	dohtml -A sgml doc/*.sgml
 	doman doc/bitlbee.8
@@ -90,6 +86,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	chown nobody:nobody /var/lib/bitlbee
-	chmod 700 /var/lib/bitlbee
+	chown nobody:nobody ${ROOT}/var/lib/bitlbee
+	chmod 700 ${ROOT}/var/lib/bitlbee
 }
diff --git a/net-im/bitlbee/bitlbee-0.90.ebuild b/net-im/bitlbee/bitlbee-0.90.ebuild
index d538d41ddf03..c77a212253cd 100644
--- a/net-im/bitlbee/bitlbee-0.90.ebuild
+++ b/net-im/bitlbee/bitlbee-0.90.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.90.ebuild,v 1.1 2004/05/30 01:06:41 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/bitlbee/bitlbee-0.90.ebuild,v 1.2 2004/06/19 05:30:21 vapier Exp $
 
-inherit eutils
+inherit eutils gcc
 
-DESCRIPTION="Bitlbee is an irc to IM gateway that support multiple IM protocols"
-HOMEPAGE="http://www.bitlbee.org"
+DESCRIPTION="irc to IM gateway that support multiple IM protocols"
+HOMEPAGE="http://www.bitlbee.org/"
 SRC_URI="http://get.bitlbee.org/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~sparc ~alpha ~ia64 ~ppc"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64"
 IUSE="debug jabber msn oscar yahoo flood"
 
 DEPEND="virtual/glibc
@@ -60,19 +60,15 @@ src_compile() {
 
 	# make bitlbeed forking server
 	cd utils
-	[ -n "${CC}" ] \
-		&& ${CC} ${CFLAGS} bitlbeed.c -o bitlbeed \
-		|| gcc ${CFLAGS} bitlbeed.c -o bitlbeed
-
+	$(gcc-getCC) ${CFLAGS} bitlbeed.c -o bitlbeed || die "bitlbeed failed to compile"
 }
 
 src_install() {
-	mkdir -p ${D}/var/lib/bitlbee
+	dodir /var/lib/bitlbee
 	make install DESTDIR=${D} || die "install failed"
 	make install-etc DESTDIR=${D} || die "install failed"
 	keepdir /var/lib/bitlbee
 
-	dodoc COPYING
 	dodoc doc/{AUTHORS,CHANGES,CREDITS,FAQ,README,RELEASE-SPEECH-0.90,TODO}
 	dohtml -A sgml doc/*.sgml
 	dohtml doc/*.html
@@ -99,8 +95,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	chown nobody:nobody /var/lib/bitlbee
-	chmod 700 /var/lib/bitlbee
+	chown nobody:nobody ${ROOT}/var/lib/bitlbee
+	chmod 700 ${ROOT}/var/lib/bitlbee
 	einfo "The utils included in bitlbee (other than bitlbeed) are now"
 	einfo "located in /usr/share/bitlbee"
 }