Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

9 files changed, 101 insertions, 24 deletions

diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 3d6e00179924..9081173dbb83 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index 690cb83a54f5..785a9537f891 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -1,6 +1,9 @@
 AUX eterm-0.9.6-asm-gnu-stack.patch 292 BLAKE2B 4d4e90c0a68119ccd1f41132b7dd77f8fe388c503f5ff6e04faa08c6bee50de5d389f1e40e40396cda027748d25f0f2c28bbeec7175220ef3e861702420d6721 SHA512 cb4a1d3910fcf23bba51069b0639a1725b375a09d1bd9ae43985c1dfdd29737291888cabcb2ce03961fbd3a219437567509eaea8b3072a297774bf4cdf534baf
+DIST Eterm-0.9.5.tar.gz 796872 BLAKE2B 9b1fbe3d1b0345f41db6c2e4421c042f19b4932b238a2f47946e4c25e22c6992dc5a533e3f14a0194b1ca8585120cfa65091e145154c2fc45d289276cdc57320 SHA512 ef16ec5ddf0dd91ed4c40eff2289f7a61aa5c0fbf3b95bd14afe38557572f586f1dcd459c258cdfadb1dfbc1c50874492c9cc69ee4152a569b097e86c0d7cc44
 DIST Eterm-0.9.6.tar.gz 831756 BLAKE2B cd309f2bd74c44066d5811845c2cfe7407064186ce445246af352e3dfe47c5a6a58730069f653bb15891b2fdde7d6e84eaf1b92e64978552aab36bd20dee10a1 SHA512 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe
+DIST Eterm-bg-0.9.5.tar.gz 1883627 BLAKE2B eef174aa7734dc4795c76213468ae2465d5d484aee73d7d6a09e181547614b9ac23dd55b3991e1d5daa7defd65e91d40a0e01e7a44c64968e94fc6ace3ed18d6 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8
 DIST Eterm-bg-0.9.6.tar.gz 1883627 BLAKE2B eef174aa7734dc4795c76213468ae2465d5d484aee73d7d6a09e181547614b9ac23dd55b3991e1d5daa7defd65e91d40a0e01e7a44c64968e94fc6ace3ed18d6 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8
-EBUILD eterm-0.9.6-r2.ebuild 1465 BLAKE2B 49f120948da5ca18d5367a4c8dbd3ff6e01d5c916b79bafd7392cb90078d1aae234d22d53275aa7925f518e6b311adaef9c08650828544f23b69f9a42e7a4f58 SHA512 b395bd17ca516859c9d027b3a775ab7b948bc1e106f97469b0b62c924b7f2a0bdafc9ff4eeca873c65483ddfc3081c7e55403be5f891eb284a9e1f205091f798
+EBUILD eterm-0.9.5.ebuild 1755 BLAKE2B 7bc50a8d219eb371b697ae006763ba2c0b30d730395e45f554fbfdfdffcf5b382019c1c0940f1b0579159803ae9daab798edb2c39b127a2aa9e3edf0ca2b5171 SHA512 28ca4be7f20a9b2304db8f0683a86463f91588be364e8e893a0aa74b2e14f3b34d447f9bb1938c686e02a6492bee8b68c0a597cd1c77118b0fc941383c1b5e04
+EBUILD eterm-0.9.6-r2.ebuild 1467 BLAKE2B b7eb492432461aac0730c8929b6c9bf1f131c94f867e630c4762af93f4e05ae6f4afafc1cc137df42d3bfb4b9a06f8ac7ba11548ba47927bc07595780c7e28df SHA512 5901e1e35f97c7ea661b631304227b79fdf1f199d422be4df26930e97ed16136cb92494899147d2323c9311dbfb89a1bd25dd61f4237dd0e57c88870b620ac9b
 EBUILD eterm-9999.ebuild 1195 BLAKE2B 083dd092a63b1df6585353fd7e6dc71190ee9cd4dbc979e1c5e75ed9317495c18250039af9e599171e27c4b841fc35ae81b1607429eeaae22593d2d1208ba328 SHA512 ef1d09e3a7c3a54571c6a460b548dde075eeca921899fe54f11d6263106c1a7f87b4ec6d1ddd989739c6c3c0869bccd55236c5ce6dc5d186d0a5b0a231e8a652
 MISC metadata.xml 812 BLAKE2B c3f47ef367d27e0ad69c54e22fdbda24d3673208561b9a7827f612d1d487e4ab2ffd05c02832b112ef8c599921bc3a59c3296b50874a2bf52218fc5dbf76f960 SHA512 86f0b751166e5ccf7de8e65a8acc6c74a189be1d692b9e470c9142a351de2f436a7e62237dea218d1e143b0a2e5423e419d194cbbc911a5e1f5787bf570aba7a
