inherit flag-o-matic

16 files changed, 62 insertions, 151 deletions

diff --git a/net-analyzer/ethereal/ethereal-0.10.3.ebuild b/net-analyzer/ethereal/ethereal-0.10.3.ebuild
index d12d4d5869dc..2d5921190fdf 100644
--- a/net-analyzer/ethereal/ethereal-0.10.3.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.3.ebuild
@@ -1,21 +1,17 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.3.ebuild,v 1.5 2004/03/28 12:15:41 klieber Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.3.ebuild,v 1.6 2004/04/06 03:08:44 vapier Exp $
 
-IUSE="adns gtk ipv6 snmp ssl gtk2"
-
-inherit libtool
+inherit libtool flag-o-matic
 
 DESCRIPTION="A commercial-quality network protocol analyzer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-RESTRICT="nomirror"
 HOMEPAGE="http://www.ethereal.com/"
-SLOT="0"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc ppc ~alpha amd64 ~ia64"
-
-replace-flags '-O3' '-O'
-replace-flags '-O2' '-O'
+IUSE="adns gtk ipv6 snmp ssl gtk2"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	snmp? ( virtual/snmp )
@@ -29,14 +25,17 @@ RDEPEND=">=sys-libs/zlib-1.1.4
 	>=net-libs/libpcap-0.7.1
 	>=dev-libs/libpcre-4.2
 	adns? ( net-libs/adns )"
