Kill virtual/x11. Use emake. Add some quoting..

Package-Manager: portage-2.1.2-r13

diff --git a/x11-misc/dclock/ChangeLog b/x11-misc/dclock/ChangeLog
index b6ba42ade785682a1e92ca13beb7614ac4f889a1..e894c2f6bb51644f885eb3b6f7333e3af7beec78 100644 (file)
--- a/x11-misc/dclock/ChangeLog
+++ b/x11-misc/dclock/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/dclock
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dclock/ChangeLog,v 1.10 2006/10/14 16:49:42 nelchael Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dclock/ChangeLog,v 1.11 2007/03/02 20:26:27 drac Exp $
+
+  02 Mar 2007; Samuli Suominen <drac@gentoo.org> dclock-2.1.2_p8.ebuild:
+  Kill virtual/x11. Use emake.
 
   14 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   -dclock-2.1.2_p5.ebuild:

diff --git a/x11-misc/dclock/Manifest b/x11-misc/dclock/Manifest
index 9442fea12523d0346be4fcc8a9e826115de4a26d..a352ef08ad69eeab2ef0cde8529cd11544da3e52 100644 (file)
--- a/x11-misc/dclock/Manifest
+++ b/x11-misc/dclock/Manifest
@@ -1,16 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST dclock_2.1.2-8.diff.gz 5247 RMD160 8e12ccb6d1975e86ca188d738f150feabf65ae50 SHA1 2e43603d2059510f90b679cbfe0a2ef46ad8e4f2 SHA256 52fb10719e998ace55676c665f5b6eba348f3d8f6083c636942a145edfb0334b
 DIST dclock_2.1.2.orig.tar.gz 51418 RMD160 d0e49753d60719ae68a1a47d28269524c9b406fc SHA1 20f1945675175e022a2ae38af8f629456f3fe02e SHA256 e613b2ea01e7bc41c1ae76b2ae7a5ad81805e2aba29c0e843fa2f9b28518136e
-EBUILD dclock-2.1.2_p8.ebuild 1219 RMD160 200ae0e667df664cf0af1084465483777a69fb96 SHA1 80b0a7d8c2608bf9c7cd13c4ef2e4f71d071321c SHA256 983ad7984e1d56da94a43fe32ab2b2c0fd20e3ab57e8a1b743e5199d12104700
-MD5 58cf2933fbf58303937393364a69cfce dclock-2.1.2_p8.ebuild 1219
-RMD160 200ae0e667df664cf0af1084465483777a69fb96 dclock-2.1.2_p8.ebuild 1219
-SHA256 983ad7984e1d56da94a43fe32ab2b2c0fd20e3ab57e8a1b743e5199d12104700 dclock-2.1.2_p8.ebuild 1219
-MISC ChangeLog 1287 RMD160 912b38ecf6bbb75c73850a99b26927a967356e2e SHA1 61e3a43987442344fc7587e30cbf3f7afe1e876d SHA256 afac5928520b9cb7d8f95132435a466a9afecdee9a57259eb7b2f7562937898e
-MD5 d6923c54be2bcadbf1c46643469ae286 ChangeLog 1287
-RMD160 912b38ecf6bbb75c73850a99b26927a967356e2e ChangeLog 1287
-SHA256 afac5928520b9cb7d8f95132435a466a9afecdee9a57259eb7b2f7562937898e ChangeLog 1287
+EBUILD dclock-2.1.2_p8.ebuild 1149 RMD160 bf29a07a0715afe7e5b487e81b1729a83837a20a SHA1 a4041a95401609967b5f4015faa1c77e13b2e973 SHA256 1918822ad13f229cea9bbfc5a488fc7ef296e5c762bfb8dd2bd011399d4f21e1
+MD5 df3e2c6d117451a02acd9162d666bc37 dclock-2.1.2_p8.ebuild 1149
+RMD160 bf29a07a0715afe7e5b487e81b1729a83837a20a dclock-2.1.2_p8.ebuild 1149
+SHA256 1918822ad13f229cea9bbfc5a488fc7ef296e5c762bfb8dd2bd011399d4f21e1 dclock-2.1.2_p8.ebuild 1149
+MISC ChangeLog 1388 RMD160 12fce07d771cf8dd837aa73863b740462feb199c SHA1 cb7bd6cc05bd83d3567d6f755a04eaae1bb253b4 SHA256 9b9e7d05ef860dfa199f04596d4ede29d71e84486b163b9324aab439569480d7
+MD5 4365835ea642bed55a8b8f1c3fd64f3e ChangeLog 1388
+RMD160 12fce07d771cf8dd837aa73863b740462feb199c ChangeLog 1388
+SHA256 9b9e7d05ef860dfa199f04596d4ede29d71e84486b163b9324aab439569480d7 ChangeLog 1388
 MISC metadata.xml 237 RMD160 d033a66213b5d155919d623eceac436cf74d650d SHA1 8fba1539d9df85e2a6baadaa87519e7310bdd3f1 SHA256 887766ffd3713b7b81748ae5fd502620248111499b0f038d7c15165ea81987d3
 MD5 af4a18835f00fbf788eceeba4b61fa7f metadata.xml 237
 RMD160 d033a66213b5d155919d623eceac436cf74d650d metadata.xml 237