diff --git a/x11-terms/eterm/eterm-0.9.5.ebuild b/x11-terms/eterm/eterm-0.9.5.ebuild
new file mode 100644
index 000000000000..c0851088174e
--- /dev/null
+++ b/x11-terms/eterm/eterm-0.9.5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit eutils autotools
+
+MY_P=Eterm-${PV}
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="https://svn.enlightenment.org/svn/e/trunk/eterm/Eterm"
+	inherit subversion
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
+		!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )
+		mirror://sourceforge/eterm/${MY_P}.tar.gz
+		!minimal? ( mirror://sourceforge/eterm/Eterm-bg-${PV}.tar.gz )"
+	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86"
+fi
+
+DESCRIPTION="A vt102 terminal emulator for X"
+HOMEPAGE="http://www.eterm.org/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libICE
+	x11-libs/libSM
+	>=x11-libs/libast-0.6.1
+	media-libs/imlib2[X]
+	media-fonts/font-misc-misc
+	escreen? ( app-misc/screen )"
+DEPEND="${RDEPEND}"
+
+if [[ ${PV} == "9999" ]] ; then
+	S=${WORKDIR}/${ECVS_MODULE}
+else
+	S=${WORKDIR}/${MY_P}
+fi
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		subversion_src_unpack
+		cd "${S}"
+		eautoreconf
+	else
+		unpack ${MY_P}.tar.gz
+		cd "${S}"
+		use minimal || unpack Eterm-bg-${PV}.tar.gz
+	fi
+}
+
+src_configure() {
+	export TIC="true"
+	econf \
+		$(use_enable escreen) \
+		--with-imlib \
+		--enable-trans \
+		$(use_enable cpu_flags_x86_mmx mmx) \
+		$(use_enable cpu_flags_x86_sse2 sse2) \
+		$(use_enable unicode multi-charset) \
+		--with-delete=execute \
+		--with-backspace=auto
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+	dodoc ChangeLog README ReleaseNotes
+	use escreen && dodoc doc/README.Escreen
+	dodoc bg/README.backgrounds
+}
diff --git a/x11-terms/eterm/eterm-0.9.6-r2.ebuild b/x11-terms/eterm/eterm-0.9.6-r2.ebuild
index db5513aa22c9..0d649eeabdf2 100644
--- a/x11-terms/eterm/eterm-0.9.6-r2.ebuild
+++ b/x11-terms/eterm/eterm-0.9.6-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x86-macos"
 IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
 
 RDEPEND="
diff --git a/x11-terms/xvt/Manifest b/x11-terms/xvt/Manifest
index f27b7e97ea70..7b65adf13ec2 100644
--- a/x11-terms/xvt/Manifest
+++ b/x11-terms/xvt/Manifest
@@ -1,8 +1,8 @@
-AUX xvt-int-main.patch 369 BLAKE2B 51f4bf0d118969b481d12c4113fee1d0c54ee912e048b152b3d0145d9b390a71e86cd658ec33386a42499dceab66f4eb7594158bb47f31c71a9de82fc073cc6f SHA512 76095e594646871771fbd72abe6da7a84a66ed3554534d1b0c0a81ad5648b38d3438cc5e0b40672f809380cfe2122e3a54f9c109477a7148ffdae222cd629cc6
-AUX xvt-makefile.patch 494 BLAKE2B eac194e470d97ccbb3fcb08ab3dc07068495cdfca52d72c420dc2eb706e3acc7c475ceb0b483b8b1339b470a2256c250d2c19b33a804337b29d8bcf114acbb33 SHA512 60421804cc8a892c437d2080b0348c1f32a38aa3da8186ea5b0d733f34b11a8683f4aa3c9dc909c816878c25f9caa67da08fa6a36c2ff6a303bf195c11cf45b7
+AUX xvt-int-main.patch 458 BLAKE2B c84e771ef9eb3d9b51af6a3c47dbb8575bc276fb7df44c94f1cfa6d5a2e9903bec63eb39eb59fd6eb1cb6a7832fb7a77d97c5d0dbb61b5e4d75755993c3effdc SHA512 511525c6016974951c3157a817bbd6c23e630de53f412f275112303bd01ca5b865412d5a2f69d2b2e38e02e1989dca25681707477298f39e501a20a9d8e6cc22
+AUX xvt-makefile.patch 583 BLAKE2B 15de8d067703a8ab2b39d138d81fedda3f2b067c8d6e698705a75c72e8ad19e53a6369ad65dee79cf6fa0ef56b28e5e10340ffd5b0f5591469b59f5ef62dd2b8 SHA512 8c68862bc02a7646e4288a07b40bf703c3acb94ebb29725ed87c734643b4f039b828a65bd3c4745d69bb81ac4b358ca12b12e95ba51c453c8610a6cceaa7d146
 AUX xvt-pts.patch 211 BLAKE2B e2ed767f2b2e0e690e694e8dca0c4b7773bea3be1c945bf23e8877ef835e3dee78aaa984c1e7c0d1e4ed549270af8d2259243b638d9a78c341a510168d7bafc1 SHA512 ba3f910018d7e5efaf788ff9d5fe5c7ec74a088522a04c46702f83f9a60455004310e3a32547b3a2feb679056c08af07ace19ad73ddbdbc93a797da7482b420d