-
 DEPEND="${RDEPEND}
 	dev-lang/perl
 	sys-devel/bison
 	sys-devel/flex"
 
 src_unpack() {
-	unpack ${A} && cd ${S} || die
+	unpack ${A}
+	cd ${S}
+
+	replace-flags -O3 -O
+	replace-flags -O2 -O
 
 	# running a full elibtoolize seems to break things in this
 	# package... see bug 41831 (17 Feb 2004 agriffis)
@@ -78,8 +77,9 @@ src_compile() {
 src_install() {
 	addwrite "/usr/share/snmp/mibs/.index"
 	dodir /usr/lib/ethereal/plugins/${PV}
-	make DESTDIR=${D} install
-	dodoc AUTHORS COPYING ChangeLog INSTALL.* NEWS README* TODO
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS ChangeLog INSTALL.* NEWS README* TODO
 	insinto "/usr/share/pixmaps/"
 	doins "image/hi48-app-ethereal.png"
 }
diff --git a/net-dns/bind-tools/bind-tools-9.2.3-r1.ebuild b/net-dns/bind-tools/bind-tools-9.2.3-r1.ebuild
index d14edee9a2f5..78d5cac759a2 100644
--- a/net-dns/bind-tools/bind-tools-9.2.3-r1.ebuild
+++ b/net-dns/bind-tools/bind-tools-9.2.3-r1.ebuild
@@ -1,22 +1,23 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.2.3-r1.ebuild,v 1.3 2004/03/11 02:56:47 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind-tools/bind-tools-9.2.3-r1.ebuild,v 1.4 2004/04/06 03:09:37 vapier Exp $
+
+inherit flag-o-matic
 
 MY_P=${P//-tools}
 MY_P=${MY_P/_}
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="bind tools: dig, nslookup, and host"
-SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV/_}/${MY_P}.tar.gz"
 HOMEPAGE="http://www.isc.org/products/BIND/bind9-beta.html"
+SRC_URI="ftp://ftp.isc.org/isc/bind9/${PV/_}/${MY_P}.tar.gz"
 
-KEYWORDS="~x86 ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
 LICENSE="as-is"
 SLOT="0"
+KEYWORDS="x86 ppc ~sparc ~alpha hppa ~amd64 ~ia64"
 
 DEPEND="virtual/glibc"
 
 src_compile() {
-
 	# Set -fPIC compiler option to enable compilation on 64-bit archs
 	# (Bug #33336)
 	if use alpha || use amd64 || use ia64; then
@@ -40,12 +41,10 @@ src_compile() {
 }
 
 src_install() {
-	cd ${S}/bin/dig
-	dobin dig host nslookup
-	doman dig.1 host.1
-
+	dodoc README CHANGES FAQ COPYRIGHT
 	doman ${FILESDIR}/nslookup.8
 
-	cd ${S}
-	dodoc  README CHANGES FAQ COPYRIGHT
+	cd ${S}/bin/dig
+	dobin dig host nslookup || die
+	doman dig.1 host.1
 }
diff --git a/net-im/gaim-encryption/gaim-encryption-2.21.ebuild b/net-im/gaim-encryption/gaim-encryption-2.21.ebuild
index 298e18f44af0..38b8bc1ae886 100644
--- a/net-im/gaim-encryption/gaim-encryption-2.21.ebuild
+++ b/net-im/gaim-encryption/gaim-encryption-2.21.ebuild
@@ -1,23 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/gaim-encryption-2.21.ebuild,v 1.9 2004/03/14 01:54:47 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/gaim-encryption-2.21.ebuild,v 1.10 2004/04/06 03:10:34 vapier Exp $
 
-IUSE=""
+inherit flag-o-matic
 
 DESCRIPTION="GAIM Encryption PlugIn"
 HOMEPAGE="http://gaim-encryption.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86 sparc amd64 ppc alpha ia64 hppa ~mips"
 
 DEPEND=">=net-im/gaim-0.75-r3
-		|| ( dev-libs/nss net-www/mozilla )"
+	|| ( dev-libs/nss net-www/mozilla )"
 
 src_compile() {
-
 	local myconf
 	myconf="--with-gaim=/usr/include/gaim"
 
@@ -40,5 +38,5 @@ src_compile() {
 
 src_install() {
 	einstall || die "Install failed"
-	dodoc CHANGELOG COPYING INSTALL NOTES README TODO VERSION WISHLIST
+	dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST
 }
diff --git a/net-im/gaim-encryption/gaim-encryption-2.22.ebuild b/net-im/gaim-encryption/gaim-encryption-2.22.ebuild
index a1593693cbf4..2cf440dc9959 100644
--- a/net-im/gaim-encryption/gaim-encryption-2.22.ebuild
+++ b/net-im/gaim-encryption/gaim-encryption-2.22.ebuild
@@ -1,23 +1,21 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/gaim-encryption-2.22.ebuild,v 1.1 2004/03/15 01:48:19 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim-encryption/gaim-encryption-2.22.ebuild,v 1.2 2004/04/06 03:10:34 vapier Exp $
 
-IUSE=""
+inherit flag-o-matic
 
 DESCRIPTION="GAIM Encryption PlugIn"
 HOMEPAGE="http://gaim-encryption.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-RESTRICT="nomirror"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc ~alpha ~ia64 ~hppa ~mips"
 
 DEPEND=">=net-im/gaim-0.75-r8
-		|| ( dev-libs/nss net-www/mozilla )"
+	|| ( dev-libs/nss net-www/mozilla )"
 
 src_compile() {
-
 	local myconf
 	myconf="--with-gaim=/usr/include/gaim"
 
@@ -40,5 +38,5 @@ src_compile() {
 
 src_install() {
 	einstall || die "Install failed"
-	dodoc CHANGELOG COPYING INSTALL NOTES README TODO VERSION WISHLIST
+	dodoc CHANGELOG INSTALL NOTES README TODO VERSION WISHLIST
 }
diff --git a/net-irc/ctrlproxy/ctrlproxy-2.0.ebuild b/net-irc/ctrlproxy/ctrlproxy-2.0.ebuild
deleted file mode 100644
index 76e37b4e5241..000000000000
--- a/net-irc/ctrlproxy/ctrlproxy-2.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.0.ebuild,v 1.3 2003/03/20 18:28:13 agriffis Exp $
-
-DESCRIPTION="IRC proxy with multiserver and multiclient support"
-HOMEPAGE="http://people.nl.linux.org/~jelmer/ctrlproxy.php"
-SRC_URI="http://people.nl.linux.org/~jelmer/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha"
-IUSE=""
-DEPEND=""
-
-src_compile() {
-	emake PREFIX=/usr CC="${CC} ${CFLAGS}" || die
-}
-
-src_install() {
-	make install DESTDIR=${D} PREFIX=/usr DOCDIR=/usr/share/doc/${P} || die
-	gzip ${D}/usr/share/doc/*/*
-	dodoc ctrlproxyrc.example
-}
diff --git a/net-irc/ctrlproxy/ctrlproxy-2.2.ebuild b/net-irc/ctrlproxy/ctrlproxy-2.2.ebuild
deleted file mode 100644
index d2180a97f47c..000000000000
--- a/net-irc/ctrlproxy/ctrlproxy-2.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.2.ebuild,v 1.5 2003/10/14 18:16:35 agriffis Exp $
-
-MY_P="${PN}_2.2-2"
-DESCRIPTION="IRC proxy with multiserver and multiclient support"
-HOMEPAGE="http://people.nl.linux.org/~jelmer/ctrlproxy.php"
-SRC_URI="http://people.nl.linux.org/~jelmer/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="alpha x86"
-IUSE=""
-DEPEND=">=dev-libs/glib-2"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	emake PREFIX=/usr CC="${CC} ${CFLAGS}" || die
-}
-
-src_install() {
-	make install DESTDIR=${D} PREFIX=/usr DOCDIR=/usr/share/doc/${P} || die
-	gzip ${D}/usr/share/doc/*/*
-	dodoc ctrlproxyrc.example
-}
diff --git a/net-irc/ctrlproxy/ctrlproxy-2.5.ebuild b/net-irc/ctrlproxy/ctrlproxy-2.5.ebuild
deleted file mode 100644
index 7c5e486d64d4..000000000000
--- a/net-irc/ctrlproxy/ctrlproxy-2.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.5.ebuild,v 1.2 2003/11/16 22:51:06 agriffis Exp $
-
-IUSE="ssl"
-
-DESCRIPTION="IRC proxy with multiserver and multiclient support"
-HOMEPAGE="http://jelmer.vernstok.nl/${PN}/"
-SRC_URI="http://jelmer.vernstok.nl/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha x86"
-IUSE=""
-DEPEND="
-	>=dev-libs/glib-2
-	dev-libs/popt
-	dev-libs/libxml2
-	dev-libs/tdb
-	dev-libs/libpcre
-	ssl? ( dev-libs/openssl )"
-
-src_compile() {
-	use alpha && append-flags -fPIC
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make install \
-		DESTDIR=${D} \
-		man1dir=/usr/share/man/man1 \
-		man5dir=/usr/share/man/man5 || die
-	gzip ${D}/usr/share/doc/*/*
-	dodoc ctrlproxyrc.example
-}
diff --git a/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild b/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild
index 41b194d4ebbf..dc8f3a0c322a 100644
--- a/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild
+++ b/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild
@@ -1,19 +1,19 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild,v 1.1 2004/01/08 19:15:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/ctrlproxy/ctrlproxy-2.6.ebuild,v 1.2 2004/04/06 03:11:38 vapier Exp $
 
-IUSE="ssl"
+inherit flag-o-matic
 
 DESCRIPTION="IRC proxy with multiserver and multiclient support"
 HOMEPAGE="http://jelmer.vernstok.nl/${PN}/"
 SRC_URI="http://jelmer.vernstok.nl/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
 
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~x86"
-IUSE=""
-DEPEND="
-	>=dev-libs/glib-2
+KEYWORDS="x86 alpha"
+IUSE="ssl"
+
+DEPEND=">=dev-libs/glib-2
 	dev-libs/popt
 	dev-libs/libxml2
 	dev-libs/tdb
diff --git a/net-irc/ctrlproxy/files/digest-ctrlproxy-2.0 b/net-irc/ctrlproxy/files/digest-ctrlproxy-2.0
deleted file mode 100644
index 9b3e10edb8c5..000000000000
--- a/net-irc/ctrlproxy/files/digest-ctrlproxy-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e9cccf105d470c05362560612253f6b2 ctrlproxy-2.0.tar.gz 3072
diff --git a/net-irc/ctrlproxy/files/digest-ctrlproxy-2.2 b/net-irc/ctrlproxy/files/digest-ctrlproxy-2.2
deleted file mode 100644
index 80892e1db2dc..000000000000
--- a/net-irc/ctrlproxy/files/digest-ctrlproxy-2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 98a61de42fd528b321b6c967bc59f526 ctrlproxy_2.2-2.tar.gz 2688
diff --git a/net-irc/ctrlproxy/files/digest-ctrlproxy-2.5 b/net-irc/ctrlproxy/files/digest-ctrlproxy-2.5
deleted file mode 100644
index f2d0ff811723..000000000000
--- a/net-irc/ctrlproxy/files/digest-ctrlproxy-2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 42ce7a61b3ca885f110125bfd28fff3e ctrlproxy-2.5.tar.gz 427684
diff --git a/net-libs/openh323/openh323-1.13.2-r1.ebuild b/net-libs/openh323/openh323-1.13.2-r1.ebuild
index b3020e401c19..6484753de09f 100644
--- a/net-libs/openh323/openh323-1.13.2-r1.ebuild
+++ b/net-libs/openh323/openh323-1.13.2-r1.ebuild
@@ -1,27 +1,24 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.2-r1.ebuild,v 1.5 2004/03/30 22:29:46 stkn Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.13.2-r1.ebuild,v 1.6 2004/04/06 03:12:17 vapier Exp $
 
-IUSE="ssl"
-
-inherit eutils
+inherit eutils flag-o-matic
 
 S=${WORKDIR}/${PN}
 DESCRIPTION="Open Source implementation of the ITU H.323 teleconferencing protocol"
 HOMEPAGE="http://www.openh323.org/"
 SRC_URI="http://www.gnomemeeting.org/admin/downloads/latest/sources/sources/${P}.tar.gz"
 
-SLOT="0"
 LICENSE="MPL-1.1"
+SLOT="0"
 KEYWORDS="~x86 ~sparc ~amd64 ~ppc"
+IUSE="ssl"
 
 DEPEND=">=sys-apps/sed-4
 	>=dev-libs/pwlib-1.6.3-r1
 	>=media-video/ffmpeg-0.4.7
 	ssl? ( dev-libs/openssl )"
 
-MAKEOPTS="${MAKEOPTS} -j1"
-
 pkg_setup() {
 	# to prevent merge problems with broken makefiles from old
 	# pwlib versions, we double-check here.
@@ -81,7 +78,7 @@ src_compile() {
 
 	use amd64 && append-flags -fPIC
 
-	emake ${makeopts} opt || die "make failed"
+	emake -j1 ${makeopts} opt || die "make failed"
 }
 
 src_install() {
diff --git a/net-mail/uw-imap/uw-imap-2002d-r1.ebuild b/net-mail/uw-imap/uw-imap-2002d-r1.ebuild
index bf87d1fa54ce..5220417af035 100644
--- a/net-mail/uw-imap/uw-imap-2002d-r1.ebuild
+++ b/net-mail/uw-imap/uw-imap-2002d-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2002d-r1.ebuild,v 1.2 2003/09/05 08:55:26 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2002d-r1.ebuild,v 1.3 2004/04/06 03:13:14 vapier Exp $
+
+inherit flag-o-matic
 
 MY_P=imap-${PV}
 S=${WORKDIR}/${MY_P}
diff --git a/net-mail/uw-imap/uw-imap-2002d.ebuild b/net-mail/uw-imap/uw-imap-2002d.ebuild
index 533dd6e6b69e..1a823fefebff 100644
--- a/net-mail/uw-imap/uw-imap-2002d.ebuild
+++ b/net-mail/uw-imap/uw-imap-2002d.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2002d.ebuild,v 1.6 2003/09/05 08:55:26 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2002d.ebuild,v 1.7 2004/04/06 03:13:14 vapier Exp $
+
+inherit flag-o-matic
 
 S=${WORKDIR}/imap-${PV}
 
diff --git a/net-mail/uw-imap/uw-imap-2002e-r1.ebuild b/net-mail/uw-imap/uw-imap-2002e-r1.ebuild
index 4b554482b594..174e330a632f 100644
--- a/net-mail/uw-imap/uw-imap-2002e-r1.ebuild
+++ b/net-mail/uw-imap/uw-imap-2002e-r1.ebuild
@@ -1,26 +1,27 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2002e-r1.ebuild,v 1.7 2004/02/05 07:18:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2002e-r1.ebuild,v 1.8 2004/04/06 03:13:14 vapier Exp $
+
+inherit flag-o-matic
 
 MY_P=imap-${PV}
 S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="UW server daemons for IMAP and POP network mail protocols."
-SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 HOMEPAGE="http://www.washington.edu/imap/"
+SRC_URI="ftp://ftp.cac.washington.edu/imap/${MY_P}.tar.Z"
 
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="x86 sparc ppc hppa alpha amd64"
 IUSE="ssl mbox pic"
 
-PROVIDE="virtual/imapd"
-PROVIDE="${PROVIDE} virtual/imap-c-client"
 DEPEND="!net-mail/vimap
 	!virtual/imap-c-client
 	virtual/glibc
 	>=sys-libs/pam-0.72
 	ssl? ( dev-libs/openssl )"
+PROVIDE="virtual/imapd virtual/imap-c-client"
 
 src_unpack() {
 	unpack ${A}
diff --git a/net-mail/uw-imap/uw-imap-2002e.ebuild b/net-mail/uw-imap/uw-imap-2002e.ebuild
index 393f9915a8b9..a7f4df21dffb 100644
--- a/net-mail/uw-imap/uw-imap-2002e.ebuild
+++ b/net-mail/uw-imap/uw-imap-2002e.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2002e.ebuild,v 1.2 2003/10/26 06:05:30 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/uw-imap/uw-imap-2002e.ebuild,v 1.3 2004/04/06 03:13:14 vapier Exp $
+
+inherit flag-o-matic
 
 MY_P=imap-${PV}
 S=${WORKDIR}/${MY_P}