USE deps instead of built_with_use.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

6 files changed, 18 insertions, 141 deletions

diff --git a/app-misc/g15composer/Manifest b/app-misc/g15composer/Manifest
index 6d56d24a385b..588c427472fe 100644
--- a/app-misc/g15composer/Manifest
+++ b/app-misc/g15composer/Manifest
@@ -1,23 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX g15composer-1.1.initd 737 RMD160 57b7f6135ab48dd587e793e74ce36de4d147be95 SHA1 01637e58637e0879a1b5e9cac926efa318dbee30 SHA256 fe12bcbe0d2a5a8cf7cab7e01bf50f73d37a03571b6b89b955106e5ff5591c69
 AUX g15composer-3.1.confd 695 RMD160 179650946e535b994d35c3913a7087d7f2154e68 SHA1 4f2ebfcae2649786876e0744ec3e6ecc0dd57281 SHA256 1f070d07b3a4956b7dfe584bdb25043d340314e8916cb2e00afa9060cf5488e6
 AUX g15composer-3.1.initd 1368 RMD160 3d478ac01259bec0f4c3d6ddb6ee97a22fd9518f SHA1 0b902ca423485d54888735fa0f7928cd32be0d9d SHA256 ac3ff78050b36ae62d67b27f760f712676a8394aaeb556510eaa8ebc29a46f19
 AUX g15composer-3.2.confd 695 RMD160 179650946e535b994d35c3913a7087d7f2154e68 SHA1 4f2ebfcae2649786876e0744ec3e6ecc0dd57281 SHA256 1f070d07b3a4956b7dfe584bdb25043d340314e8916cb2e00afa9060cf5488e6
 AUX g15composer-3.2.initd 1373 RMD160 70d1ec4d4780345f9e67a1833d12b4b81948ad75 SHA1 83c47cc19025ce125a8d232b64187fc29e3f3cc0 SHA256 2cc04630b66e4c335f5c791bf213edd543af4d3424c5fbc2e72b3ccdc243d01e
-DIST g15composer-1.1.tar.bz2 70140 RMD160 51d431adfc4469f8195c077d49e82b98bea04b57 SHA1 6b30f1c521fb1c45f7ce628fc812a09feb6e827a SHA256 52220b0e3e1219ecf5504f8b70d7be23a4e12d640b9367e34a3db6bbfe2dc2ef
 DIST g15composer-3.1.tar.bz2 104109 RMD160 ab31de24416452a8a363e0a0ae8856c21706b6fc SHA1 648117dde17d356878dd834de763004d6b6d8f0a SHA256 d8f34c1711e95f8ca3ddd9fd5f557a51bb23b79099fbf2fddb96bdcd03067988
 DIST g15composer-3.2.tar.bz2 105805 RMD160 0fb6a6b18dfda490847a226bdb4175d1102a35ae SHA1 db0085555a36720f6c0d57d32f4fe9549ec1e57a SHA256 0ae3fdac1dd5858bb7185ae5a50a6ff1c657a29d02b44c8a73f1c38cec17b035
