x86 stable wrt bug #552188; Drop old.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xC42EB5D6

4 files changed, 16 insertions, 104 deletions

diff --git a/app-i18n/x-unikey/ChangeLog b/app-i18n/x-unikey/ChangeLog
index 983aa82b0ff6..690c6dc76a7b 100644
--- a/app-i18n/x-unikey/ChangeLog
+++ b/app-i18n/x-unikey/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/x-unikey
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/ChangeLog,v 1.29 2015/06/09 11:33:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/ChangeLog,v 1.30 2015/06/28 10:14:55 zlogene Exp $
+
+  28 Jun 2015; Mikle Kolyada <zlogene@gentoo.org> -x-unikey-1.0.4-r1.ebuild,
+  x-unikey-1.0.4-r2.ebuild:
+  x86 stable wrt bug #552188; Drop old.
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml
diff --git a/app-i18n/x-unikey/Manifest b/app-i18n/x-unikey/Manifest
index 6fa7117f0b3a..ef89ef2624ef 100644
--- a/app-i18n/x-unikey/Manifest
+++ b/app-i18n/x-unikey/Manifest
@@ -1,31 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX 01x-unikey 214 SHA256 503f1e6e0157ed0764192421a92aea7e4f356f8e733000dd06322ee8e84f0db4 SHA512 32f2911d78940a3064b05e211af6d297b1adfafae69817e91f209490c6d43025cbe40276b5e637becaf412c50450905639c5c9293a5bdef45d47d5ca23b88aca WHIRLPOOL 195bd7987c41413506292b2f98f2ea29eaaa31994286529fe58b2c931a373745785921f73ba88a2dcc690b04623e9593a95f72f0cd3df522150ce8a11c27a1c5
 AUX x-unikey-1.0.4-gcc43.patch 397 SHA256 e1c98c5eeab86b365174eae9cd2f754f0b0ca7247e7279d0ebe05f6cd8f0e119 SHA512 80daceadf9b7519d1684853814ecae66ee3464aade581ddbd40cfb1b71f6ebcbc3f9efb01510fd76678f27c8805a8215062f82a403be77ab171ff86a2baf9473 WHIRLPOOL c8a1eeaa4838a326ba80b9df655dbdf93e34637b8afd2308d734bf29e3c6ab16a2c8ad94608c052e76eb696324e34a2085f81b0ee6def20f3490f48f2224d3f3
 AUX x-unikey-1.0.4-gcc44.patch 995 SHA256 ada679a52b6bdf2c4b6be6012db1f9914d824cc6ccffe01debc6fb98d89cc06f SHA512 718fc23452485b9515e3a39b5578b42fdf9bfcbfa1f1c47e2cf16dc0e65f7e2620b4ea3783670d275546ad902024cb3f599af2a9a987eb1591d190e27d2d67ee WHIRLPOOL 53a7403ba84485deb3a58e768041b5e4f9f95c37d624bc9e9c8c738868281d4094d86d2deaee82d4e151a15f36a2e0c6a5747e305f3138c75dff17ffe02551cc
 AUX x-unikey-1.0.4-gentoo.patch 614 SHA256 648e3e7df95a51ba7c0e1b9fee30ba104ca0c3705138a30a66b12ca92be0bbd9 SHA512 928f934aa0cc3a5bb41a3df1352ec0c93c7ff49524e696a6f0361f2b916431a6f8bc4d013805c0c92a2ec0cc8b053fdabd8393fbb36d39ace1c52860bed21b14 WHIRLPOOL c3c26efc30d42a5ac515e07e76851ba282637ca1b6f44fe1e41a5e3234304c8fea16c999bd782893c847f5c9e7ddd443104e18f4534d37ce48584098cc04a71b
 DIST x-unikey-1.0.4.tar.bz2 561391 SHA256 aa7dd444853538bcba0f24c4c19692c34d4553a1df213a260c2628a7116b2dd9 SHA512 47abe4087957c4926550a0121d5cdc7b760f39691fae91c8e0562fc0f4577c22a04192667d362c9838b87fd97d2111afef1260fc88d8234bc5656bab248b5b06 WHIRLPOOL 144788e4a43e55c5a30fbb11eba6953d147823d3229550cbec370d583fd1a74e97f68c3e14b1988074788561f4e0adb836829f06ab88b1f725051dd3840256d9
