gentoo resync : 29.08.2018

4 files changed, 21 insertions, 87 deletions

diff --git a/app-i18n/nabi/Manifest b/app-i18n/nabi/Manifest
index c40509740c91..56c9d8c7f983 100644
--- a/app-i18n/nabi/Manifest
+++ b/app-i18n/nabi/Manifest
@@ -1,6 +1,4 @@
 AUX xinput-nabi 140 BLAKE2B 20aecc9cabb55c5848d1c853d7d41ba39447ef7b01c7c874dd0a17ab1b515310d5c20a8a52499d88be84efec5486ec229625235611d2723c6c5e66e6d1e8519a SHA512 53321a39f5ebfb96986ae225f3c3b47344885d4c07271a6b7defd9f2164564651bbdd6e58676e443806f15f51ef7588aea59a6c3ef52678b7f9f1b5f3edcc4d8
-DIST nabi-0.99.11.tar.gz 840845 BLAKE2B f1119fa1a2b079b54d9b275347d25b26eaebcd262eaf8ca8071838e1509deceb4df4b0908a354616195ba11bd2e1d994b917cbc965385bd6d9292c1bf1c24dd0 SHA512 0cc2a1e04241a13207226db6c2db811b32ca0cc41c28905122126d6193d6a83c575960aca0f4da0574e399a11b96e7b8c250b6f6245cc8ff3de37c2ea761b834
-DIST nabi-1.0.0.tar.gz 926638 BLAKE2B 4757d09846c6e450b6ecf07188f32fc31f13f5e1235a2f31679d6a70f39dabeea2aac36db16bf98b2cbc7155b9ccca1008cb1423b4bdbcba25117cb0cfa69c68 SHA512 afd621f3ba2743db429625cdf468abad97c20d91af90f01dea14a75d4a4bc7ea3770b37387acf7da8306b92cb3fbb51d74930459f7e42d137062f01d737ede94
-EBUILD nabi-0.99.11.ebuild 1055 BLAKE2B 1f9efe360a4be5292920b962bc3507e3ea25b349f18ea143a8c992a59e2139f34b7c99d1330ecaad688c337caeb0f0cfc12543ef9de486ac709965a6aa42d05c SHA512 f444e645e99c65b905d8d4780b5826535f882d1153e226a74ec12458cce390eca0abe978a46ae91bb95c979b728da700fa6ff7c7e3abb369631f9c1eeb5c5612
-EBUILD nabi-1.0.0.ebuild 1147 BLAKE2B 92bac853dc01353ae3219091678e48cf041cd0ad934e0e2e9a230bff5d71d133e034470977dbe7d44e0a439960205eab5e13e59de6c8183fa41c937d841a5fea SHA512 ad1ef398222a837d46e8db9d94cdbefa6fc3819f7ef863de06aed12d618e703ec913987b3db4e6de018ee3967c5b141f9cc04f40ef450553478c872d7b550c7f
-MISC metadata.xml 325 BLAKE2B e63b13aa21013822befd598d1c728621f69cc439fbeedcb7ec06c1a1d8af9a663dc5d417847df443532434a9d290121ce812659315e218a28bafa2f5516ee451 SHA512 83cebe62b9ad595a0d02c9f3d47483dbc7a17224a082e607b41f80749e5e7abb4f9c5b57b77eb1720aa1d9d833b40691169639e1d57e6930be3da37d8e9f104f
+DIST nabi-1.0.0.tar.gz 868761 BLAKE2B 125028a4a3a6c51edfeee45de42868c5c0397d8545fdaaffc8a305282ea7d8af102487ad86016e1d6e7275cf7e8a5cd0111bd7f8b9c38470021b94585c1cbf1d SHA512 cd093fc54fc4a40eaa85f9973999b9fe2e37344c1004b56fe9a2102bb0747294ba2af76aca2be234ce4fe07a5e8175d1bab7423dd2cee92ab88af865cd856005
+EBUILD nabi-1.0.0.ebuild 1047 BLAKE2B e408069d489b94260cdea18300ddb621b4b454cebafd3411fb570c54fd32df521971a82ff5de940c37f223081723e2511adacf51df1a87226c45df462dafe1b2 SHA512 b4c7cdcf858835a07ac19f497b0794f739309bbebc54cbffaa2ae6c9de8392f5a87eed7e71dd36fe0ef870e285837fde7ee6f8399e0e37266f092f879d27d8eb
+MISC metadata.xml 362 BLAKE2B d66af0b1838b4886a48216cddbb5cd6ee620a2d43a472e0b0b756597aa3d16c584624de99a19121f2a7990095eb63926a5fd7b0e5116160bede3bbc903d3afb3 SHA512 54caebf3c44595273dcd0d89e86517259731740de5c1427300ebf03a6c0b625b18c6091cd36dfd16fe4097ab2c823be62fc3356a52e27d3296d224c7a22abb6e
diff --git a/app-i18n/nabi/metadata.xml b/app-i18n/nabi/metadata.xml
index d811e857b5bb..61261a3a7a2e 100644
--- a/app-i18n/nabi/metadata.xml
+++ b/app-i18n/nabi/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">choehwanjin/nabi</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">nabi</remote-id>
+		<remote-id type="github">libhangul/nabi</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/nabi/nabi-0.99.11.ebuild b/app-i18n/nabi/nabi-0.99.11.ebuild
deleted file mode 100644
index 0c6dd59203a9..000000000000
--- a/app-i18n/nabi/nabi-0.99.11.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Simple Hanguk X Input Method"
-HOMEPAGE="https://code.google.com/p/nabi/"
-SRC_URI="https://nabi.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug nls"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=app-i18n/libhangul-0.1.0
-	dev-libs/glib:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.4:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/pango
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-DOCS=( AUTHORS ChangeLog ChangeLog.0 NEWS README TODO )
-
-src_configure() {
-	local myconf=
-
-	# Broken configure: --disable-debug also enables debug
-	use debug && \
-		myconf="${myconf} --enable-debug"
-
-	econf ${myconf}
-}
-
-src_install() {
-	default
-
-	insinto /etc/X11/xinit/xinput.d
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" "${FILESDIR}/xinput-${PN}" | newins - "${PN}.conf"
-}
-
-pkg_postinst() {
-	elog "You MUST add environment variable..."
-	elog
-	elog "export XMODIFIERS=\"@im=nabi\""
-	elog
-}
diff --git a/app-i18n/nabi/nabi-1.0.0.ebuild b/app-i18n/nabi/nabi-1.0.0.ebuild
index b9c453f52723..25b5d86829ac 100644
--- a/app-i18n/nabi/nabi-1.0.0.ebuild
+++ b/app-i18n/nabi/nabi-1.0.0.ebuild
@@ -1,27 +1,23 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit autotools
+EAPI="6"
 
 DESCRIPTION="Simple Hanguk X Input Method"
