gentoo resync : 23.12.2017

3 files changed, 26 insertions, 22 deletions

diff --git a/app-i18n/zhcon/Manifest b/app-i18n/zhcon/Manifest
index f150d6f69e01..8870a37ba72f 100644
--- a/app-i18n/zhcon/Manifest
+++ b/app-i18n/zhcon/Manifest
@@ -5,8 +5,8 @@ AUX zhcon-0.2.6-automagic-fix.patch 1363 BLAKE2B 6b03a2dd0c91953e75a11685ea07263
 AUX zhcon-0.2.6-curses.patch 694 BLAKE2B 681ad2b8314ce379ccb0ad77123cf168da41656dde31e88e1fc746557e59220645f262a62e8abfd3088c77888f0aa8fb877db7b0eba6e81f5b4299611bb38c8c SHA512 245b60dd255cff47d70cd1d4dea7b816fcbc668cfa74d5642bb9689e3f819667e76b8336ec3c746d34a3c744d2a6c1d88b32b73f20e41e1f5c830524e158c265
 AUX zhcon-0.2.6.configure.in.patch 379 BLAKE2B b87b5e6f61890d058c77eb5d578ec9db6cfc7c66ac2b599bcaef8246da118b63013b4ce918c6ffc996ca41da5d80af2db974b7ef5165b593ce7e15da947af234 SHA512 8d226fb01707b37bc5accd44fad01cf028ccfd4c9d826f4056700c9291b3f544333f80f716da4834dae5e32a6a17bdd1c7913635e14eb10764716a45b91229d6
 AUX zhcon-0.2.6.make-fix.patch 3071 BLAKE2B 527083f2fbe91ffeccdb6b6130f68d32e09e0d3b3738fac0e5626eba886a7f325836305df6ffb6f206d05f220c342b945cab2d442f3165de77e77ea66584dba9 SHA512 25ac39954f69c251ea1587f580879ca1e38502997b1b7313ef43a84d8626811c5b74e1a0065fec94f4c5acf378ee4495cb41c3ff3a902bd73973f15239c593a8
-AUX zhcon-0.2.6.sysconfdir.patch 874 BLAKE2B 50d989f570acfc03ab250f74a2c98293f7c16f761cbcf203112e5dfb4f9d6fc1ec803fce65f40012e880844e172641d656b46f58d4004de129eee197df0004d0 SHA512 db957f80b00be3bebb73120ef2556aaa673fda3b85817213617a81a651960279d23ecb768a164e161b9be7cd2289509cf0f8243eb7e2903b976b5b2bd0b0b951
+AUX zhcon-0.2.6.sysconfdir.patch 779 BLAKE2B 869a6fe3bcf632d0c29eb37145dc516fde1bc01066dd3d657b38fa91a355f613b23326653ee7bf06a368cd7fd6fe8012b70fceb0a805f9699910a1b6ad5b241b SHA512 8996e04f6cb7ba7fa1b548fa47ab3463a76aa690e59fce1614986dbf73d3569eea479c5c764e84f6994a6b6795c4fcf29f9018a3b5cee2ec075677f909de4e11
 DIST zhcon-0.2.5-to-0.2.6.diff.gz 2881 BLAKE2B eb7b3bc38ae77c7a0add2a0693822fb34a7721ec4224a5be6fc533f0c69878a66c123a12b2d38a09ab1a3360f3d1e0658ccaf35e138d102748675cd60f81df21 SHA512 c4725e600cde5a629735506c8eaa3b78df4606cd2745891a21c4f25889cff10b6fe4cbeb3cf60b85ad62ed0e46c8e7bbb802b7675f79f3a1d82f6942c393d4ad
 DIST zhcon-0.2.5.tar.gz 5011644 BLAKE2B 326add20cac0bab31c4a34a0261374f2daf8db84f0fafd774c3498c4ba42275a6258bac0b74447626e691c1e86bcd6e0a6408cb8d6af5c1ff2a8912b5dc3d411 SHA512 35f1517b649e5afe3156eb1aa7735f3d3a988fad08c433b8f343df6ba3fdef89493afe61488a76059e4bfa1db4455d21d0bde7041bab37eb50e5ab0b622218fa