-AUX xvt-ttyinit-svr4pty.diff 1308 BLAKE2B 0ac8e7b40d23870f8e925b326261618942cf23f71677424c09180d8050e2f4e27d3ff8a2f62e90325e34a1377b5da419509ae4bf30dc1d0565928b205dc77745 SHA512 6039acfed6dc8effb99e9dc633472387db7ccadb842d52b32e9bc9d21a30e54419c1dc1a796834353412c72e5024944b0c7aa995083a5b931ecb16d63d0a3b9f
+AUX xvt-ttyinit-svr4pty.diff 1380 BLAKE2B d463934a10bfa400e27d045e245fb34f7982630c1241955ecdf20e04c7f816c7281db80ae590101b322ca7a12e391d92bf842d35820f97e23930ec5b01eca597 SHA512 790b97e5f05738bfc912af030733db4ee0b419844f1b9d4d6655b3dc3cf225d513fa3e3aed0f877a68bda9530fcd463fa0bb75bd34e38c3ba4eeccb4b8ff7da4
 DIST xvt-1.0.tar.Z 59445 BLAKE2B 9b50b7c2c9832621960249f9b04eff9b2be04b90766865bc2cd55d67ca348bf41b539906125c8a51a3e08e13d6fc3402a57ef5f31d781e675061910ce53198dc SHA512 671fdc931526821e9228c327d2231e0f241997c632b0f084b2be02b99296ececa64f2de2769e92c3682c0aa2e9cf8dc61ac561ffd1d10136256029d24f872a1b
 DIST xvt-2.1.diff.gz 39941 BLAKE2B cbb491f0f65ac6ae8f8a801e68f6f08805c886c16a000d7e54fb24ac08d17133958eb376306b2b30dfc4def447ec62259cebd43854433405c0aee080a79addf7 SHA512 c229cb98ef3de7b4ab76b81ae888fc3a59ff9fcf5807ecdc58f8e5b634f9c2e618d2b3c17b4cd6410903004a712aac1c1d329751a48f05d605a7eb23dd58d612
-EBUILD xvt-2.1-r3.ebuild 903 BLAKE2B 92ecf6c6884f662f006613a7fa7b0a4f98ec2ad2dc3c974daa5195f61d92e2d87bf96aa37ce38d681bcf6ee9bd366fc333fc471446d2bb4aa1b7937e6d3335fe SHA512 f826430ccab41f86eec88643595066099bb5c37bcf10e3c636266d3e27ce34785a4c154449a4d25873498fa6e1f096c14fa1a270ef47e8c47ce05ed130a75574
+EBUILD xvt-2.1-r3.ebuild 968 BLAKE2B 2523463d31dc242f0572ae4aa7a6ad2240ea05e59f7eb3e092be17dc790723ee651f412938f39f96fa4c10403d915fabb8e665f294bdaa7a32894cb43d63bdc7 SHA512 e39ff03ae93614514b2de87691475132943b41a545de6ed3c881d60b8e48b2a5d044a4391668ed23aa59550bea83f8b4193ded225fe47858d172b40ce91452c9
 MISC metadata.xml 256 BLAKE2B d8cfa88bc259cee95291c384760fad2dfd13f0973776fa55889f61befec06d0bea7953e0d6f3122eda6278272f217b8d94b536982db23815285d66074ab69089 SHA512 954fbecba4916b2b5e4b353a55a7c4ae6bd9be7190f6550ae4eb003f4037698a4576aee03847d4def6a5ca6dfbb9d145749a6fdb44b8a77477f726c92968643b
