Kill virtual/x11.

Package-Manager: portage-2.1.2-r13

diff --git a/x11-misc/xxkb/ChangeLog b/x11-misc/xxkb/ChangeLog
index e894d64fb662705cb8010d46a2415d74c66b7a9c..f7b56fd2ecf59091130ea82ec95bbe5187ef26ca 100644 (file)
--- a/x11-misc/xxkb/ChangeLog
+++ b/x11-misc/xxkb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xxkb
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.12 2006/02/09 04:31:38 spyderous Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/ChangeLog,v 1.13 2007/03/02 20:46:14 drac Exp $
+
+  02 Mar 2007; Samuli Suominen <drac@gentoo.org> xxkb-1.10.ebuild:
+  Kill virtual/x11.
 
   09 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>; xxkb-1.10.ebuild:
   (#122190) Missing rman dep for modular X.

diff --git a/x11-misc/xxkb/Manifest b/x11-misc/xxkb/Manifest
index baad107c5c66081e1fcdf42a028c37ce78494add..e983e97b46f2345e1929fec1b8c1b096993f6d25 100644 (file)
--- a/x11-misc/xxkb/Manifest
+++ b/x11-misc/xxkb/Manifest
@@ -23,14 +23,14 @@ MD5 668828741a9c91d290adcfd3830c51c8 files/xxkb-1.10-gcc34-fix.patch 237
 RMD160 fca3133be36cc7c347047c9b1cdd27ce7574d736 files/xxkb-1.10-gcc34-fix.patch 237
 SHA256 0625e51569d86982f161f9dfa17f0635f3f3b20b310f48acff1e6e8483b31f31 files/xxkb-1.10-gcc34-fix.patch 237
 DIST xxkb-1.10.tar.gz 29178 RMD160 bcc0d1affccac0921abf2aa6ac833927a8b48c8f SHA1 bf214f6fb5d1c599b504dc0df053db9df0ed2490 SHA256 32b5461f1bb2e56a8cf68661e536bcb2d18bb6aac9f78120b1c0dd9e0db538ce
-EBUILD xxkb-1.10.ebuild 1153 RMD160 f80913c5dccf94692e89b91ba0423926563d3536 SHA1 7091229c3b13fbf5ee40302cb22bca125d9cf8b1 SHA256 93156d7bf77993b677235e949af928343fef298435d2d5fe248233e582f71076
-MD5 28325f1959c57d6377e049b8c76c2da4 xxkb-1.10.ebuild 1153
-RMD160 f80913c5dccf94692e89b91ba0423926563d3536 xxkb-1.10.ebuild 1153
-SHA256 93156d7bf77993b677235e949af928343fef298435d2d5fe248233e582f71076 xxkb-1.10.ebuild 1153
-MISC ChangeLog 1459 RMD160 405340f1d500d3a2a272c55dabc2b4b7d79af81f SHA1 e72b1b2bf23aaeae3fab9be10d2bc0ccb07b105e SHA256 378e7d9bc2f409dd540474540b8f9c76170d49f87d08d1703ae54d3187b894e9
-MD5 f26689c02fd37cf4e217ee090b3d31e5 ChangeLog 1459
-RMD160 405340f1d500d3a2a272c55dabc2b4b7d79af81f ChangeLog 1459
-SHA256 378e7d9bc2f409dd540474540b8f9c76170d49f87d08d1703ae54d3187b894e9 ChangeLog 1459
+EBUILD xxkb-1.10.ebuild 1110 RMD160 05bfe60fe3eb5ca816cfa19ff1ec45d052ec053f SHA1 40f773dd70f27231e91739172985279f8f53062f SHA256 385d62c5d3668de5edf671bd51026ca8b955d0e9c83e3b5c2516ddf8926db82a
+MD5 f43b47cf5f572f221d9258e938b859c6 xxkb-1.10.ebuild 1110
+RMD160 05bfe60fe3eb5ca816cfa19ff1ec45d052ec053f xxkb-1.10.ebuild 1110
+SHA256 385d62c5d3668de5edf671bd51026ca8b955d0e9c83e3b5c2516ddf8926db82a xxkb-1.10.ebuild 1110
+MISC ChangeLog 1542 RMD160 48f3d362473b6625122d05cc4c7288468ca3d2f1 SHA1 03adb3bba27fd89d7a1b59af854b78a436272a98 SHA256 a5e86ce7457630eb7e3f62449480ab694c6ee0c884be713f568bcb318c5e8959
+MD5 f1b0d3c3741dd228671142fad7ec99fb ChangeLog 1542
+RMD160 48f3d362473b6625122d05cc4c7288468ca3d2f1 ChangeLog 1542
+SHA256 a5e86ce7457630eb7e3f62449480ab694c6ee0c884be713f568bcb318c5e8959 ChangeLog 1542
 MISC metadata.xml 229 RMD160 47a0ab3f9561f670f64cbeba3a3c923b24161520 SHA1 5ddb48f84952e34b4b1181079dfd764d08f26378 SHA256 8653799042b178ad608e7e3b1591514a901fc074c691c4abe071f048e919e348
 MD5 73306e20ac1b1ef3b82127d6585e9431 metadata.xml 229
 RMD160 47a0ab3f9561f670f64cbeba3a3c923b24161520 metadata.xml 229

diff --git a/x11-misc/xxkb/xxkb-1.10.ebuild b/x11-misc/xxkb/xxkb-1.10.ebuild
index 6481aa804c8fb5c65c604973f3d39c3002f66f41..3261040a36a60d34503175685a689dedd6def205 100644 (file)
--- a/x11-misc/xxkb/xxkb-1.10.ebuild
+++ b/x11-misc/xxkb/xxkb-1.10.ebuild
@@ -1,39 +1,34 @@
-# 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/xxkb/xxkb-1.10.ebuild,v 1.12 2006/02/09 04:31:38 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xxkb/xxkb-1.10.ebuild,v 1.13 2007/03/02 20:46:14 drac Exp $
 
 inherit eutils
 
 DESCRIPTION="eXtended XKB - assign different keymaps to different windows"
 HOMEPAGE="http://sourceforge.net/projects/xxkb/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
-RDEPEND="|| ( (
-               x11-libs/libX11
-               x11-libs/libXt
-               x11-libs/libXpm )
-       virtual/x11 )"
+RDEPEND="x11-libs/libX11
+       x11-libs/libXt
+       x11-libs/libXpm"
 DEPEND="${RDEPEND}
-       || ( (
-               app-text/rman
-               x11-misc/imake
-               x11-proto/xproto )
-       virtual/x11 )"
+       app-text/rman
+       x11-misc/imake"
 
 src_unpack() {
        unpack ${A}
-
-       cd ${S}
-       epatch ${FILESDIR}/${P}-gcc34-fix.patch
+       cd "${S}"
+       epatch "${FILESDIR}/${P}-gcc34-fix.patch"
 }
 
 src_compile() {
-       xmkmf || die
-       emake PROJECTROOT=/usr PIXMAPDIR=/usr/share/xxkb || die
+       xmkmf || die "xmkmf failed."
+       emake PROJECTROOT=/usr PIXMAPDIR=/usr/share/xxkb || die "emake failed."
 }
 
 src_install() {