From: Samuli Suominen Date: Fri, 9 Mar 2007 08:15:47 +0000 (+0000) Subject: Stop using virtual/x11 and eutils.eclass because it had no use. Start using emake... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4920d585795453c046547d721003959fade1e1cc;p=gentoo.git Stop using virtual/x11 and eutils.eclass because it had no use. Start using emake. Fix quoting and sort deps. Package-Manager: portage-2.1.2.2 --- diff --git a/x11-misc/fireflies/ChangeLog b/x11-misc/fireflies/ChangeLog index 97cbbcb218d3..5d0ab91992d5 100644 --- a/x11-misc/fireflies/ChangeLog +++ b/x11-misc/fireflies/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/fireflies -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.14 2006/10/14 16:53:58 nelchael Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/ChangeLog,v 1.15 2007/03/09 08:15:47 drac Exp $ + + 09 Mar 2007; Samuli Suominen fireflies-2.07.ebuild: + Stop using virtual/x11 and eutils.eclass because it had no use. Start using + emake. Fix quoting and sort deps. 14 Oct 2006; Krzysiek Pawlik -fireflies-2.06-r1.ebuild: diff --git a/x11-misc/fireflies/Manifest b/x11-misc/fireflies/Manifest index 001612e76430..fdbbd8d19dd4 100644 --- a/x11-misc/fireflies/Manifest +++ b/x11-misc/fireflies/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX fireflies-2.06-Make.include.in.patch 667 RMD160 0195b74c8dd8c7a243ca13ad8ae76e5c8bf70433 SHA1 7c02aa8eed028deae73ec151dbe2d35bce596707 SHA256 c6c313a777cb45d77711093703b0d54651d9200887d275e5f7730d6b1f1a0654 MD5 8f06653a37476519552c8ed711defae0 files/fireflies-2.06-Make.include.in.patch 667 RMD160 0195b74c8dd8c7a243ca13ad8ae76e5c8bf70433 files/fireflies-2.06-Make.include.in.patch 667 @@ -10,14 +7,14 @@ MD5 657df9334348d7fe6574bb1607f08b01 files/fireflies-2.06-configure.patch 412 RMD160 df8c28d128a9a09d26ebe27c29d94ed85c4cae37 files/fireflies-2.06-configure.patch 412 SHA256 db9cf3efcb1e8f29f1644dce6745a014d8f966d37240a473d588f41823cbb31c files/fireflies-2.06-configure.patch 412 DIST fireflies-2.07.tar.gz 199917 RMD160 fb835d27da9679cd5545ae8fdbfe53f604987853 SHA1 83e773fef820e4a39119efd0d6b4000cb3d00147 SHA256 e215d5306340aed25a103bd6af34b6d3ef0d9f2628c56d3a67b2eb4a9f19a648 -EBUILD fireflies-2.07.ebuild 1057 RMD160 a99cb2255ad4f1fc838dfafb077cbb45a7517fc5 SHA1 f4e6586f16db3d073dfedddc2c0b49c0df8e16c6 SHA256 9b63346a11ee822e494c7264d51ecefc783a9ff035a73759ea724647af193830 -MD5 889bb97cccee18d9f1e1440c401f9f4d fireflies-2.07.ebuild 1057 -RMD160 a99cb2255ad4f1fc838dfafb077cbb45a7517fc5 fireflies-2.07.ebuild 1057 -SHA256 9b63346a11ee822e494c7264d51ecefc783a9ff035a73759ea724647af193830 fireflies-2.07.ebuild 1057 -MISC ChangeLog 1963 RMD160 36c916e017fbbed98c897d2c0a193228421533aa SHA1 656e7916d8999e7d9afa468844bed53638c8df94 SHA256 46657619ae084bb5ae71189ad165df303110552b814020dc6187a6409e85747e -MD5 b6403de17a6f83352fa9c9edc23fe36e ChangeLog 1963 -RMD160 36c916e017fbbed98c897d2c0a193228421533aa ChangeLog 1963 -SHA256 46657619ae084bb5ae71189ad165df303110552b814020dc6187a6409e85747e ChangeLog 1963 +EBUILD fireflies-2.07.ebuild 944 RMD160 7734dd30495fe21c53922773d7aa08c8ca0843f8 SHA1 e0fe45cb3d431699153dc630ba451a792032465f SHA256 5321ae59c941345bfe68fa09e3d8d5e93d97464311990450b85072683f368588 +MD5 e816a88b049d0b16a37ac7fcf66c9787 fireflies-2.07.ebuild 944 +RMD160 7734dd30495fe21c53922773d7aa08c8ca0843f8 fireflies-2.07.ebuild 944 +SHA256 5321ae59c941345bfe68fa09e3d8d5e93d97464311990450b85072683f368588 fireflies-2.07.ebuild 944 +MISC ChangeLog 2146 RMD160 28ce2dd36183ba311c2d74a733fdb14b108af618 SHA1 329ae03514ee27f8e54517993050fba4405d88c0 SHA256 83d0be2619291e249361c332713eb8f6ae9e9cd7679c92d54a45b98d217885a7 +MD5 c8712b1460691b8c36f57387ac0b38fd ChangeLog 2146 +RMD160 28ce2dd36183ba311c2d74a733fdb14b108af618 ChangeLog 2146 +SHA256 83d0be2619291e249361c332713eb8f6ae9e9cd7679c92d54a45b98d217885a7 ChangeLog 2146 MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e metadata.xml 173 @@ -25,10 +22,3 @@ SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f metadata MD5 310c5833bbafb660055f75156b39a437 files/digest-fireflies-2.07 244 RMD160 24afa60528ae4242a82aca2f2ea4da0eefc30e40 files/digest-fireflies-2.07 244 SHA256 435e8e1c545ac699222874412a42c8c83133562bb8f1ff3a39698fded5bd0279 files/digest-fireflies-2.07 244 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFMRZNgo/w9rxVVVERAtarAJ0V0B+BiD3yJMS55sMJTb9qwunHRwCfQ8cV -Zva+UN0IJY8nrsKxok7rhIA= -=eldD ------END PGP SIGNATURE----- diff --git a/x11-misc/fireflies/fireflies-2.07.ebuild b/x11-misc/fireflies/fireflies-2.07.ebuild index 5dd0d8a4da1e..9adb2b4d1dbc 100644 --- a/x11-misc/fireflies/fireflies-2.07.ebuild +++ b/x11-misc/fireflies/fireflies-2.07.ebuild @@ -1,10 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/fireflies-2.07.ebuild,v 1.1 2006/07/01 20:07:58 nelchael Exp $ - -inherit eutils - -IUSE="" +# $Header: /var/cvsroot/gentoo-x86/x11-misc/fireflies/fireflies-2.07.ebuild,v 1.2 2007/03/09 08:15:47 drac Exp $ DESCRIPTION="Fireflies screensaver: Wicked cool eye candy" HOMEPAGE="http://somewhere.fscked.org/fireflies/" @@ -14,17 +10,14 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86" -RDEPEND="|| ( media-libs/mesa virtual/x11 ) - media-libs/libsdl" -DEPEND="${RDEPEND} - || ( ( - x11-proto/xproto - x11-libs/libX11 ) - virtual/x11 )" +RDEPEND="media-libs/mesa + media-libs/libsdl + x11-libs/libX11" +DEPEND="${RDEPEND}" src_unpack() { unpack ${A} - cd ${S} + cd "${S}" epatch ${FILESDIR}/${PN}-2.06-configure.patch epatch ${FILESDIR}/${PN}-2.06-Make.include.in.patch } @@ -33,13 +26,13 @@ src_compile() { local myconf myconf="--with-bindir=/usr/lib/misc/xscreensaver - --with-confdir=/usr/share/xscreensaver/config/" + --with-confdir=/usr/share/xscreensaver/config" - econf ${myconf} || die "econf failed" - emake || die "emake failed" + econf ${myconf} + emake || die "emake failed." } src_install() { - make DESTDIR=${D} install || die "install failed" - dodoc COMPILE README TODO + emake DESTDIR=${D} install || die "emake install failed." + dodoc README TODO }