Might as well tackle repoman issues too.

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

3 files changed, 8 insertions, 75 deletions

diff --git a/app-i18n/x-unikey/Manifest b/app-i18n/x-unikey/Manifest
index fe99d23587bb..dee0da3e1d8c 100644
--- a/app-i18n/x-unikey/Manifest
+++ b/app-i18n/x-unikey/Manifest
@@ -4,10 +4,7 @@ AUX x-unikey-1.0.4-gcc44.patch 995 RMD160 7216136c48bdd4ff641ac1eb5b4d7cb57edfd0
 AUX x-unikey-1.0.4-gentoo.patch 614 RMD160 a8c22c35b75b9c6b5be84e8c6f238ba3a59a7d99 SHA1 cb0cb0b27342a16cc0ccffd74ced37de2bad9b11 SHA256 648e3e7df95a51ba7c0e1b9fee30ba104ca0c3705138a30a66b12ca92be0bbd9
 DIST x-unikey-0.9.2.tar.bz2 347785 RMD160 e7bafcc67894156947e52979c5576f6c2b3ed7b9 SHA1 11a7d0d3d497401a20359f6e204bdd504a55ac63 SHA256 54c810c23ed51c31e8ed44702eca38358c5864caba95d84049c782f4c241c250
 DIST x-unikey-1.0.4.tar.bz2 561391 RMD160 151254e9e8d32f1386abc6c5e7009b3f5caf8207 SHA1 07deeaa14bde4395824972cc3b9c94afdda8cc34 SHA256 aa7dd444853538bcba0f24c4c19692c34d4553a1df213a260c2628a7116b2dd9
-DIST x-unikey-manual.html 18349 RMD160 07418dbb9371d91ba9758286be5c96489c98b5aa SHA1 62f2044e5e831a2d0044e6366752b4d9dd45b71e SHA256 cbba2ca916c29ec199a9b8b1288d15f40566118161e6ee0623357b7e1f4a98ea
-DIST x-unikey-manual.pdf 211007 RMD160 0463694e7fe3dfd2cdf721e27d664a301e59f923 SHA1 4ef2d80beb6e1b834e5fa159c6f76273370ff1b5 SHA256 43f5a547a91c7ef8c9d66c24da0102b9c0ef5b9ef06ed10bc3871920baac8b8e
-EBUILD x-unikey-0.9.2.ebuild 1468 RMD160 8602b44fbdc1ccb176c54b1fd444df9794dd7317 SHA1 d813506efdf13e03dffe0c5398772f0efa25d1f0 SHA256 6fa0f00753726b8fde113dd5cfce7de3b0884089dd5d9a2b22d6485d2d0a8560
+EBUILD x-unikey-0.9.2.ebuild 1499 RMD160 14018d8a37adb6011c61b6965819eed826130921 SHA1 e49f02ea593d207291c9840b64d81f712e2e6986 SHA256 00fcf380ef5340f748ab4fb820833424cdf6b3738105cda5986556984f2c5631
 EBUILD x-unikey-1.0.4-r1.ebuild 2092 RMD160 7e03e8a86f54a1a78b1fbb696f9dbc5dc59439fa SHA1 825278ade8c6d63c79bffcc524b5c4e7209a9a16 SHA256 880c054037911340f378115d64ef2b936859c9bac2c92cad88ac9c15150df12f
-EBUILD x-unikey-1.0.4.ebuild 1721 RMD160 9a594c30074b52f498ed1dd7e6377629b6d195e1 SHA1 88d6f8fe6565141a471a934ba4e11e1900caed80 SHA256 cc6f602dcc3f9155bce3029779b39836205cadd78a055005429bc4327569244f
 MISC ChangeLog 2777 RMD160 b1043c2e10831625c1eda4dda19b851c5568c2d0 SHA1 b390c8093367b29683d2a448defe63301350f72e SHA256 47b9ef99317417f6b1fe329462cd2a0dfae6f860a0109199e9c401352e51f062
 MISC metadata.xml 158 RMD160 3852afaaf28a37630993c0442eeb16eaee47d0f7 SHA1 2eb582eae6a2477a9ed984ea45f3b5f649954e54 SHA256 18d71c580f82a389887f4970802b5f40e0a2e4c6019117e64268e008dfb81fc8