-EBUILD x-unikey-1.0.4-r1.ebuild 2038 SHA256 928a99de8f99d3258e136fe16bbafdf01fbdced395cc39f6f11369a9692ecec5 SHA512 aed853c02d4dc0878e99ec83b3c2769a1a524bfb05357888780b7b7643163cf305b68f0a16494b53bad952fcfaa2b61aba7687fd000fbec004b33302155a6caf WHIRLPOOL 6024bd67a3981525388a00b4d11f4a699f1da781eedc2b9231a9a042302aa6efc55b2ca186a8082d87cb0b6e174bad11a88e5d73df3a880e86623ec4ceae573a
-EBUILD x-unikey-1.0.4-r2.ebuild 1961 SHA256 555df40c0b2212a787d09310a0de45a15164d0a5698472d1eb4a17fc5b461081 SHA512 fdc19eae306b1e1980f75da460fbac031b39fb199acf8d832be9d75ee0b16a8830aa5dcff135a628cde75b249c275a2bdd75e50c8f02d0ab50e3322d3f02c072 WHIRLPOOL 8c09dcf7695cb725531ac9754eb2529fd149f16f1071751ad0b329c5ca25ef5a676056d75084b23f0de6a123bf73a44864c2b77f8734de6e391cca82b4bd77d6
-MISC ChangeLog 3667 SHA256 e79f8a861a8d39ec56238dbdb283beba55e7be600751d597c5b7cbba8edb019a SHA512 a04cbb5641110ad589630291d26436ff7afb45309cd2984455eec1b4550d31b7377709872fd7a5feb747fae23e62a909dc1317f5f76b9472d2eb01f01a6bee65 WHIRLPOOL 8eaa8c4b187946f159ad8f9941f0bccfed74327ff5db9fdc6652a23c540457d2d27d2cc66e8ca337dee0153b79d136b9f684c6a2c8ee1567ea1967e0c79f625c
+EBUILD x-unikey-1.0.4-r2.ebuild 1960 SHA256 3df78d84dda69877f2349d0ae4096296dde25e1bda807ab16e88313e92f4c02d SHA512 99be5534b246ebec8105c690974d11a8d7323496bda3023585f695a51fe71dab0c3d3935a33b5e8d5051d84f515a78c0e2339d2920cfb485a018b08fe1aeb860 WHIRLPOOL f100adfc3feeee344eca39614df096c24aabd94ed994a857337d412920ffddef7ff92d4884bce3bd31be6ff318134d76d7aef031a9e74e04c03c7dc1f2b70fba
+MISC ChangeLog 3816 SHA256 2e54d88f8bd1dfce53efa993094b5f38725d5f20762d575ee0a21a5735152672 SHA512 de838752c7fd15a40441053d303a1d4a7b6c899bf49ef86ada2bd9e70eb0434b81522459bad2fc62308ccc12bdf0b11017459fb000996ede858701bff0488f31 WHIRLPOOL 040901d7d21fa88ccf95b78279f6085070f60bbe15539fd35c5a16bdecb33a7e36f61abb8b2d93d2469204ae760306081c36e89362152dcb7645d5be83a568f3
 MISC metadata.xml 233 SHA256 0edb1786b28a002a747560634bcd5fd3cf55c8c357243317ffd02f97e2b0a2f5 SHA512 83c93b4a6a676a405f64170e01ebace216cf1aef581614d030ad4668f2297f609c6fb9837e2ff017236abe219f3a709ae098a7b0ed57bea08ccaed650a03d3e9 WHIRLPOOL c83ace6e2068b2f8bf5d0647df9e65fd909bfaaf22293f4c10c29ebf8480b4b617ae23f49b8f03bfb31dded0f33d691bc13eee950da2c7b97c57aaf75d9fed20
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVds8VXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmilNEP/00LkJLstrLSWyAm0qyIFMDl
-uvNgGjWpNqeQ4RBfL0R3fBtFPfxCsSlCIrgk6guU6KJgvuVhLA8Kx0FTuJC+2J1k
-QKNsWmYHvnxzAyaBaKLYlpKqglVg5pVqFxphb1wuy26g9i9uo1GwxZQ1k9dT6Rvq
-y04ygHP09DcqTQu2+Fc6LTjusTYR9Gcox/rf/1kdCEluEi18pb02EvNCYJti0nJD
-9VqINViIH1AQWX3lvoPSKELTCTMLbGMQTtcZr1LC/+48MXsz5yg0IUIOrWdDpvaW
-A5I49TrpNRbNDv664EfP5MJQiCzki8arYjhpJLEWg2/tmj68LyyFInQBIm541MKb
-RJsp+CQwAAsHbsVy2svMrKuApD6tllKp9klBG4OYzXkeJwM3TD5lWQk1wgp/oWex
-sLjDKWGtgug2mo3FUTnjJlw2X1eAeRM6+oJVJw9IF53RdYrCRkHtqBq17xaRE4+7
-F7kcct9yhxM5hbguGWcVfP759BcyiOQXxiuBezqADoH7T8e5Q57kETz+FYWg6IoR
-Kj5Qets/gm7veNV8EczyaMWm0udJDttvtLtJChKa+qWC3v3ovxiTqLviU5W0dNKi
-+Qgv0NUg7O2s2xT+EFOaG0MgNNBFOny6gnDYcmaPsFCm3yHyQQ/k+0y+D7OlAvZE
-w6jinAyV4sruFn3Elhv+
-=H40g
+iJwEAQEIAAYFAlWPyJsACgkQG9wOWsQutdZqLAP/VGbpKNI1G3TLYoO4LKiMki0h
+NW3nXamL+FiYGDA8RZ9ZSN8sC6vkFXTSFF1G7fUe7iaYV9+JIdvP+z2Y2RGEbsFr
+HZCw6weRuqXOS7hiPdjIt9X5CE6Ql7wEevGBuuvqMgvWaV8mS0o/pBjUs0SJm1/W
+TBbS3x9iSgCC42pWtnE=
+=9baY
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild b/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild
deleted file mode 100644
index 1ee4595f09ea..000000000000
--- a/app-i18n/x-unikey/x-unikey-1.0.4-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.7 2015/02/13 04:33:28 naota Exp $
-
-EAPI="1"
-
-inherit autotools eutils multilib gnome2-utils
-
-DESCRIPTION="Vietnamese X Input Method"
-HOMEPAGE="http://www.unikey.org/"
-SRC_URI="mirror://sourceforge/unikey/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE="nls gtk"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libSM
-	x11-libs/libICE
-	gtk? ( >=x11-libs/gtk+-2.2:2 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-libs/glib
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# An arch specific config directory is used on multilib systems
-	has_multilib_profile && GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
-	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0/}
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-	# --with-gtk-sysconfdir to prevent sandbox violation only
-	use gtk && myconf="--with-unikey-gtk --with-gtk-sysconfdir=${GTK2_CONFDIR}"
-	econf ${myconf} || die "./configure failed"
-	emake || die
-}
-
-src_install() {
-	if use gtk;then
-		dodir "${GTK2_CONFDIR}"
-#		emake DESTDIR="${D}" install -C src/unikey-gtk || die
-	fi
-#	dobin src/xim/ukxim src/gui/unikey
-	emake DESTDIR="${D}" install || die
-	doenvd "${FILESDIR}/01x-unikey"
-
-	dodoc AUTHORS CREDITS ChangeLog NEWS README TODO
-	cd doc
-	dodoc README1ST keymap-syntax manual options ukmacro \
-		unikey-manual-0.9.pdf unikey.png unikeyrc
-}
-
-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
-		gnome2_query_immodules_gtk2
-		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() {
-	use gkt && gnome2_query_immodules_gtk2
-}
diff --git a/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild b/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild
index 0c06676a49d0..707e4ba1dc81 100644
--- a/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild
+++ b/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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-r2.ebuild,v 1.2 2015/04/21 02:22:53 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/x-unikey/x-unikey-1.0.4-r2.ebuild,v 1.3 2015/06/28 10:14:55 zlogene Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/unikey/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="nls gtk"
 
 RDEPEND="x11-libs/libX11