Fixed dependency, bug #189292.

(Portage version: 2.1.3.19)

7 files changed, 11 insertions, 139 deletions

diff --git a/app-i18n/scim-tables/ChangeLog b/app-i18n/scim-tables/ChangeLog
index 94c0f8b5d96f..03b4d3e07362 100644
--- a/app-i18n/scim-tables/ChangeLog
+++ b/app-i18n/scim-tables/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-i18n/scim-tables
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/ChangeLog,v 1.51 2007/11/01 12:59:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/ChangeLog,v 1.52 2007/11/16 18:01:35 matsuu Exp $
+
+  16 Nov 2007; <matsuu@gentoo.org> -files/scim-tables-qt335.patch,
+  -scim-tables-0.5.3.ebuild, -scim-tables-0.5.6-r1.ebuild,
+  scim-tables-0.5.7.ebuild:
+  Removed old versions.
+  Fixed dependency, bug #189292.
 
   01 Nov 2007; Raúl Porcel <armin76@gentoo.org> scim-tables-0.5.7.ebuild:
   alpha stable wrt #189292
diff --git a/app-i18n/scim-tables/files/digest-scim-tables-0.5.3 b/app-i18n/scim-tables/files/digest-scim-tables-0.5.3
deleted file mode 100644
index 7bbd99a2660f..000000000000
--- a/app-i18n/scim-tables/files/digest-scim-tables-0.5.3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0e4c216af80e6a7d40d3d0224f84b22a scim-tables-0.5.3.tar.gz 5539832
-RMD160 8bd835dd9973106f436f178155f79b76f0e1e01c scim-tables-0.5.3.tar.gz 5539832
-SHA256 3a5b0736d66687dfae24d95a4d3ed62b36f8135d0c304a4aeb5d9d586c1fd00f scim-tables-0.5.3.tar.gz 5539832
diff --git a/app-i18n/scim-tables/files/digest-scim-tables-0.5.6-r1 b/app-i18n/scim-tables/files/digest-scim-tables-0.5.6-r1
deleted file mode 100644
index 135643ee8e14..000000000000
--- a/app-i18n/scim-tables/files/digest-scim-tables-0.5.6-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 122f8bcc6b7eb5805df46461ed48bf2c kde-admindir-3.5.3.tar.bz2 187248
-RMD160 81eedc1b81f2cee6709b7c8ad08859024da090f6 kde-admindir-3.5.3.tar.bz2 187248
-SHA256 0cd8bf32dad0affa56edf5723747275be2b1e0702abefc28ded8763ad58fe07b kde-admindir-3.5.3.tar.bz2 187248
-MD5 ff8d59e8f3dedb7dd7c6d87c8fc408db scim-tables-0.5.6.tar.gz 7058913
-RMD160 768b298cd9359742eedf1297f73a5be6eee3361e scim-tables-0.5.6.tar.gz 7058913
-SHA256 408cddeed4f5f9105f61822388fcd8947b1f2ba2d66bdabfa2be4e4f1d9393d0 scim-tables-0.5.6.tar.gz 7058913
diff --git a/app-i18n/scim-tables/files/scim-tables-qt335.patch b/app-i18n/scim-tables/files/scim-tables-qt335.patch
deleted file mode 100644
index 40e7ed9ae5cb..000000000000
--- a/app-i18n/scim-tables/files/scim-tables-qt335.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: scim-tables-0.5.6/skim/setupui/generictableui.ui
-===================================================================
---- scim-tables-0.5.6.orig/skim/setupui/generictableui.ui
-+++ scim-tables-0.5.6/skim/setupui/generictableui.ui
-@@ -336,16 +336,4 @@
-     </connection>
- </connections>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--    <includehint>skimeditshortcutbutton.h</includehint>
--    <includehint>klineedit.h</includehint>
--</includehints>
- </UI>
diff --git a/app-i18n/scim-tables/scim-tables-0.5.3.ebuild b/app-i18n/scim-tables/scim-tables-0.5.3.ebuild
deleted file mode 100644
index 927449c30c33..000000000000
--- a/app-i18n/scim-tables/scim-tables-0.5.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.3.ebuild,v 1.9 2007/07/22 09:28:36 calchan Exp $
-
-inherit kde-functions eutils
-
-DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND="x11-libs/libXt
-	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-qt335.patch"
-}
-
-src_compile() {
-	econf --without-arts || die "econf failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "install failed"
-	dodoc README ChangeLog AUTHORS
-}
diff --git a/app-i18n/scim-tables/scim-tables-0.5.6-r1.ebuild b/app-i18n/scim-tables/scim-tables-0.5.6-r1.ebuild
deleted file mode 100644
index b350a080f677..000000000000
--- a/app-i18n/scim-tables/scim-tables-0.5.6-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.6-r1.ebuild,v 1.6 2007/07/22 09:28:36 calchan Exp $
-
-inherit kde-functions autotools eutils
-
-DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server"
-HOMEPAGE="http://www.scim-im.org/"
-SRC_URI="mirror://sourceforge/scim/${P}.tar.gz
-	mirror://gentoo/kde-admindir-3.5.3.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE="kde nls"
-LANGS="am ar bn gu hi ja kn ko ml ne pa ru ta te th vi zh"
-for i in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${i}"
-done
-
-RDEPEND="x11-libs/libXt
-	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )
-	!alpha? ( !sparc? ( kde? ( app-i18n/skim ) ) )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	elog "Not all languages are going to be compiled."
-	elog "Please set LINGUAS to your preferred language(s)."
-	elog "Supported LINGUAS values are:"
-	elog "${LANGS}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-fixconfigure.patch"
-	epatch "${FILESDIR}/${PN}-qt335.patch"
-
-	#AT_NO_RECURSIVE=yes eautoreconf
-	AT_NO_RECURSIVE=yes AT_M4DIR=${S}/m4 eautoreconf
-}
-
-src_compile() {
-	strip-linguas ${LANGS}
-	local use_languages="additional ${LINGUAS}"
-	elog "Languages being compiled are: ${use_languages}"
-
-	for m in Makefile.in Makefile.am ; do
-		sed -e "/^SUBDIRS/s/.*/SUBDIRS = ${use_languages}/g" \
-			tables/${m} > ${T}/${m} || die "sed ${m} failed"
-		cp ${T}/${m} tables/${m} || die "mv ${m} failed"
-	done
-
-	econf \
-		$(use_enable kde skim-support) \
-		$(use_enable nls) \
-		--disable-static \
-		--disable-dependency-tracking \
-		--without-arts || die "econf failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README ChangeLog AUTHORS
-}
diff --git a/app-i18n/scim-tables/scim-tables-0.5.7.ebuild b/app-i18n/scim-tables/scim-tables-0.5.7.ebuild
index 7a2a40fabfb3..fd901c64f317 100644
--- a/app-i18n/scim-tables/scim-tables-0.5.7.ebuild
+++ b/app-i18n/scim-tables/scim-tables-0.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.7.ebuild,v 1.10 2007/11/01 12:59:02 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/scim-tables/scim-tables-0.5.7.ebuild,v 1.11 2007/11/16 18:01:35 matsuu Exp $
 
 inherit kde-functions autotools eutils
 
@@ -20,7 +20,7 @@ done
 
 RDEPEND="x11-libs/libXt
 	|| ( >=app-i18n/scim-1.1 >=app-i18n/scim-cvs-1.1 )
-	!alpha? ( !sparc? ( kde? ( app-i18n/skim ) ) )
+	kde? ( app-i18n/skim )
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
@@ -49,8 +49,8 @@ src_compile() {
 
 	for m in Makefile.in Makefile.am ; do
 		sed -e "/^SUBDIRS/s/.*/SUBDIRS = ${use_languages}/g" \
-			tables/${m} > ${T}/${m} || die "sed ${m} failed"
-		cp ${T}/${m} tables/${m} || die "mv ${m} failed"
+			tables/${m} > "${T}"/${m} || die "sed ${m} failed"
+		cp "${T}"/${m} tables/${m} || die "mv ${m} failed"
 	done
 
 	econf \