inherit flag-o-matic

17 files changed, 38 insertions, 143 deletions

diff --git a/net-misc/ntp/ntp-4.1.2.ebuild b/net-misc/ntp/ntp-4.1.2.ebuild
index 240a850c0f81..4288a681984b 100644
--- a/net-misc/ntp/ntp-4.1.2.ebuild
+++ b/net-misc/ntp/ntp-4.1.2.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-misc/ntp/ntp-4.1.2.ebuild,v 1.32 2004/04/05 23:17:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.1.2.ebuild,v 1.33 2004/04/06 03:13:47 vapier Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="Network Time Protocol suite/programs"
 HOMEPAGE="http://www.ntp.org/"
diff --git a/net-misc/ntp/ntp-4.2.0-r2.ebuild b/net-misc/ntp/ntp-4.2.0-r2.ebuild
index 7fb24d0887c7..dc105f36b1ef 100644
--- a/net-misc/ntp/ntp-4.2.0-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.0-r2.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-misc/ntp/ntp-4.2.0-r2.ebuild,v 1.1 2004/04/05 23:23:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0-r2.ebuild,v 1.2 2004/04/06 03:13:47 vapier Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="Network Time Protocol suite/programs"
 HOMEPAGE="http://www.ntp.org/"
diff --git a/net-www/galeon/galeon-1.2.12.ebuild b/net-www/galeon/galeon-1.2.12.ebuild
index 253a22f02f1b..35bc27c02191 100644
--- a/net-www/galeon/galeon-1.2.12.ebuild
+++ b/net-www/galeon/galeon-1.2.12.ebuild
@@ -1,10 +1,10 @@
-# 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-www/galeon/galeon-1.2.12.ebuild,v 1.2 2003/12/07 14:39:06 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/galeon/galeon-1.2.12.ebuild,v 1.3 2004/04/06 03:14:02 vapier Exp $
 
 IUSE="nls"
 
-inherit eutils libtool gnome.org
+inherit eutils libtool gnome.org flag-o-matic
 
 DESCRIPTION="A GNOME Web browser based on gecko (mozilla's rendering engine)"
 SRC_URI="http://download.sourceforge.net/${PN}/${P}.tar.gz
