prune unused versions

(Portage version: 2.1.3.16)

7 files changed, 7 insertions, 180 deletions

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 766b600bce52..39ff0e10babf 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.100 2007/09/22 05:45:10 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.101 2007/11/13 03:46:15 compnerd Exp $
+
+  13 Nov 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  -files/libxklavier-2.0-config_xkb.patch,
+  -files/libxklavier-3.0-libxml.diff, -libxklavier-2.0-r1.ebuild,
+  -libxklavier-3.1.ebuild:
+  prune unused versions
 
   22 Sep 2007; Tom Gall <tgall@gentoo.org> libxklavier-3.2.ebuild:
   stable on ppc64
diff --git a/x11-libs/libxklavier/files/digest-libxklavier-2.0-r1 b/x11-libs/libxklavier/files/digest-libxklavier-2.0-r1
deleted file mode 100644
index 6f4a0acb255b..000000000000
--- a/x11-libs/libxklavier/files/digest-libxklavier-2.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9257653ee3d194d9c8d669e969fe4332 libxklavier-2.0.tar.gz 435898
-RMD160 a8f219a61f47ed1bb0f801d0e78512b4275e0082 libxklavier-2.0.tar.gz 435898
-SHA256 fe3347ec6c58ba579d8c0ab0afcfa1058fe40850ac745107e5b4199b463e2cbe libxklavier-2.0.tar.gz 435898
diff --git a/x11-libs/libxklavier/files/digest-libxklavier-3.1 b/x11-libs/libxklavier/files/digest-libxklavier-3.1
deleted file mode 100644
index 8a4667e558d2..000000000000
--- a/x11-libs/libxklavier/files/digest-libxklavier-3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 56c4bea91ccbd0d09e3bcf58dff5732a libxklavier-3.1.tar.gz 472712
-RMD160 c01999d88faf3e8bb8409c26d391ed6ea442f5bf libxklavier-3.1.tar.gz 472712
-SHA256 0aa3bbc4d374cb5b24cf081eabe9b79d1caa5e5c1ea80c57ebd82f08eb56670e libxklavier-3.1.tar.gz 472712
diff --git a/x11-libs/libxklavier/files/libxklavier-2.0-config_xkb.patch b/x11-libs/libxklavier/files/libxklavier-2.0-config_xkb.patch
deleted file mode 100644
index e7762c739c2c..000000000000
--- a/x11-libs/libxklavier/files/libxklavier-2.0-config_xkb.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-===================================================================
-RCS file: /cvs/xklavier/libxklavier/libxklavier/xklavier_config_xkb.c,v
-rcsdiff: /cvs/xklavier/libxklavier/libxklavier/xklavier_config_xkb.c,v: warning: Unknown phrases like `commitid ...;' are present.
-retrieving revision 1.29
-retrieving revision 1.30
-diff -u -r1.29 -r1.30
---- libxklavier/xklavier_config_xkb.c	2005/09/12 17:54:44	1.29
-+++ libxklavier/xklavier_config_xkb.c	2005/12/03 13:31:58	1.30
-@@ -225,7 +225,7 @@
-           exit( 1 );
-         default:
-           /* parent */
--          pid = wait( &status );
-+          pid = waitpid( cpid, &status, 0 );
-           XklDebug( 150, "Return status of %d (well, started %d): %d\n", pid, cpid, status );
-           memset( (char *)&result, 0, sizeof(result) );
-           result.xkb = XkbAllocKeyboard();
-@@ -261,9 +261,13 @@
-               }
-               fclose( tmpxkm );
-               XklDebug( 160, "Unlinking the temporary xkm file %s\n", xkmFN );
--              if ( remove( xkmFN ) == -1 )
--                XklDebug( 0, "Could not unlink the temporary xkm file %s: %d\n", 
--                             xkmFN, errno );
-+              if ( _xklDebugLevel < 500 ) /* don't remove on high debug levels! */
-+              {
-+                if ( remove( xkmFN ) == -1 )
-+                  XklDebug( 0, "Could not unlink the temporary xkm file %s: %d\n", 
-+                               xkmFN, errno );
-+              } else
-+                XklDebug( 500, "Well, not really - the debug level is too high: %d\n", _xklDebugLevel );
-             } else /* could not open the file */
-             {
-               XklDebug( 0, "Could not open the temporary xkm file %s\n", xkmFN );
-@@ -277,9 +281,13 @@
-           break;
-       }
-       XklDebug( 160, "Unlinking the temporary xkb file %s\n", xkbFN );
--      if ( remove( xkbFN ) == -1 )
--        XklDebug( 0, "Could not unlink the temporary xkb file %s: %d\n", 
--                  xkbFN, errno );
-+      if ( _xklDebugLevel < 500 ) /* don't remove on high debug levels! */
-+      {
-+        if ( remove( xkbFN ) == -1 )
-+          XklDebug( 0, "Could not unlink the temporary xkb file %s: %d\n", 
-+                    xkbFN, errno );
-+      } else
-+        XklDebug( 500, "Well, not really - the debug level is too high: %d\n", _xklDebugLevel );
-     } else /* could not open input tmp file */
-     {
-       XklDebug( 0, "Could not open tmp XKB file [%s]: %d\n", xkbFN, errno );
diff --git a/x11-libs/libxklavier/files/libxklavier-3.0-libxml.diff b/x11-libs/libxklavier/files/libxklavier-3.0-libxml.diff
deleted file mode 100644
index 7fb594269c99..000000000000
--- a/x11-libs/libxklavier/files/libxklavier-3.0-libxml.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru libxklavier-3.0/libxklavier/xklavier_config.c libxklavier-3.0-r1/libxklavier/xklavier_config.c
---- libxklavier-3.0/libxklavier/xklavier_config.c	2006-08-03 18:40:06.000000000 -0400
-+++ libxklavier-3.0-r1/libxklavier/xklavier_config.c	2006-12-22 09:56:06.000000000 -0500
-@@ -261,7 +261,7 @@
- 		return FALSE;
- 
- 	nodes = xpath_obj->nodesetval;
--	if (nodes != NULL && nodes->nodeTab != NULL) {
-+	if (nodes != NULL && nodes->nodeTab != NULL && nodes->nodeNr > 0) {
- 		rv = xkl_read_config_item(config, *nodes->nodeTab, pitem);
- 		if (pnode != NULL) {
- 			*pnode = *nodes->nodeTab;
diff --git a/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild b/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild
deleted file mode 100644
index fc78f905d77e..000000000000
--- a/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-2.0-r1.ebuild,v 1.10 2007/07/22 02:58:03 dberkholz Exp $
-
-inherit eutils
-
-DESCRIPTION="High level XKB library"
-HOMEPAGE="http://www.freedesktop.org/Software/LibXklavier"
-SRC_URI="mirror://sourceforge/gswitchit/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86"
-IUSE="doc"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libxkbfile
-	dev-libs/libxml2"
-
-DEPEND="${RDEPEND}
-	x11-libs/libXt
-	x11-proto/xproto
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	# Do not error on warnings (for gcc4 support).  Patch from Fedora.
-	epatch ${FILESDIR}/${PN}-1.14-werror.patch
-
-	# backport patch from cvs, fixes #114601
-	epatch ${FILESDIR}/${PN}-2.0-config_xkb.patch
-}
-
-src_compile() {
-
-	econf --with-xkb_base=/usr/$(get_libdir)/X11/xkb \
-		$(use_enable doc doxygen) || die
-	emake || die "emake failed"
-
-}
-
-src_install() {
-
-	make install DESTDIR=${D} || die
-	insinto /usr/share/libxklavier
-	use sparc && doins "${FILESDIR}/sun.xml"
-	dodoc AUTHORS CREDITS ChangeLog NEWS README
-
-}
diff --git a/x11-libs/libxklavier/libxklavier-3.1.ebuild b/x11-libs/libxklavier/libxklavier-3.1.ebuild
deleted file mode 100644
index ed55f682e116..000000000000
--- a/x11-libs/libxklavier/libxklavier-3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-3.1.ebuild,v 1.13 2007/07/22 02:58:03 dberkholz Exp $
-
-inherit eutils
-
-DESCRIPTION="High level XKB library"
-HOMEPAGE="http://www.freedesktop.org/Software/LibXklavier"
-SRC_URI="mirror://sourceforge/gswitchit/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="||	( x11-misc/xkeyboard-config x11-misc/xkbdata )
-		x11-apps/xkbcomp
-		x11-libs/libX11
-		x11-libs/libxkbfile
-		dev-libs/libxml2
-		>=dev-libs/glib-2.6"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-3.0-libxml.diff"
-}
-
-src_compile() {
-	local xkbbase
-
-	# see bug #113108
-	if has_version x11-apps/xkbcomp; then
-		xkbbase=/usr/share/X11/xkb
-	else
-		xkbbase=/usr/$(get_libdir)/X11/xkb
-	fi
-
-	econf --with-xkb-base=${xkbbase} --with-xkb-bin-base=/usr/bin \
-		  $(use_enable doc doxygen) || die
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-
-	insinto /usr/share/libxklavier
-	use sparc && doins "${FILESDIR}/sun.xml"
-
-	dodoc AUTHORS CREDITS ChangeLog NEWS README
-}