@@ -18,10 +15,3 @@ SHA256 887766ffd3713b7b81748ae5fd502620248111499b0f038d7c15165ea81987d3 metadata
 MD5 02c9a2c6c84dcec87a03e1e73ea4aef8 files/digest-dclock-2.1.2_p8 491
 RMD160 79d26fab5a713ed962c22e53d51065880f5a0096 files/digest-dclock-2.1.2_p8 491
 SHA256 3e701458b4bda4dd9b91b5ccfa511518585591a6393ff0bb1ef35cb93680ac21 files/digest-dclock-2.1.2_p8 491
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFMRVMgo/w9rxVVVERAvUyAJ9MjVGgdin+DXw5Ig0C5vorrTmLLwCgh+Tx
-7zWH6+g9B8/Jdx7qnuseU1U=
-=qomP
------END PGP SIGNATURE-----

diff --git a/x11-misc/dclock/dclock-2.1.2_p8.ebuild b/x11-misc/dclock/dclock-2.1.2_p8.ebuild
index ea0e7c7569290ab32287170a2ddd43c684eb9615..bdcfbe68a86431d4761c1aff762720db0d5e09d4 100644 (file)
--- a/x11-misc/dclock/dclock-2.1.2_p8.ebuild
+++ b/x11-misc/dclock/dclock-2.1.2_p8.ebuild
@@ -1,6 +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/dclock/dclock-2.1.2_p8.ebuild,v 1.2 2006/08/06 21:17:09 deltacow Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dclock/dclock-2.1.2_p8.ebuild,v 1.3 2007/03/02 20:26:27 drac Exp $
 
 inherit eutils
 
@@ -9,39 +9,34 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p*/}.orig.tar.gz
                mirror://debian/pool/main/d/${PN}/${PN}_${PV/_p/-}.diff.gz"
 HOMEPAGE="ftp://ftp.ac-grenoble.fr/ge/Xutils/"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 ppc x86"
 IUSE=""
 
-RDEPEND="|| ( (
-               x11-libs/libX11
-               x11-libs/libXt
-               x11-libs/libXext )
-       virtual/x11 )
+RDEPEND="x11-libs/libX11
+       x11-libs/libXt
+       x11-libs/libXext
        app-text/rman"
 DEPEND="${RDEPEND}
