new release, clean out some obsolete stuff

(Portage version: 2.1_pre4-r1)

14 files changed, 44 insertions, 206 deletions

diff --git a/x11-libs/libxklavier/ChangeLog b/x11-libs/libxklavier/ChangeLog
index 4ff734d209e3..b9b9c4c4dff6 100644
--- a/x11-libs/libxklavier/ChangeLog
+++ b/x11-libs/libxklavier/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/libxklavier
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.59 2006/02/07 08:43:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/ChangeLog,v 1.60 2006/03/12 21:50:51 foser Exp $
+
+*libxklavier-2.2 (12 Mar 2006)
+
+  12 Mar 2006; Marinus Schraal <foser@gentoo.org> libxklavier-2.2.ebuild :
+  New release
+  Add workaround for #11318
+  modular X11 dep fixes
 
   07 Feb 2006; Aron Griffis <agriffis@gentoo.org> libxklavier-2.0-r1.ebuild:
   Mark 2.0-r1 stable on alpha
diff --git a/x11-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
index 5518f758adf8..10fba29a265c 100644
--- a/x11-libs/libxklavier/Manifest
+++ b/x11-libs/libxklavier/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 e0d6a9e20da23f0757e91dce641d01c5 ChangeLog 6378
 RMD160 fe26ff9da62f022fb37aac148c437e869ba12419 ChangeLog 6378
 SHA256 84023a65b26bff7aceaea37f321e5a736d1c77d49c8e7c63c0e052d504e23522 ChangeLog 6378
@@ -22,6 +19,9 @@ SHA256 b8580ae0680dfd3ad20680b85d90050305c59f974c4cdacda80171d581ab1f63 files/di
 MD5 f1d4d352244f29abc4a6a5fd113207fc files/digest-libxklavier-2.0-r1 247
 RMD160 1719063b52619b61a43e5beba9a020e888440927 files/digest-libxklavier-2.0-r1 247
 SHA256 c4b6daa81c46914c76943bb2072eb0a694a76721ff8a8df04eb6a4f8580ea309 files/digest-libxklavier-2.0-r1 247
+MD5 a5c9364b5623b5374bdab1db9de2d9b3 files/digest-libxklavier-2.2 247
+RMD160 6a8341794b00d9ee8fc9e144c7c9e85e75fd4181 files/digest-libxklavier-2.2 247
+SHA256 09b842e23964a64676ab5336dfad40ed4bdba90e53e9520e94b4fc0ad2228ee7 files/digest-libxklavier-2.2 247
 MD5 31529efcf0188518d362d24a148c74b5 files/libxklavier-1.04-fix_free.patch 301
 RMD160 550287ec2c09691d217cba8498d4b3c3416ca41f files/libxklavier-1.04-fix_free.patch 301
 SHA256 e633145786a863ca5eb220966e38dd480837aa6c54d5d830c1b6bf8eeb6e5452 files/libxklavier-1.04-fix_free.patch 301
@@ -58,13 +58,9 @@ SHA256 7bd197472f5261114ce139278fe61e1e29b2104b7995fa1c2283daf2c8df4484 libxklav
 MD5 b438ab07e92289b506f360e5ebd557cf libxklavier-2.0.ebuild 1182
 RMD160 e6e98594ea0622f258564ec7d18cf3ca726e9797 libxklavier-2.0.ebuild 1182
 SHA256 ecc1b222c69d5b18975ca0af62f87d56d66e6899ed222bc953db86e96f1e0ba0 libxklavier-2.0.ebuild 1182