-HOMEPAGE="https://github.com/choehwanjin/nabi"
-SRC_URI="https://github.com/choehwanjin/${PN}/archive/${P}.tar.gz"
+HOMEPAGE="https://github.com/libhangul/nabi"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug nls"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-RDEPEND=">=app-i18n/libhangul-0.1.0
+RDEPEND=">=app-i18n/libhangul-0.1
 	dev-libs/glib:2
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-2.4:2
+	x11-libs/gtk+:2
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-libs/libX11
-	x11-libs/pango
 	virtual/libintl"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -29,28 +25,19 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog.0 NEWS README TODO )
 
-S="${WORKDIR}"/${PN}-${P}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
-	local myconf=
-
+	local myconf=()
 	# Broken configure: --disable-debug also enables debug
-	use debug && \
-		myconf="${myconf} --enable-debug"
+	use debug && myconf+=( --enable-debug )
 
-	econf ${myconf}
+	econf "${myconf[@]}"
 }
 
 src_install() {
 	default
 
 	insinto /etc/X11/xinit/xinput.d
-	sed -e "s:@EPREFIX@:${EPREFIX}:g" "${FILESDIR}/xinput-${PN}" | newins - "${PN}.conf"
+	sed -e "s:@EPREFIX@:${EPREFIX}:g" "${FILESDIR}"/xinput-${PN} | newins - ${PN}.conf
 }
 
 pkg_postinst() {