-       || ( (
-               x11-misc/imake
-               x11-proto/xproto )
-       virtual/x11 )"
+       x11-misc/imake"
 
 src_unpack() {
        unpack ${A}
-       cd ${S}
+       cd "${S}"
        epatch ../${PN}_${PV/_p/-}.diff
        ln -sf dclock.1 dclock.man # needed to fix xmkmf breakage
 }
 
 src_compile() {
        xmkmf || die "xmkmf failed"
-       make CFLAGS="${CFLAGS}" || die "make failed"
+       emake CFLAGS="${CFLAGS}" || die "make failed"
 }
 
 src_install() {
-       make DESTDIR=${D} install || die "make install failed"
-       make DESTDIR=${D} install.man || die "make install.man failed"
+       emake DESTDIR=${D} install || die "make install failed"
+       emake DESTDIR=${D} install.man || die "make install.man failed"
        insinto /usr/share/sounds
        doins sounds/*
        insinto /etc/X11/app-defaults

diff --git a/x11-misc/pypanel/Manifest b/x11-misc/pypanel/Manifest
index 812a71601755c04f0149853f2fff3226b33b7627..b86102da4e98142f78b982534c4695cccc67cb2e 100644 (file)
--- a/x11-misc/pypanel/Manifest
+++ b/x11-misc/pypanel/Manifest
@@ -1,15 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST PyPanel-2.4.tar.gz 29857 RMD160 2e3eab5ac00c3b69b44e6b77c80902f18b76207a SHA1 10935d671bcfa04cec7c45785668fea5a4fbad1d SHA256 4e612b43c61b3a8af7d57a0364f6cd89df481dc41e20728afa643e9e3546e911
-EBUILD pypanel-2.4.ebuild 701 RMD160 d0cda7f426e8f024e38c17f4b33b5daf43c50b58 SHA1 66e64ae84c2baf70e588e3a33e909d77007f5f6e SHA256 67087925fef17b941c4a94a1e564185257dc61b9a1e078c2798f6a41334e32e8
-MD5 e074aa840ceace19460ab60320192c67 pypanel-2.4.ebuild 701
-RMD160 d0cda7f426e8f024e38c17f4b33b5daf43c50b58 pypanel-2.4.ebuild 701
-SHA256 67087925fef17b941c4a94a1e564185257dc61b9a1e078c2798f6a41334e32e8 pypanel-2.4.ebuild 701
-MISC ChangeLog 4005 RMD160 6587a2b10a6fe7cdd404026a0202d1dee73dc14a SHA1 a8304f75e440a5874da98b3d83a36cecbe7a9bba SHA256 65e2f1adc9cb3a0a54b7d972876be120cd5702e7511af8c5915e5ccfa636afe2
-MD5 0c628513b30cc6954a28779b0f0da1f9 ChangeLog 4005
-RMD160 6587a2b10a6fe7cdd404026a0202d1dee73dc14a ChangeLog 4005
-SHA256 65e2f1adc9cb3a0a54b7d972876be120cd5702e7511af8c5915e5ccfa636afe2 ChangeLog 4005
+EBUILD pypanel-2.4.ebuild 677 RMD160 a0f78cc83a71aeada709308089351db03f19f0aa SHA1 087bbcec4bad2d558ca4a270ca053a754b6db3f1 SHA256 c47aeebb34b29c45518b21756bcc6540614e1c23a1f2ec197e623c5456e44cee
+MD5 bd1276218600ecb282e315aaf31fdd11 pypanel-2.4.ebuild 677
+RMD160 a0f78cc83a71aeada709308089351db03f19f0aa pypanel-2.4.ebuild 677
+SHA256 c47aeebb34b29c45518b21756bcc6540614e1c23a1f2ec197e623c5456e44cee pypanel-2.4.ebuild 677
+MISC ChangeLog 4121 RMD160 15d7d857e1006992ae83226e80a852435c30614b SHA1 3d987e41e2934b2b899e2d84c10393a57bf4c281 SHA256 866eb4a3e52a20a302013af54720aa0fb7f71089858b6ef2fd76f64d4a4d4a22
+MD5 d1cac5214b68c80ea5fd3f7b5cb9e1a8 ChangeLog 4121
+RMD160 15d7d857e1006992ae83226e80a852435c30614b ChangeLog 4121
+SHA256 866eb4a3e52a20a302013af54720aa0fb7f71089858b6ef2fd76f64d4a4d4a22 ChangeLog 4121
 MISC metadata.xml 745 RMD160 38a65f1c9d7971a82f47e75be79e4fd7c61398d1 SHA1 d59b73f1126f5d8bfbf46519038addb89d4ae703 SHA256 c9f9e902d1836d61805515c86f81f4ad9849d7daa3d5f5430e9331d1efd8104a
 MD5 35cdb8a4404d1a4e555e4413fdf422e0 metadata.xml 745
 RMD160 38a65f1c9d7971a82f47e75be79e4fd7c61398d1 metadata.xml 745
@@ -17,10 +14,3 @@ SHA256 c9f9e902d1836d61805515c86f81f4ad9849d7daa3d5f5430e9331d1efd8104a metadata
 MD5 b2a744e7b0e031987e049dda7dab8370 files/digest-pypanel-2.4 232
 RMD160 fe2c5f0e51986b20128837686ebd2cfa28db0b0b files/digest-pypanel-2.4 232
 SHA256 de04f5a116dc720446212f18256bf9fb1661e7ff150bdde253023cd07636ac5c files/digest-pypanel-2.4 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFF3NtTz974XjDVpbkRAkmFAJ9dYkW5R0gjwMdUHfEblyJ2bIKFUwCeODJg
-7i3Crh51G9KVqSIkLmhDEtA=
-=pp2X
------END PGP SIGNATURE-----