+MD5 98c455603ee3aa6fbf1ce9689fe28444 libxklavier-2.2.ebuild 1276
+RMD160 4f1681f11ca6cd0fc2ad66f9910e68252a3e5ea7 libxklavier-2.2.ebuild 1276
+SHA256 7bd197472f5261114ce139278fe61e1e29b2104b7995fa1c2283daf2c8df4484 libxklavier-2.2.ebuild 1276
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD6F2kJrHF4yAQTrARAgASAKCoRaiMAb9qI5SyzNALuAUfhWOdnwCbBdEh
-EJDnJOUENglSAxJEsBt22LU=
-=iLxQ
------END PGP SIGNATURE-----
diff --git a/x11-libs/libxklavier/files/digest-libxklavier-1.02 b/x11-libs/libxklavier/files/digest-libxklavier-1.02
deleted file mode 100644
index 948c70fe691f..000000000000
--- a/x11-libs/libxklavier/files/digest-libxklavier-1.02
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fba323a69bc904e9889df7fb5491ea55 libxklavier-1.02.tar.gz 409494
diff --git a/x11-libs/libxklavier/files/digest-libxklavier-1.03 b/x11-libs/libxklavier/files/digest-libxklavier-1.03
deleted file mode 100644
index 03cbc54d5876..000000000000
--- a/x11-libs/libxklavier/files/digest-libxklavier-1.03
+++ /dev/null
@@ -1 +0,0 @@
-MD5 266af32cb4ec1707f6cb8f3a568f62cf libxklavier-1.03.tar.gz 415013
diff --git a/x11-libs/libxklavier/files/digest-libxklavier-1.04 b/x11-libs/libxklavier/files/digest-libxklavier-1.04
deleted file mode 100644
index 843fee0e7219..000000000000
--- a/x11-libs/libxklavier/files/digest-libxklavier-1.04
+++ /dev/null
@@ -1 +0,0 @@
-MD5 322078ad3681465f69a65c0758c74460 libxklavier-1.04.tar.gz 422337
diff --git a/x11-libs/libxklavier/files/digest-libxklavier-1.04-r1 b/x11-libs/libxklavier/files/digest-libxklavier-1.04-r1
deleted file mode 100644
index 843fee0e7219..000000000000
--- a/x11-libs/libxklavier/files/digest-libxklavier-1.04-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 322078ad3681465f69a65c0758c74460 libxklavier-1.04.tar.gz 422337
diff --git a/x11-libs/libxklavier/files/digest-libxklavier-2.2 b/x11-libs/libxklavier/files/digest-libxklavier-2.2
new file mode 100644
index 000000000000..98466a388591
--- /dev/null
+++ b/x11-libs/libxklavier/files/digest-libxklavier-2.2
@@ -0,0 +1,3 @@
+MD5 a9c2e53ea96ed138b588df5a9b9addaf libxklavier-2.2.tar.gz 467577
+RMD160 875a14ee466133f033266924de4d95749d1a434f libxklavier-2.2.tar.gz 467577
+SHA256 ccfa44ca1128018939906ef32b3a0e85a08efacbc00a32d49628fee7026cc2de libxklavier-2.2.tar.gz 467577
diff --git a/x11-libs/libxklavier/files/libxklavier-1.04-fix_free.patch b/x11-libs/libxklavier/files/libxklavier-1.04-fix_free.patch
deleted file mode 100644
index 1b4d07761858..000000000000
--- a/x11-libs/libxklavier/files/libxklavier-1.04-fix_free.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libxklavier-1.04/libxklavier/xklavier_config_i18n.c.orig	2004-11-16 15:56:37.472228000 -0500
-+++ libxklavier-1.04/libxklavier/xklavier_config_i18n.c	2004-11-16 15:58:02.971230176 -0500
-@@ -148,7 +148,7 @@
- 
-   iconv_close( converter );
- 
--  return converted;
-+  return strdup(converted);
- }
- 
- /*
diff --git a/x11-libs/libxklavier/files/sun-keymaps-102.patch b/x11-libs/libxklavier/files/sun-keymaps-102.patch
deleted file mode 100644
index 680907bde6af..000000000000
--- a/x11-libs/libxklavier/files/sun-keymaps-102.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nura libxklavier-1.02/libxklavier/xklavier_config_xkb.c libxklavier-1.02.sun/libxklavier/xklavier_config_xkb.c
---- libxklavier-1.02/libxklavier/xklavier_config_xkb.c   2004-04-13 17:20:36.000000000 -0400
-+++ libxklavier-1.02.sun/libxklavier/xklavier_config_xkb.c    2004-04-24 04:38:50.660469000 -0400
-@@ -18,9 +18,9 @@
- #endif
- 
- // For "bad" X servers we hold our own copy
--#define XML_CFG_FALLBACK_PATH ( DATA_DIR "/xfree86.xml" )
-+#define XML_CFG_FALLBACK_PATH ( DATA_DIR "/sun.xml" )
- 
--#define MULTIPLE_LAYOUTS_CHECK_PATH ( XKB_BASE "/symbols/pc/en_US" )
-+#define MULTIPLE_LAYOUTS_CHECK_PATH ( XKB_BASE "/symbols/sun/us" )
- 
- #define XK_XKB_KEYS
- #include <X11/keysymdef.h>
-
diff --git a/x11-libs/libxklavier/files/sun-keymaps.patch b/x11-libs/libxklavier/files/sun-keymaps.patch
deleted file mode 100644
index 80e19d38eece..000000000000
--- a/x11-libs/libxklavier/files/sun-keymaps.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Nura libxklavier-1.00/libxklavier/xklavier_config_xkb.c libxklavier-1.00.sun/libxklavier/xklavier_config_xkb.c
---- libxklavier-1.00/libxklavier/xklavier_config_xkb.c	2004-01-20 20:28:22.000000000 -0300
-+++ libxklavier-1.00.sun/libxklavier/xklavier_config_xkb.c	2004-03-23 11:56:10.000000000 -0300
-@@ -16,16 +16,16 @@
- #include <X11/extensions/XKM.h>
- #endif
- 
--#define RULES_FILE "xfree86"
-+#define RULES_FILE "sun"
- 
- #define RULES_PATH ( XKB_BASE "/rules/" RULES_FILE )
- 
--#define XML_CFG_PATH ( XKB_BASE "/rules/xfree86.xml" )
-+#define XML_CFG_PATH ( XKB_BASE "/rules/sun.xml" )
- 
- // For "bad" X servers we hold our own copy
--#define XML_CFG_FALLBACK_PATH ( DATA_DIR "/xfree86.xml" )
-+#define XML_CFG_FALLBACK_PATH ( DATA_DIR "/sun.xml" )
- 
--#define MULTIPLE_LAYOUTS_CHECK_PATH ( XKB_BASE "/symbols/pc/en_US" )
-+#define MULTIPLE_LAYOUTS_CHECK_PATH ( XKB_BASE "/symbols/sun/us" )
- 
- #define XK_XKB_KEYS
- #include <X11/keysymdef.h>
diff --git a/x11-libs/libxklavier/libxklavier-1.02.ebuild b/x11-libs/libxklavier/libxklavier-1.02.ebuild
deleted file mode 100644
index a0c6099be4a3..000000000000
--- a/x11-libs/libxklavier/libxklavier-1.02.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-1.02.ebuild,v 1.16 2005/01/08 23:34:07 slarti 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 mips ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND="virtual/x11
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	use sparc && epatch "${FILESDIR}/sun-keymaps-102.patch"
-}
-
-src_compile() {
-	econf $(use_enable doc doxygen) || die
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die
-	insinto /usr/share/libxklavier
-	use sparc && doins "${FILESDIR}/sun.xml"
-	dodoc AUTHORS CREDITS ChangeLog NEWS README
-}
diff --git a/x11-libs/libxklavier/libxklavier-1.03.ebuild b/x11-libs/libxklavier/libxklavier-1.03.ebuild
deleted file mode 100644
index 2af1398bc25d..000000000000
--- a/x11-libs/libxklavier/libxklavier-1.03.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-1.03.ebuild,v 1.7 2005/01/08 23:34:07 slarti 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 ~mips ppc ~ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND="virtual/x11
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	use sparc && epatch "${FILESDIR}/sun-keymaps-102.patch"
-
-}
-
-src_compile() {
-
-	econf $(use_enable doc doxygen) || die
-	emake || die "emake failed"
-
-}
-
-src_install() {
-
-	einstall || die
-	insinto /usr/share/libxklavier
-	use sparc && doins "${FILESDIR}/sun.xml"
-	dodoc AUTHORS CREDITS ChangeLog NEWS README
-
-}
diff --git a/x11-libs/libxklavier/libxklavier-1.04.ebuild b/x11-libs/libxklavier/libxklavier-1.04.ebuild
deleted file mode 100644
index 104ba02991e1..000000000000
--- a/x11-libs/libxklavier/libxklavier-1.04.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-1.04.ebuild,v 1.4 2005/01/08 23:34:07 slarti 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 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc"
-
-RDEPEND="virtual/x11
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-
-	unpack ${A}
-
-	cd ${S}
-	use sparc && epatch "${FILESDIR}/sun-keymaps-102.patch"
-
-}
-
-src_compile() {
-
-	econf --with-xkb_base=/usr/X11R6/lib/X11/xkb \
-		$(use_enable doc doxygen) || die
-	emake || die "emake failed"
-
-}
-
-src_install() {
-
-	einstall || die
-	insinto /usr/share/libxklavier
-	use sparc && doins "${FILESDIR}/sun.xml"
-	dodoc AUTHORS CREDITS ChangeLog NEWS README
-
-}
diff --git a/x11-libs/libxklavier/libxklavier-1.04-r1.ebuild b/x11-libs/libxklavier/libxklavier-2.2.ebuild
index 6bc3c1c4e277..f5c5126f2084 100644
--- a/x11-libs/libxklavier/libxklavier-1.04-r1.ebuild
+++ b/x11-libs/libxklavier/libxklavier-2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-1.04-r1.ebuild,v 1.9 2005/04/09 13:34:42 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxklavier/libxklavier-2.2.ebuild,v 1.1 2006/03/12 21:50:51 foser Exp $
 
 inherit eutils
 
@@ -10,11 +10,17 @@ SRC_URI="mirror://sourceforge/gswitchit/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE="doc"
 
-RDEPEND="virtual/x11
+RDEPEND="|| ( (
+		x11-misc/xkbdata
+		x11-apps/xkbcomp
+		x11-libs/libX11
+		x11-libs/libxkbfile )
+	virtual/x11 )
 	dev-libs/libxml2"
+
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"
@@ -24,24 +30,35 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	use sparc && epatch "${FILESDIR}/sun-keymaps-102.patch"
-
-	# don't free a static var (#70633)
-	epatch ${FILESDIR}/${P}-fix_free.patch
+	# Do not error on warnings (for gcc4 support).  Patch from Fedora.
+	epatch ${FILESDIR}/${PN}-1.14-werror.patch
 
 }
 
 src_compile() {
 
-	econf --with-xkb_base=/usr/X11R6/lib/X11/xkb \
+	local xkbbase
+
+	# see bug #113108
+	if has_version x11-misc/xkbdata; 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() {
 
-	einstall || die
+	make install DESTDIR=${D} || die
+
 	insinto /usr/share/libxklavier
 	use sparc && doins "${FILESDIR}/sun.xml"
 	dodoc AUTHORS CREDITS ChangeLog NEWS README