diff --git a/x11-terms/xvt/files/xvt-int-main.patch b/x11-terms/xvt/files/xvt-int-main.patch
index a0874e45f419..81baa76ce5e0 100644
--- a/x11-terms/xvt/files/xvt-int-main.patch
+++ b/x11-terms/xvt/files/xvt-int-main.patch
@@ -1,5 +1,5 @@
---- a/xvt.c
-+++ b/xvt.c
+--- xvt-1.0/xvt.c.orig	2009-09-04 15:49:13.000000000 +0200
++++ xvt-1.0/xvt.c	2009-09-04 15:49:13.000000000 +0200
 @@ -41,9 +41,9 @@
  #endif /* UKC_LOCATIONS */
  
diff --git a/x11-terms/xvt/files/xvt-makefile.patch b/x11-terms/xvt/files/xvt-makefile.patch
index b147d9d8c2b9..368fdeeb00be 100644
--- a/x11-terms/xvt/files/xvt-makefile.patch
+++ b/x11-terms/xvt/files/xvt-makefile.patch
@@ -1,5 +1,5 @@
---- a/Makefile
-+++ b/Makefile
+--- xvt-1.0/Makefile.orig	2009-09-04 15:45:08.000000000 +0200
++++ xvt-1.0/Makefile	2009-09-04 15:46:00.000000000 +0200
 @@ -27,7 +27,7 @@
  #ARCH=AIX3
  #ARCH=ULTRIX
diff --git a/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff b/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff
index 1cc370b94d7a..a858250c1d8a 100644
--- a/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff
+++ b/x11-terms/xvt/files/xvt-ttyinit-svr4pty.diff
@@ -1,5 +1,5 @@
---- a/ttyinit.c
-+++ b/ttyinit.c
+--- ttyinit.c	2004-08-24 18:51:18.510722064 +0100
++++ ttyinit.c.new	2004-08-24 18:50:30.539014872 +0100
 @@ -46,6 +46,7 @@
  #include <pwd.h>
  #include <errno.h>
diff --git a/x11-terms/xvt/xvt-2.1-r3.ebuild b/x11-terms/xvt/xvt-2.1-r3.ebuild
index ec2d970817df..51aaecb83268 100644
--- a/x11-terms/xvt/xvt-2.1-r3.ebuild
+++ b/x11-terms/xvt/xvt-2.1-r3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="2"
 
-inherit toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="A tiny vt100 terminal emulator for X"
 HOMEPAGE="ftp://ftp.x.org/R5contrib/xvt-1.0.README"
@@ -21,29 +21,27 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}-1.0
 
-PATCHES=(
+src_prepare() {
 	# this brings the distribution upto version 2.1
-	"${WORKDIR}"/${P}.diff
+	epatch "${WORKDIR}"/${P}.diff
 
 	# fix #61393
-	"${FILESDIR}/${PN}-ttyinit-svr4pty.diff"
+	epatch "${FILESDIR}/${PN}-ttyinit-svr4pty.diff"
 
 	# CFLAGS, CC #241554
-	"${FILESDIR}/${PN}-makefile.patch"
+	epatch "${FILESDIR}/${PN}-makefile.patch"
 
 	# int main, not void main
-	"${FILESDIR}/${PN}-int-main.patch"
+	epatch "${FILESDIR}/${PN}-int-main.patch"
 
 	# fix segfault (bug #363883)
-	"${FILESDIR}/${PN}-pts.patch"
-)
+	epatch "${FILESDIR}/${PN}-pts.patch"
 
-src_configure() {
 	tc-export CC
 }
 
 src_install() {
-	dobin xvt
+	dobin xvt || die "dobin failed"
 	doman xvt.1
-	einstalldocs
+	dodoc README
 }