diff --git a/sys-apps/pciutils/files/digest-pciutils-2.1.10-r1 b/sys-apps/pciutils/files/digest-pciutils-2.1.10-r1
deleted file mode 100644
index 03ed63c325cc..000000000000
--- a/sys-apps/pciutils/files/digest-pciutils-2.1.10-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b589225945b445b0e4c5801a15b16b79 pciutils-2.1.10.tar.gz 111028
diff --git a/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild b/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
deleted file mode 100644
index 5ee20874144f..000000000000
--- a/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.10-r1.ebuild,v 1.13 2004/02/23 00:48:30 agriffis Exp $
-
-inherit eutils
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 amd64 ppc sparc alpha hppa "
-
-DEPEND="virtual/glibc
-	net-misc/wget"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/pcimodules-pciutils-2.1.8.diff
-
-	cp Makefile Makefile.orig
-	sed -e "s:-O2:${CFLAGS}:" -e "s:-Werror::g" Makefile.orig > Makefile
-
-	make update-ids
-
-	if [ ! -f pci.ids ] ; then mv pci.ids.orig pci.ids ; fi
-}
-
-src_compile() {
-	make PREFIX=/usr lib/config.h || die
-
-	cd ${S}/lib
-	cp config.h config.h.orig
-	sed -e "s:/usr/share/pci.ids:/usr/share/misc/pci.ids:" config.h.orig > config.h || die
-
-	cd ${S}
-	make PREFIX=/usr || die
-}
-
-src_install () {
-	into /
-	dosbin setpci lspci pcimodules
-	doman *.8
-
-	insinto /usr/share/misc
-	doins pci.ids
-
-	dolib lib/libpci.a
-
-	insinto /usr/include/pci
-	doins lib/*.h
-}
diff --git a/sys-apps/pciutils/pciutils-2.1.11-r1.ebuild b/sys-apps/pciutils/pciutils-2.1.11-r1.ebuild
index c9d50414943b..86589c1ec923 100644
--- a/sys-apps/pciutils/pciutils-2.1.11-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.11-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/sys-apps/pciutils/pciutils-2.1.11-r1.ebuild,v 1.7 2004/04/01 21:26:37 ciaranm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11-r1.ebuild,v 1.8 2004/04/06 03:15:15 vapier Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
 DESCRIPTION="Various utilities dealing with the PCI bus"
 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
@@ -15,8 +15,6 @@ KEYWORDS="~x86 ~ppc sparc ~alpha ~hppa ~ia64 ~ppc64 ~amd64 ppc64 ~mips"
 DEPEND="virtual/glibc
 	net-misc/wget"
 
-[ "${ARCH}" = "amd64" ] && append-flags -fPIC
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -24,6 +22,7 @@ src_unpack() {
 	epatch ${FILESDIR}/pcimodules-${P}.diff
 	epatch ${FILESDIR}/${PV}-sysfs.patch #38645
 
+	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
 	sed -i "s:-O2:${CFLAGS}:" Makefile
 
 	./update-pciids.sh
@@ -45,11 +44,11 @@ src_compile() {
 
 src_install() {
 	into /
-	dosbin setpci lspci pcimodules update-pciids
+	dosbin setpci lspci pcimodules update-pciids || die
 	doman *.8
 
 	insinto /usr/share/misc
-	doins pci.ids
+	doins pci.ids || die
 
 	into /usr
 	dolib lib/libpci.a
diff --git a/sys-apps/pciutils/pciutils-2.1.11.ebuild b/sys-apps/pciutils/pciutils-2.1.11.ebuild
index e149ad4dbd57..612c8137154e 100644
--- a/sys-apps/pciutils/pciutils-2.1.11.ebuild
+++ b/sys-apps/pciutils/pciutils-2.1.11.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11.ebuild,v 1.12 2004/02/23 00:48:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pciutils/pciutils-2.1.11.ebuild,v 1.13 2004/04/06 03:15:15 vapier Exp $
 
-inherit eutils
+inherit eutils flag-o-matic
 
-S=${WORKDIR}/${P}
 DESCRIPTION="Various utilities dealing with the PCI bus"
 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html"
 SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/${P}.tar.gz"
@@ -16,14 +15,13 @@ KEYWORDS="x86 amd64 ppc sparc alpha hppa ia64 ~ppc64"
 DEPEND="virtual/glibc
 	net-misc/wget"
 
-[ "${ARCH}" = "amd64" ] && append-flags -fPIC
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 
 	epatch ${FILESDIR}/pcimodules-${P}.diff
 
+	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
 	sed -i "s:-O2:${CFLAGS}:" Makefile
 
 	./update-pciids.sh
diff --git a/sys-devel/gcc-sparc64/gcc-sparc64-3.2.3.ebuild b/sys-devel/gcc-sparc64/gcc-sparc64-3.2.3.ebuild
index 232a257336d1..284043931dd0 100644
--- a/sys-devel/gcc-sparc64/gcc-sparc64-3.2.3.ebuild
+++ b/sys-devel/gcc-sparc64/gcc-sparc64-3.2.3.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.2.3.ebuild,v 1.3 2004/01/07 20:49:49 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.2.3.ebuild,v 1.4 2004/04/06 03:17:06 vapier Exp $
 
+inherit flag-o-matic
 
 # Variables 
 MYARCH="$(echo ${PN} | cut -d- -f2)"
diff --git a/sys-devel/gcc-sparc64/gcc-sparc64-3.3.1.ebuild b/sys-devel/gcc-sparc64/gcc-sparc64-3.3.1.ebuild
index bb110be938e9..414dc9a7f851 100644
--- a/sys-devel/gcc-sparc64/gcc-sparc64-3.3.1.ebuild
+++ b/sys-devel/gcc-sparc64/gcc-sparc64-3.3.1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.3.1.ebuild,v 1.3 2004/01/07 20:49:49 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.3.1.ebuild,v 1.4 2004/04/06 03:17:06 vapier Exp $
 
+inherit flag-o-matic
 
 # Variables 
 MYARCH="$(echo ${PN} | cut -d- -f2)"
diff --git a/sys-devel/gcc-sparc64/gcc-sparc64-3.3.2.ebuild b/sys-devel/gcc-sparc64/gcc-sparc64-3.3.2.ebuild
index 4f3785788887..5571acb98e12 100644
--- a/sys-devel/gcc-sparc64/gcc-sparc64-3.3.2.ebuild
+++ b/sys-devel/gcc-sparc64/gcc-sparc64-3.3.2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.3.2.ebuild,v 1.3 2004/01/07 20:49:49 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.3.2.ebuild,v 1.4 2004/04/06 03:17:06 vapier Exp $
 
+inherit flag-o-matic
 
 # Variables 
 MYARCH="$(echo ${PN} | cut -d- -f2)"
diff --git a/sys-devel/gcc-sparc64/gcc-sparc64-3.3.3.ebuild b/sys-devel/gcc-sparc64/gcc-sparc64-3.3.3.ebuild
index f73d04a19700..4c55708688c8 100644
--- a/sys-devel/gcc-sparc64/gcc-sparc64-3.3.3.ebuild
+++ b/sys-devel/gcc-sparc64/gcc-sparc64-3.3.3.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.3.3.ebuild,v 1.2 2004/03/26 14:40:08 weeve Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-sparc64/gcc-sparc64-3.3.3.ebuild,v 1.3 2004/04/06 03:17:06 vapier Exp $
 
 # Variables 
-inherit eutils
+inherit eutils flag-o-matic
 MYARCH="$(echo ${PN} | cut -d- -f2)"
 TMP_P="${P/-${MYARCH}/}"
 TMP_PN="${PN/-${MYARCH}/}"
diff --git a/sys-fs/devfsd/devfsd-1.3.25-r6.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r6.ebuild
index 46474baa6326..80158c46b539 100644
--- a/sys-fs/devfsd/devfsd-1.3.25-r6.ebuild
+++ b/sys-fs/devfsd/devfsd-1.3.25-r6.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/sys-fs/devfsd/devfsd-1.3.25-r6.ebuild,v 1.1 2004/03/16 21:33:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r6.ebuild,v 1.2 2004/04/06 03:17:56 vapier Exp $
 
 IUSE=""
 
-inherit eutils
+inherit eutils flag-o-matic
 
 S="${WORKDIR}/${PN}"
 DESCRIPTION="Daemon for the Linux Device Filesystem"
diff --git a/sys-fs/devfsd/devfsd-1.3.25-r7.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r7.ebuild
index bb019a22409b..a9a70fdd8093 100644
--- a/sys-fs/devfsd/devfsd-1.3.25-r7.ebuild
+++ b/sys-fs/devfsd/devfsd-1.3.25-r7.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/sys-fs/devfsd/devfsd-1.3.25-r7.ebuild,v 1.1 2004/03/16 21:33:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r7.ebuild,v 1.2 2004/04/06 03:17:56 vapier Exp $
 
 IUSE=""
 
-inherit eutils
+inherit eutils flag-o-matic
 
 S="${WORKDIR}/${PN}"
 DESCRIPTION="Daemon for the Linux Device Filesystem"
diff --git a/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild b/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild
index b18172b63f12..1eb893db27c5 100644
--- a/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild
+++ b/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild
@@ -1,24 +1,22 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild,v 1.1 2004/03/16 21:33:00 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/devfsd/devfsd-1.3.25-r8.ebuild,v 1.2 2004/04/06 03:17:56 vapier Exp $
 
-IUSE=""
+inherit eutils flag-o-matic
 
-inherit eutils
-
-S="${WORKDIR}/${PN}"
 DESCRIPTION="Daemon for the Linux Device Filesystem"
 HOMEPAGE="http://www.atnf.csiro.au/~rgooch/linux/"
 SRC_URI="ftp://ftp.atnf.csiro.au/pub/people/rgooch/linux/daemons/devfsd/devfsd-v${PV}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~hppa ia64 ppc64 s390"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips hppa ~amd64 ia64 ppc64 s390"
 
 DEPEND="virtual/glibc"
-
 PROVIDE="virtual/dev-manager"
 
+S=${WORKDIR}/${PN}
+
 src_unpack() {
 	unpack ${A}
 
@@ -44,6 +42,5 @@ src_install() {
 	#config file is handled in baselayout
 	rm -f ${D}/etc/devfsd.conf
 
-	dodoc devfsd.conf COPYING* INSTALL
+	dodoc devfsd.conf INSTALL
 }
-
diff --git a/x11-wm/golem/files/digest-golem-0.0.5 b/x11-wm/golem/files/digest-golem-0.0.5
deleted file mode 100644
index 99a37c6c1a21..000000000000
--- a/x11-wm/golem/files/digest-golem-0.0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 09f503f5c6e621e5029e845682a8c941 golem-0.0.5.tar.gz 748348
diff --git a/x11-wm/golem/golem-0.0.5-r1.ebuild b/x11-wm/golem/golem-0.0.5-r1.ebuild
index 63faaf412399..4bc2bc8e2418 100644
--- a/x11-wm/golem/golem-0.0.5-r1.ebuild
+++ b/x11-wm/golem/golem-0.0.5-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/x11-wm/golem/golem-0.0.5-r1.ebuild,v 1.3 2004/03/01 04:47:14 jhuebel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/golem/golem-0.0.5-r1.ebuild,v 1.4 2004/04/06 03:18:42 vapier Exp $
+
+inherit flag-o-matic
 
 DESCRIPTION="Small window manager with themes and plugins"
 HOMEPAGE="http://golem.sourceforge.net/"
@@ -15,8 +17,6 @@ DEPEND="virtual/glibc
 	virtual/x11
 	esd? ( media-sound/esound )"
 
-S="${WORKDIR}/${P}"
-
 src_compile() {
 	use amd64 && append-flags -fPIC
 	econf \
@@ -42,4 +42,3 @@ pkg_postinst() {
 	einfo "The user you intend to use golem as (not root!!),"
 	einfo "just type golem.install"
 }
-
diff --git a/x11-wm/golem/golem-0.0.5.ebuild b/x11-wm/golem/golem-0.0.5.ebuild
deleted file mode 100644
index d74be6ed3f00..000000000000
--- a/x11-wm/golem/golem-0.0.5.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/golem/golem-0.0.5.ebuild,v 1.3 2003/07/31 01:46:03 matsuu Exp $
-
-DESCRIPTION="Small window manager with themes and plugins"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://golem.sourceforge.net/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="nls"
-
-DEPEND="virtual/glibc
-	virtual/x11"
-
-S="${WORKDIR}/${P}"
-
-src_compile() {
-	local myconf
-	use nls && myconf="${myconf} --enable-i18n"
-
-	econf \
-		--prefix=/usr \
-		--datadir=/usr/share \
-		${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	dosed "s/BINDIR=	*/BINDIR=/" /usr/bin/golem.install
-	dosed "s/DATADIR=	*/DATADIR=/" /usr/bin/golem.install
-
-	dodoc LICENSE PLUGINS README THEMES TODO
-
-	einfo "The user you intend to use golem as (not root!!),"
-	einfo "just type golem.install"
-}
-