rm

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

25 files changed, 50 insertions, 240 deletions

diff --git a/x11-apps/appres/ChangeLog b/x11-apps/appres/ChangeLog
index 57ef2d613b68..e864a5ce3a73 100644
--- a/x11-apps/appres/ChangeLog
+++ b/x11-apps/appres/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/appres
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/appres/ChangeLog,v 1.46 2010/01/19 18:02:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/appres/ChangeLog,v 1.47 2010/09/10 22:28:30 scarabeus Exp $
+
+  10 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> -appres-1.0.1.ebuild:
+  rm
 
   19 Jan 2010; Raúl Porcel <armin76@gentoo.org> appres-1.0.2.ebuild:
   s390 stable wrt #294958
diff --git a/x11-apps/appres/appres-1.0.1.ebuild b/x11-apps/appres/appres-1.0.1.ebuild
deleted file mode 100644
index 804f5acbbfbd..000000000000
--- a/x11-apps/appres/appres-1.0.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/appres/appres-1.0.1.ebuild,v 1.13 2009/05/05 07:24:07 fauli Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="list X application resource database"
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXt"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/bdftopcf/ChangeLog b/x11-apps/bdftopcf/ChangeLog
index f70c6670f7a6..082aa1d9f7f6 100644
--- a/x11-apps/bdftopcf/ChangeLog
+++ b/x11-apps/bdftopcf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/bdftopcf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/ChangeLog,v 1.40 2010/02/25 07:08:38 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/ChangeLog,v 1.41 2010/09/10 22:30:31 scarabeus Exp $
+
+  10 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -bdftopcf-1.0.0.ebuild, bdftopcf-1.0.2.ebuild:
+  rm
 
   25 Feb 2010; Jonathan Callen <abcd@gentoo.org> bdftopcf-1.0.2.ebuild:
   Transfer prefix keywords (no other changes)
diff --git a/x11-apps/bdftopcf/bdftopcf-1.0.0.ebuild b/x11-apps/bdftopcf/bdftopcf-1.0.0.ebuild
deleted file mode 100644
index 364eb75c305e..000000000000
--- a/x11-apps/bdftopcf/bdftopcf-1.0.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/bdftopcf-1.0.0.ebuild,v 1.17 2009/05/05 07:25:54 fauli Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org bdftopcf application"
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-libs/libXfont"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/bdftopcf/bdftopcf-1.0.2.ebuild b/x11-apps/bdftopcf/bdftopcf-1.0.2.ebuild
index 4ae4e7104f7a..897c7f00b347 100644
--- a/x11-apps/bdftopcf/bdftopcf-1.0.2.ebuild
+++ b/x11-apps/bdftopcf/bdftopcf-1.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/bdftopcf-1.0.2.ebuild,v 1.10 2010/02/25 07:08:38 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/bdftopcf/bdftopcf-1.0.2.ebuild,v 1.11 2010/09/10 22:30:31 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -9,7 +9,7 @@ inherit x-modular
 
 DESCRIPTION="X.Org bdftopcf application"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libXfont"
 DEPEND="${RDEPEND}"
diff --git a/x11-apps/iceauth/ChangeLog b/x11-apps/iceauth/ChangeLog
index a52cb2b73121..f4573f813a77 100644
--- a/x11-apps/iceauth/ChangeLog
+++ b/x11-apps/iceauth/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/iceauth
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/ChangeLog,v 1.45 2010/01/19 18:13:50 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/ChangeLog,v 1.46 2010/09/10 22:26:43 scarabeus Exp $
+
+  10 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -iceauth-1.0.2.ebuild:
+  rm
 
   19 Jan 2010; Raúl Porcel <armin76@gentoo.org> iceauth-1.0.3.ebuild:
   s390 stable wrt #294958
diff --git a/x11-apps/iceauth/iceauth-1.0.2.ebuild b/x11-apps/iceauth/iceauth-1.0.2.ebuild
deleted file mode 100644
index e44b6ae0f50a..000000000000
--- a/x11-apps/iceauth/iceauth-1.0.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/iceauth-1.0.2.ebuild,v 1.10 2009/05/05 07:32:42 fauli Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="ICE authority file utility"
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libICE"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/mkfontdir/ChangeLog b/x11-apps/mkfontdir/ChangeLog
index eab71f661482..c69cac07cf60 100644
--- a/x11-apps/mkfontdir/ChangeLog
+++ b/x11-apps/mkfontdir/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/mkfontdir
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/ChangeLog,v 1.62 2010/07/02 16:50:42 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/ChangeLog,v 1.63 2010/09/10 22:33:42 scarabeus Exp $
+
+  10 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -mkfontdir-1.0.3.ebuild, -mkfontdir-1.0.4.ebuild:
+  rm
 
   02 Jul 2010; Jeremy Olexa <darkside@gentoo.org> mkfontdir-1.0.5.ebuild:
   Add ~x64-macos, as tested in bug 323945