-EBUILD zhcon-0.2.6-r2.ebuild 1358 BLAKE2B a059cbb4bd7deefd6585cb0625c72efeabb5865cea381659e5fc6f7a45e11b3840b8d412e53d42c2cad34962c1353ed2d767b74a3db141e977101498ad01f23d SHA512 62b999c8ad154c9adb5b2e86854d2a79d39a30c2c53bd7dc494f3cbf0811c94b7e98ef2f4920f2734ee54cfa288dafaa65816eb0f41085f8826d98206c6d8036
+EBUILD zhcon-0.2.6-r3.ebuild 1296 BLAKE2B f75f9fb5c44f4c68ccb783712b7c85e83065055812d2093cbf4fec41dbea50074048e7f6f0ef6c235333259478b6f5a4b46bed137d2dcec5425c13e8cbf9a7a8 SHA512 7c77d58404379cb4d46429d53b6bc66c494b57035bbeb3cd8c4ceb96e2e5164fd6b4762005fe8c72e1a98cfca6072f0dc9e3f93f14a8c4f66be1d5f4cca4322f
 MISC metadata.xml 620 BLAKE2B 2d07a1bd4880b59a4d6c76325ffe19ebaeacb2943797f5afeeb25ce7521d1ca406d3367496a0ebcf0235bcdd54d6e68bbb2196dd24f926877a00a0ce1313aec5 SHA512 f67cb7edc94c9d26bf5b7e89d9a02333aec62d8dce387b2449c1879f93a56654a12292b92be63936615ca916452a0d19d62bee984e2462fb939a0fe98e2e7c84
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch b/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
index bc1d8713cd22..551d656dd6e2 100644
--- a/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
+++ b/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
@@ -1,6 +1,6 @@
-diff -ruN zhcon-0.2.5/src/Makefile.am /tmp/zhcon-0.2.5/src/Makefile.am
---- a/zhcon-0.2.5/src/Makefile.am	2006-06-22 12:35:01.531885552 +0800
-+++ b/zhcon-0.2.5/src/Makefile.am	2006-06-22 12:31:44.000000000 +0800
+diff -ruN /src/Makefile.am /tmp/src/Makefile.am
+--- a/src/Makefile.am	2006-06-22 12:35:01.531885552 +0800
++++ b/src/Makefile.am	2006-06-22 12:31:44.000000000 +0800
 @@ -5,6 +5,8 @@
  
  zhcon_LDADD = display/libdisplay.a
@@ -10,9 +10,9 @@ diff -ruN zhcon-0.2.5/src/Makefile.am /tmp/zhcon-0.2.5/src/Makefile.am
  SUBDIRS = display
  
  install-exec-local:
-diff -ruN zhcon-0.2.5/src/zhcon.cpp /tmp/zhcon-0.2.5/src/zhcon.cpp
---- a/zhcon-0.2.5/src/zhcon.cpp	2006-06-22 12:35:01.398905768 +0800
-+++ b/zhcon-0.2.5/src/zhcon.cpp	2006-06-22 12:32:41.000000000 +0800
+diff -ruN src/zhcon.cpp /tmp/src/zhcon.cpp
+--- a/src/zhcon.cpp	2006-06-22 12:35:01.398905768 +0800
++++ b/src/zhcon.cpp	2006-06-22 12:32:41.000000000 +0800
 @@ -123,7 +123,7 @@
      string cfgfile = getenv("HOME");
      cfgfile += "/.zhconrc";
diff --git a/app-i18n/zhcon/zhcon-0.2.6-r2.ebuild b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
index 65f87490e84a..f428d22d614f 100644
--- a/app-i18n/zhcon/zhcon-0.2.6-r2.ebuild
+++ b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="3"
+EAPI="6"
 WANT_AUTOMAKE="1.9"
 
 inherit autotools eutils
@@ -24,16 +24,20 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}.sysconfdir.patch
+	"${FILESDIR}"/${P}.configure.in.patch
+	"${FILESDIR}"/${P}+gcc-4.3.patch
+	"${FILESDIR}"/${P}+linux-headers-2.6.26.patch
+	"${FILESDIR}"/${P}-curses.patch
+	"${FILESDIR}"/${P}-amd64.patch
+	"${FILESDIR}"/${P}-automagic-fix.patch
+	"${FILESDIR}"/${P}.make-fix.patch
+)
+
 src_prepare() {
 	epatch "${DISTDIR}"/zhcon-0.2.5-to-0.2.6.diff.gz
-	epatch "${FILESDIR}"/${P}.sysconfdir.patch
-	epatch "${FILESDIR}"/${P}.configure.in.patch
-	epatch "${FILESDIR}"/${P}+gcc-4.3.patch
-	epatch "${FILESDIR}"/${P}+linux-headers-2.6.26.patch
-	epatch "${FILESDIR}"/${P}-curses.patch
-	epatch "${FILESDIR}"/${P}-amd64.patch
-	epatch "${FILESDIR}"/${P}-automagic-fix.patch
-	epatch "${FILESDIR}"/${P}.make-fix.patch
+	default
 	for f in $(grep -lir HAVE_GGI_LIB *); do
 		sed -i -e "s/HAVE_GGI_LIB/HAVE_LIBGGI/" "${f}" || die "sed failed"
 	done
@@ -42,12 +46,12 @@ src_prepare() {
 
 src_configure() {
 	econf $(use_with ggi) \
-		$(use_with gpm) || die
+		$(use_with gpm)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 
-	dodoc AUTHORS ChangeLog README NEWS TODO THANKS || die
-	dodoc README.BSD README.gpm README.utf8 || die
+	dodoc AUTHORS ChangeLog README NEWS TODO THANKS
+	dodoc README.BSD README.gpm README.utf8
 }