-EBUILD g15composer-1.1.ebuild 1200 RMD160 3d8934a597ec8322728dbadbcf24182d768c78aa SHA1 c1cfd80b7da0894d8aacac64753aa4e03fa39ae8 SHA256 875846b60e0d3b8545a496ce6a328f0f2d7cf6bf935f1fb4bc559e337096214f
-EBUILD g15composer-3.1.ebuild 2022 RMD160 694280e6b714ffb050504eb8816d2d6c70014dff SHA1 f046a024b69ec8674072b20699766ad59bbefb61 SHA256 323ae38ce19f335ad38c4eb29a46ccbf11508c6fd28743285e562e41fa3a9de7
-EBUILD g15composer-3.2.ebuild 2024 RMD160 bb3b4f2894dac0b41dd9cf16a6beb004960f27cf SHA1 dd73e85cba840cf0b500196508ca0db11f036153 SHA256 600c6fe44cd06a9c676c27f881439cea65c718a848b2dced6ef7ebcd06395176
+EBUILD g15composer-3.1.ebuild 1516 RMD160 860d794628d675f4f559bef9de6a377239072de0 SHA1 1689661fabe84877e99b66cc858ae92b690620be SHA256 699ea5ebbdf17c1d8c922e04da5ec232b48ea62ff13d46c4cd0834647191ce13
+EBUILD g15composer-3.2.ebuild 1519 RMD160 42ec0e9124716ff389a94f5b2ff75a4c2b519be6 SHA1 9a6d7726a909b1ecee1ca7483f1b6e11ecf6b849 SHA256 20fc8837c52032ea39bcfcc9b8584e216039299057cbdde337f199f1b5f4b7ef
 MISC ChangeLog 3433 RMD160 29b411dc4054c4865ec3f8f00fa4ced8cabd2eab SHA1 6ca45f6c48b4c8764ae6a7a3ae36e0d18b6ee470 SHA256 e4fb67def1c11a72b7609f28adbeca5b34078d80af53169aa462ce4f5d159623
 MISC metadata.xml 330 RMD160 34744015c5854172f35f7b473d53b00fc9b4fd89 SHA1 4ca4b886742a389891563f4abaa1e7bfd88be38a SHA256 af26b09b482046ec1d7f5a6a429b56918ffd7f84ad7fe30a4d32fe4e263682df
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkiR5BAACgkQOeoy/oIi7uyd7ACeKHHJz6ruytZrSugdX+esTpXH
-ovYAoOSRHi7LcAnkYKuj3IAZZV+kZIF7
-=x6uP
------END PGP SIGNATURE-----
diff --git a/app-misc/g15composer/files/g15composer-1.1.initd b/app-misc/g15composer/files/g15composer-1.1.initd
deleted file mode 100644
index 3c1c4717307b..000000000000
--- a/app-misc/g15composer/files/g15composer-1.1.initd
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/files/g15composer-1.1.initd,v 1.1 2006/10/24 07:41:11 jokey Exp $
-
-depend() {
-	need g15daemon
-}
-
-start() {
-	NODE="/dev/${SVCNAME}"
-	ebegin "Starting ${SVCNAME}"
-	mknod -m720 "${NODE}" p
-	chgrp users "${NODE}"
-	PIDFILE=/var/run/${SVCNAME}.pid
-	start-stop-daemon --start --background --pidfile ${PIDFILE} --make-pidfile --exec /usr/bin/g15composer -- "${NODE}"
-	eend $?
-}
-
-stop() {
-	ebegin "Stoping ${SVCNAME}"
-	PIDFILE=/var/run/${SVCNAME}.pid
-	start-stop-daemon --stop --pidfile ${PIDFILE} --name g15composer
-	NODE="/dev/${SVCNAME}"
-	rm "${NODE}"
-	eend $?
-}
\ No newline at end of file
diff --git a/app-misc/g15composer/g15composer-1.1.ebuild b/app-misc/g15composer/g15composer-1.1.ebuild
deleted file mode 100644
index e32d20a8b260..000000000000
--- a/app-misc/g15composer/g15composer-1.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-1.1.ebuild,v 1.7 2007/03/15 10:44:39 rbu Exp $
-
-inherit eutils
-
-DESCRIPTION="A library to render text and shapes into a buffer usable by the Logitech G15 keyboard"
-HOMEPAGE="http://g15tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="truetype"
-
-RDEPEND="app-misc/g15daemon
-	dev-libs/libg15render
-	truetype? ( media-libs/freetype )"
-
-DEPEND="${RDEPEND}
-	dev-libs/libg15"
-
-RDEPEND="${RDEPEND}
-	sys-apps/coreutils"
-
-pkg_setup() {
-	if use truetype && ! built_with_use dev-libs/libg15render truetype ; then
-		eerror "dev-libs/libg15render must be built with USE=\"truetype\" for truetype to work."
-		die "Please rebuild the package with corrected USE flags."
-	fi
-}
-
-src_compile() {
-	econf \
-		$(use_enable truetype ttf ) \
-		|| die "configure failed"
-
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	newinitd "${FILESDIR}/${P}.initd" g15composer
-
-	dodoc AUTHORS README ChangeLog
-}
diff --git a/app-misc/g15composer/g15composer-3.1.ebuild b/app-misc/g15composer/g15composer-3.1.ebuild
index 1cf80eea4508..c6c32dafb846 100644
--- a/app-misc/g15composer/g15composer-3.1.ebuild
+++ b/app-misc/g15composer/g15composer-3.1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-3.1.ebuild,v 1.8 2008/02/21 23:52:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-3.1.ebuild,v 1.9 2009/08/15 12:42:57 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="A library to render text and shapes into a buffer usable by the Logitech G15 keyboard"
@@ -14,35 +15,16 @@ KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="amarok truetype examples"
 
 DEPEND="app-misc/g15daemon
-	>=dev-libs/libg15render-1.2
+	>=dev-libs/libg15render-1.2[truetype?]
 	truetype? ( media-libs/freetype )
-	amarok? ( kde-base/kdelibs )"
-
+	amarok? ( kde-base/kdelibs
+		dev-lang/perl[ithreads] )"
 RDEPEND="${DEPEND}
 	amarok? ( dev-perl/DCOP-Amarok-Player )"
 
