Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

3 files changed, 81 insertions, 2 deletions

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="