diff --git a/app-i18n/x-unikey/x-unikey-0.9.2.ebuild b/app-i18n/x-unikey/x-unikey-0.9.2.ebuild
index b35f061f142e..83aaef8438d0 100644
--- a/app-i18n/x-unikey/x-unikey-0.9.2.ebuild
+++ b/app-i18n/x-unikey/x-unikey-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-0.9.2.ebuild,v 1.8 2007/07/22 09:48:19 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-0.9.2.ebuild,v 1.9 2009/08/10 11:51:50 ssuominen Exp $
 
 inherit eutils
 
@@ -18,6 +18,7 @@ DEPEND="x11-libs/libX11
 	x11-libs/libICE
 	nls? ( sys-devel/gettext )
 	gtk? ( >=x11-libs/gtk+-2.2 )"
+RDEPEND="${DEPEND}"
 
 src_compile() {
 	local myconf
@@ -30,10 +31,10 @@ src_compile() {
 src_install() {
 	if use gtk;then
 		dodir etc/gtk-2.0
-		make DESTDIR=${D} install -C src/unikey-gtk
+		emake DESTDIR="${D}" install -C src/unikey-gtk
 	fi
 	dobin src/xim/ukxim src/gui/unikey
-	doenvd ${FILESDIR}/01x-unikey
+	doenvd "${FILESDIR}"/01x-unikey
 	dodoc doc/manual doc/ukmacro doc/unikeyrc
 }
 
@@ -43,7 +44,7 @@ pkg_postinst() {
 	elog "to enable x-unikey"
 	elog ""
 	if use gtk; then
-		gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
+		gtk-query-immodules-2.0 > "${ROOT}"/etc/gtk-2.0/gtk.immodules
 		elog "If you want to use x-unikey as the default gtk+ input method,"
 		elog "change GTK_IM_MODULE in /etc/env.d/01x-unikey to \"unikey\""
 		elog ""
@@ -52,6 +53,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if use gtk; then
-		gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
+		gtk-query-immodules-2.0 > "${ROOT}"/etc/gtk-2.0/gtk.immodules
 	fi
 }
diff --git a/app-i18n/x-unikey/x-unikey-1.0.4.ebuild b/app-i18n/x-unikey/x-unikey-1.0.4.ebuild
deleted file mode 100644
index 282ea4db5d15..000000000000
--- a/app-i18n/x-unikey/x-unikey-1.0.4.ebuild
+++ /dev/null
@@ -1,65 +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/x-unikey/x-unikey-1.0.4.ebuild,v 1.4 2007/07/22 09:48:19 calchan Exp $
-
-inherit eutils
-
-DESCRIPTION="Vietnamese X Input Method"
-HOMEPAGE="http://unikey.sourceforge.net/linux.php"
-SRC_URI="mirror://sourceforge/unikey/${P}.tar.bz2
-	doc? ( http://unikey.org/manual/x-unikey-manual.html http://unikey.org/manual/x-unikey-manual.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc ~x86"
-IUSE="nls gtk doc"
-
-DEPEND="x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE
-	nls? ( sys-devel/gettext )
-	gtk? ( >=x11-libs/gtk+-2.2 )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2 || die "unpack failed"
-	if use doc; then
-		cp ${DISTDIR}/x-unikey-manual.html ${DISTDIR}/x-unikey-manual.pdf ${WORKDIR}/${P}/doc
-	fi
-}
-
-src_compile() {
-	local myconf
-	# --with-gtk-sysconfdir to prevent sandbox violation only
-	use gtk && myconf="--with-unikey-gtk --with-gtk-sysconfdir=${D}/etc/gtk-2.0"
-	econf ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	if use gtk;then
-		dodir etc/gtk-2.0
-		make DESTDIR=${D} install -C src/unikey-gtk
-	fi
-	dobin src/xim/ukxim src/gui/unikey
-	doenvd ${FILESDIR}/01x-unikey
-	dodoc doc/*
-}
-
-pkg_postinst() {
-	elog ""
-	elog "Go to /etc/env.d/01x-unikey and uncomment appropriate lines"
-	elog "to enable x-unikey"
-	elog ""
-	if use gtk; then
-		gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-		elog "If you want to use x-unikey as the default gtk+ input method,"
-		elog "change GTK_IM_MODULE in /etc/env.d/01x-unikey to \"unikey\""
-		elog ""
-	fi
-}
-
-pkg_postrm() {
-	if use gtk; then
-		gtk-query-immodules-2.0 > ${ROOT}/etc/gtk-2.0/gtk.immodules
-	fi
-}