-pkg_setup() {
-	local failure=false
-	echo
-	if use amarok && ! built_with_use dev-lang/perl ithreads ; then
-		eerror "dev-lang/perl must be built with USE=\"ithreads\" for the Amarok display to work."
-		failure=true
-	fi
-	if use truetype && ! built_with_use dev-libs/libg15render truetype ; then
-		eerror "dev-libs/libg15render must be built with USE=\"truetype\" for truetype to work."
-		failure=true
-	fi
-	if ${failure}; then
-		die "Please rebuild the packages with corrected USE flags."
-	fi
-}
-
-src_compile() {
+src_configure() {
 	econf \
-		$(use_enable truetype ttf ) \
-		|| die "configure failed"
-
-	emake || die "make failed"
+		$(use_enable truetype ttf)
 }
 
 src_install() {
diff --git a/app-misc/g15composer/g15composer-3.2.ebuild b/app-misc/g15composer/g15composer-3.2.ebuild
index 6c860b4bc656..e90a36cb5cfa 100644
--- a/app-misc/g15composer/g15composer-3.2.ebuild
+++ b/app-misc/g15composer/g15composer-3.2.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-3.2.ebuild,v 1.2 2008/02/21 23:52:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15composer/g15composer-3.2.ebuild,v 1.3 2009/08/15 12:42:57 ssuominen Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="A library to render text and shapes into a buffer usable by the Logitech G15 keyboard"
@@ -14,39 +15,20 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="amarok truetype examples"
 
 DEPEND="app-misc/g15daemon
-	>=dev-libs/libg15render-1.2
+	>=dev-libs/libg15render-1.2[truetype?]
 	truetype? ( media-libs/freetype )
-	amarok? ( kde-base/kdelibs )"
-
+	amarok? ( kde-base/kdelibs
+		dev-lang/perl[ithreads] )"
 RDEPEND="${DEPEND}
 	amarok? ( dev-perl/DCOP-Amarok-Player )"
 
-pkg_setup() {
-	local failure=false
-	echo
-	if use amarok && ! built_with_use dev-lang/perl ithreads ; then
-		eerror "dev-lang/perl must be built with USE=\"ithreads\" for the Amarok display to work."
-		failure=true
-	fi
-	if use truetype && ! built_with_use dev-libs/libg15render truetype ; then
-		eerror "dev-libs/libg15render must be built with USE=\"truetype\" for truetype to work."
-		failure=true
-	fi
-	if ${failure}; then
-		die "Please rebuild the packages with corrected USE flags."
-	fi
-}
-
-src_compile() {
+src_configure() {
 	econf \
-		$(use_enable truetype ttf ) \
-		|| die "configure failed"
-
-	emake || die "make failed"
+		$(use_enable truetype ttf)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	newinitd "${FILESDIR}/${P}.initd" ${PN}
 	newconfd "${FILESDIR}/${P}.confd" ${PN}
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index e842409e7b7b..f8bcb6098ec6 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -2,6 +2,6 @@ AUX geneweb-5.01-gentoo.patch 648 RMD160 40a92608cf99934be66c9b54233305b502c73d4
 AUX geneweb.confd 67 RMD160 4de8a9e76c426dc7435d197bef470ea369be3b1d SHA1 a20103555d17633fc08dfc442e746d4fe117867b SHA256 0b2044dc633d95f953b9af6964a54c07d60784dda03c970dba97ca1026c016f1
 AUX geneweb.initd 539 RMD160 7598ae2d7b6a168a61942919b5e960732fa157fc SHA1 b660d4a2823cb8cab1bc476c1ca043af5a0a764a SHA256 b8542f690d933f6fa844cce3e74eec3d625a92e8bd825a8c71b2097b61b60973
 DIST geneweb-5.01.tgz 1388008 RMD160 75507bb35df74b92becc8514c9ad82c8f4ef886e SHA1 4443b12d88cc8a6fa04ae903ace3f7bdb384d40e SHA256 dcc6b2ea4659e8dc816ab3ea573d9177bdd83597c36d8628f9ce1dbc30a28e6c
-EBUILD geneweb-5.01-r1.ebuild 2609 RMD160 d3fe8c1ac0cd990c01f412c62d8aae9a0abe0991 SHA1 d72407770b7576657362d6ca9586d647728e715a SHA256 50f5970d688d76840252107c0034fe7a7e3730f65bf8acce90a68c48c3f2204b
+EBUILD geneweb-5.01-r1.ebuild 2250 RMD160 8ad5c91171d2002c3212661e5f00355c63d05d95 SHA1 ac21cd20862dc25b387bfaa987cfa164d291f827 SHA256 64f1ab7e7ce1e4ec7acdeed1d91059e0e88867e7fdf524b3c48a01b7977f2a88
 MISC ChangeLog 1961 RMD160 261f3f2a9eb3b5996dccb26ed0737504e673429a SHA1 a6215bf72eb89e20bcc8dcf9cbfe1fee6d1984fa SHA256 122b626e4860ac139cbcec938708c4aa7d17ad4766bd9ccb3ee528f2332a78bc
 MISC metadata.xml 684 RMD160 5c80e490f6819d158bd3815482669ec6be63b535 SHA1 eae296c03121fb46e2eb2616147489d7249aa412 SHA256 36faaf48c73c074357d736ae887d64f49e0f43de0917ff1a765858eace2572d8