diff --git a/x11-apps/mkfontdir/mkfontdir-1.0.3.ebuild b/x11-apps/mkfontdir/mkfontdir-1.0.3.ebuild
deleted file mode 100644
index ef848dfd3c97..000000000000
--- a/x11-apps/mkfontdir/mkfontdir-1.0.3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/mkfontdir-1.0.3.ebuild,v 1.12 2009/05/05 07:20:02 fauli Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="create an index of X font files in a directory"
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-apps/mkfontscale"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/mkfontdir/mkfontdir-1.0.4.ebuild b/x11-apps/mkfontdir/mkfontdir-1.0.4.ebuild
deleted file mode 100644
index efc278379c71..000000000000
--- a/x11-apps/mkfontdir/mkfontdir-1.0.4.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/mkfontdir-1.0.4.ebuild,v 1.11 2009/12/15 14:58:27 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="create an index of X font files in a directory"
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-apps/mkfontscale"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/mkfontscale/ChangeLog b/x11-apps/mkfontscale/ChangeLog
index 52d6828d9671..c0966ebd4569 100644
--- a/x11-apps/mkfontscale/ChangeLog
+++ b/x11-apps/mkfontscale/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/mkfontscale
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/ChangeLog,v 1.67 2010/07/02 16:50:11 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/ChangeLog,v 1.68 2010/09/10 22:34:34 scarabeus Exp $
+
+  10 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -mkfontscale-1.0.5.ebuild, -mkfontscale-1.0.6.ebuild:
+  rm
 
   02 Jul 2010; Jeremy Olexa <darkside@gentoo.org> mkfontscale-1.0.7.ebuild:
   Add ~x64-macos, as tested in bug 323945
diff --git a/x11-apps/mkfontscale/mkfontscale-1.0.5.ebuild b/x11-apps/mkfontscale/mkfontscale-1.0.5.ebuild
deleted file mode 100644
index 5cec80b8b079..000000000000
--- a/x11-apps/mkfontscale/mkfontscale-1.0.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/mkfontscale-1.0.5.ebuild,v 1.11 2009/09/23 18:19:40 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="create an index of scalable font files for X"
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-libs/libfontenc
-	=media-libs/freetype-2*"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
diff --git a/x11-apps/mkfontscale/mkfontscale-1.0.6.ebuild b/x11-apps/mkfontscale/mkfontscale-1.0.6.ebuild
deleted file mode 100644
index 318154f7d31e..000000000000
--- a/x11-apps/mkfontscale/mkfontscale-1.0.6.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontscale/mkfontscale-1.0.6.ebuild,v 1.6 2009/12/15 14:59:18 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="create an index of scalable font files for X"
-
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-libs/libfontenc
-	=media-libs/freetype-2*"
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-CONFIGURE_OPTIONS="--with-bzip2"
diff --git a/x11-apps/setxkbmap/ChangeLog b/x11-apps/setxkbmap/ChangeLog
index 0ac2775f8763..984cde08b17a 100644
--- a/x11-apps/setxkbmap/ChangeLog
+++ b/x11-apps/setxkbmap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/setxkbmap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.48 2010/01/19 17:34:45 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/ChangeLog,v 1.49 2010/09/10 22:35:31 scarabeus Exp $
+
+  10 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -setxkbmap-1.0.4.ebuild:
+  rm
 
   19 Jan 2010; Jonathan Callen <abcd@gentoo.org> setxkbmap-1.1.0.ebuild:
   Keyword ~amd64-linux/~x86-linux
diff --git a/x11-apps/setxkbmap/setxkbmap-1.0.4.ebuild b/x11-apps/setxkbmap/setxkbmap-1.0.4.ebuild
deleted file mode 100644
index 116b8b07a265..000000000000
--- a/x11-apps/setxkbmap/setxkbmap-1.0.4.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/setxkbmap/setxkbmap-1.0.4.ebuild,v 1.10 2009/05/05 07:41:49 fauli Exp $
-
-# Must be before x-modular eclass is inherited
-# SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Controls the keyboard layout of a running X server."
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-libs/libxkbfile
-	x11-libs/libX11"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xhost/ChangeLog b/x11-apps/xhost/ChangeLog
index 5527c2218da4..76ee0f33739e 100644
--- a/x11-apps/xhost/ChangeLog
+++ b/x11-apps/xhost/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/xhost
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/ChangeLog,v 1.54 2010/02/25 07:12:23 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/ChangeLog,v 1.55 2010/09/10 22:38:32 scarabeus Exp $
+
+  10 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> -xhost-1.0.2.ebuild:
+  rm
 
   25 Feb 2010; Jonathan Callen <abcd@gentoo.org> xhost-1.0.3.ebuild:
   Transfer prefix keywords (no other changes)
diff --git a/x11-apps/xhost/xhost-1.0.2.ebuild b/x11-apps/xhost/xhost-1.0.2.ebuild
deleted file mode 100644
index 87c583892fd1..000000000000
--- a/x11-apps/xhost/xhost-1.0.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/xhost-1.0.2.ebuild,v 1.12 2009/05/04 15:04:28 ssuominen Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Controls host and/or user access to a running X server."
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="ipv6"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable ipv6)"
-}
diff --git a/x11-apps/xkbcomp/ChangeLog b/x11-apps/xkbcomp/ChangeLog
index 8787d7bcf48a..4ee2e3e8328a 100644
--- a/x11-apps/xkbcomp/ChangeLog
+++ b/x11-apps/xkbcomp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/xkbcomp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/ChangeLog,v 1.74 2010/01/19 18:49:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/ChangeLog,v 1.75 2010/09/10 22:40:39 scarabeus Exp $
+
+  10 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  -xkbcomp-1.0.5.ebuild, -xkbcomp-1.1.0.ebuild, xkbcomp-1.1.1.ebuild:
+  rm
 
   19 Jan 2010; Raúl Porcel <armin76@gentoo.org> xkbcomp-1.1.1.ebuild:
   s390 stable wrt #294958
diff --git a/x11-apps/xkbcomp/xkbcomp-1.0.5.ebuild b/x11-apps/xkbcomp/xkbcomp-1.0.5.ebuild
deleted file mode 100644
index b2994aecd90b..000000000000
--- a/x11-apps/xkbcomp/xkbcomp-1.0.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-1.0.5.ebuild,v 1.11 2009/06/23 21:26:09 klausman Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular multilib
-
-DESCRIPTION="compile XKB keyboard description"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	x-modular_src_install
-
-	dodir usr/share/X11/xkb
-	dosym ../../../bin/xkbcomp /usr/share/X11/xkb/xkbcomp
-
-	# (#122214) We should create this directory here, since xkeyboard-config
-	# and any other set of layouts will symlink to it.
-	dodir /var/lib/xkb
-	keepdir /var/lib/xkb
-}
diff --git a/x11-apps/xkbcomp/xkbcomp-1.1.0.ebuild b/x11-apps/xkbcomp/xkbcomp-1.1.0.ebuild
deleted file mode 100644
index 740edca6b4ba..000000000000
--- a/x11-apps/xkbcomp/xkbcomp-1.1.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-1.1.0.ebuild,v 1.7 2009/12/15 15:09:44 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="compile XKB keyboard description"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libxkbfile"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbcomp/xkbcomp-1.1.1.ebuild b/x11-apps/xkbcomp/xkbcomp-1.1.1.ebuild
index f9835b8f5b17..2c59165937d2 100644
--- a/x11-apps/xkbcomp/xkbcomp-1.1.1.ebuild
+++ b/x11-apps/xkbcomp/xkbcomp-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-1.1.1.ebuild,v 1.10 2010/01/19 18:49:05 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkbcomp/xkbcomp-1.1.1.ebuild,v 1.11 2010/09/10 22:40:39 scarabeus Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="compile XKB keyboard description"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 RDEPEND="x11-libs/libX11
 	x11-libs/libxkbfile"
diff --git a/x11-apps/xkill/ChangeLog b/x11-apps/xkill/ChangeLog
index 1cc74b09909f..1b4fd1c750eb 100644
--- a/x11-apps/xkill/ChangeLog
+++ b/x11-apps/xkill/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/xkill
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/ChangeLog,v 1.27 2010/01/19 18:50:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/ChangeLog,v 1.28 2010/09/10 22:41:56 scarabeus Exp $
+
+  10 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> -xkill-1.0.1.ebuild:
+  rm
 
   19 Jan 2010; Raúl Porcel <armin76@gentoo.org> xkill-1.0.2.ebuild:
   s390 stable wrt #294958
diff --git a/x11-apps/xkill/xkill-1.0.1.ebuild b/x11-apps/xkill/xkill-1.0.1.ebuild
deleted file mode 100644
index 6e6389654b92..000000000000
--- a/x11-apps/xkill/xkill-1.0.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xkill/xkill-1.0.1.ebuild,v 1.8 2009/05/05 08:01:17 fauli Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="kill a client by its X resource"
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu"
-DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlogo/ChangeLog b/x11-apps/xlogo/ChangeLog
index 2bbf0bff8464..8fc5c78175d4 100644
--- a/x11-apps/xlogo/ChangeLog
+++ b/x11-apps/xlogo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-apps/xlogo
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlogo/ChangeLog,v 1.24 2010/03/04 20:23:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlogo/ChangeLog,v 1.25 2010/09/10 22:42:46 scarabeus Exp $
+
+  10 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org> -xlogo-1.0.1.ebuild:
+  rm
 
   04 Mar 2010; Raúl Porcel <armin76@gentoo.org> xlogo-1.0.2.ebuild:
   alpha/arm/ia64/s390/sh/sparc stable
diff --git a/x11-apps/xlogo/xlogo-1.0.1.ebuild b/x11-apps/xlogo/xlogo-1.0.1.ebuild
deleted file mode 100644
index 981dbaa88515..000000000000
--- a/x11-apps/xlogo/xlogo-1.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlogo/xlogo-1.0.1.ebuild,v 1.9 2009/08/25 15:15:10 remi Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X Window System logo"
-
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-RDEPEND="x11-libs/libXrender
-	x11-libs/libXft
-	x11-libs/libXaw"
-DEPEND="${RDEPEND}"
-CONFIGURE_OPTIONS="--with-render --disable-xprint"