gentoo resync : 03.12.2017

4 files changed, 76 insertions, 124 deletions

diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index 4aad2e1f3292..cb2f123576f4 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -1,9 +1,9 @@
 AUX eterm-0.9.6-asm-gnu-stack.patch 292 BLAKE2B 4d4e90c0a68119ccd1f41132b7dd77f8fe388c503f5ff6e04faa08c6bee50de5d389f1e40e40396cda027748d25f0f2c28bbeec7175220ef3e861702420d6721 SHA512 cb4a1d3910fcf23bba51069b0639a1725b375a09d1bd9ae43985c1dfdd29737291888cabcb2ce03961fbd3a219437567509eaea8b3072a297774bf4cdf534baf
 DIST Eterm-0.9.5.tar.gz 796872 SHA256 63ad6e3d89571a72d8302274ebb00d569b8789e24fae038beaee7aa4b8362bd2 SHA512 ef16ec5ddf0dd91ed4c40eff2289f7a61aa5c0fbf3b95bd14afe38557572f586f1dcd459c258cdfadb1dfbc1c50874492c9cc69ee4152a569b097e86c0d7cc44 WHIRLPOOL a9f9b3ad8343caa084a4cfd9b900d15eb90b657dd5cfdf4746e0d42ab84bc8b7ee6a9e17c4da658cec44d69b30a682900a753d178ad42ae58bc87b15dbb16522
-DIST Eterm-0.9.6.tar.gz 831756 SHA256 72b907aa64f8bcf053f2ecbc8a2e243c6de353a94ecaf579ff2c4e3ae5d7e13c SHA512 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe WHIRLPOOL 51a958675fba197ec0dd069028e6a6066ab1133c030ddaad1bccf8c2e541b5063b0612ae7db80e40f30331ab5930da2b7d628b21c7da4d64eb9697163f05d90b
+DIST Eterm-0.9.6.tar.gz 831756 BLAKE2B cd309f2bd74c44066d5811845c2cfe7407064186ce445246af352e3dfe47c5a6a58730069f653bb15891b2fdde7d6e84eaf1b92e64978552aab36bd20dee10a1 SHA512 07ef5587b7c8444d49ffd6f20f09c98bd248ccee9b3de311f5705961579f707c4a8e2b69a2193500b75cc1e4bdeabb711a1dd23637d6b94433508d8a93d377fe
 DIST Eterm-bg-0.9.5.tar.gz 1883627 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8 WHIRLPOOL f03b6432d406b7882ab28f80fd0f4b63bee15d8c720a54eb42f400f7cae51c2d96641656b5e779d5ccdc19c098b1c54e03d1dc0cb27a344dad5a5c5181b571a1
-DIST Eterm-bg-0.9.6.tar.gz 1883627 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8 WHIRLPOOL f03b6432d406b7882ab28f80fd0f4b63bee15d8c720a54eb42f400f7cae51c2d96641656b5e779d5ccdc19c098b1c54e03d1dc0cb27a344dad5a5c5181b571a1
+DIST Eterm-bg-0.9.6.tar.gz 1883627 BLAKE2B eef174aa7734dc4795c76213468ae2465d5d484aee73d7d6a09e181547614b9ac23dd55b3991e1d5daa7defd65e91d40a0e01e7a44c64968e94fc6ace3ed18d6 SHA512 2d58d1342c7750f8dde93451b732cff3a0580d76635054632728cf2d8e5c5298732c855672981810cf21a8d1f5d46626abe1f35fbf33e2b713cc5d6bc82d10f8
 EBUILD eterm-0.9.5.ebuild 1804 BLAKE2B cfaa87cdfe43815db868b084359560b61ea3351804e7bbfb0236be64a027bd2d4170290b71836169f0ee1a2242ff10234cc7c1821c6b6f4eeba3c58453bec1f3 SHA512 f8fab71fe59b0484af42542d78d0b0ff915360df85a8f668064b78c7e80b1cc296480c93b67252cd85565f448a9b1e793daec1c50858daadaa115eb7070ee1dc
-EBUILD eterm-0.9.6.ebuild 1967 BLAKE2B 576b47664d595f90c688cfb9c786e04efccaef1f07e7f819324447d1f086e05bdc69d3395f5cc7f3eb5605fd39a14e581645b3cca1e9feb252d30e98bb5c7599 SHA512 495a02c891aa40cc18d4bedd411d1eb89583535c9402aaccd87e046bd1485846749ac319f0d169d8597cadb9dab6e58c5bbe6007aa9e57f0e5eee49aff1e6184
-EBUILD eterm-9999.ebuild 1849 BLAKE2B 96319a862f9f4e22ee6df14c9475dcb186b8fe3f290ff838df1c9699919328f963ee029604096e8fac447673b9e4e4d23cc37a2a2225bee6ac754edc12055a21 SHA512 4556b92cd607f3262b3180901d876d4a919f5dcc465d4774e4bf7ea92a6754932b9a7c08842233e4650a7103f4d36dafcb7e4bb4f117b7c192fbc1c82b57bc08
+EBUILD eterm-0.9.6-r1.ebuild 1535 BLAKE2B 98fff46b47dce70e0d2844937ae4a9431b35a8664365adaded8573bb9ce8eb60d8c44ee495e78683b90f32f7c5fda27104aabf209084f7f9aa8c6e4dd3ce85a7 SHA512 f2c6461e49def3a17767a09f68e0d50cd1ba515f8b2c72d10996c435e28a431e17d10e13a2ccc83e7ffcb09fbe351de98a9d85e4319da532c2cc911d703e4edf
+EBUILD eterm-9999.ebuild 1234 BLAKE2B 9d3f80e2a63823451b8ead0cba5340d02fbf5136fd01afd7aaee62a9afadf6fe0368bc5397161be77a6ca3315286ffbdb63010b7fa3363c320abfe7fd7eee573 SHA512 7a497ea960be119407540fc0a0f95ccee51135cf625b78c674e1045a056f8ae93543653084221f82d1531bdb0b0a58263706dcee9a957a9435ca882b3a1163ce
 MISC metadata.xml 862 BLAKE2B 1ba0961220ed40a7e0763746963cdcd718523078b64a093bc1400459943248cea10cfa709688f4067c61dc6d2d6b451eb86ac2b33d3cd52413e49415b1c6dcf2 SHA512 5512226bf7c4dbe11844ce39ba92b105fe7090fbbea88bbeff1c5c9f82db1c52e28854e567897c09aa5224cda6d05cd84e2325d41eb124f4e8672545626c6c9a
diff --git a/x11-terms/eterm/eterm-0.9.6-r1.ebuild b/x11-terms/eterm/eterm-0.9.6-r1.ebuild
new file mode 100644
index 000000000000..f7c451c110ee
--- /dev/null
+++ b/x11-terms/eterm/eterm-0.9.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A vt102 terminal emulator for X"
+HOMEPAGE="http://www.eterm.org/"
+SRC_URI="
+	http://www.eterm.org/download/${P^}.tar.gz
+	!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
+IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-libs/libast
+	media-libs/imlib2[X]
+	media-fonts/font-misc-misc
+	escreen? ( app-misc/screen )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( ChangeLog README ReleaseNotes bg/README.backgrounds )
+PATCHES=( "${FILESDIR}"/${P}-asm-gnu-stack.patch )
+
+S=${WORKDIR}/${P^}
+
+src_unpack() {
+	unpack ${P^}.tar.gz
+	cd "${S}" || die
+	use minimal || unpack Eterm-bg-${PV}.tar.gz
+}
+
+src_configure() {
+	export TIC="true"
+	econf \
+		--disable-static \
+		$(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) \
+		$(use_enable utempter utmp) \
+		--with-delete=execute \
+		--with-backspace=auto
+}
+
+src_install() {
+	use escreen && DOCS+=( doc/README.Escreen )
+	default
+	# We don't install headers to link against this library
+	rm -f "${ED%/}"/usr/*/libEterm.{so,la} || die
+}
diff --git a/x11-terms/eterm/eterm-0.9.6.ebuild b/x11-terms/eterm/eterm-0.9.6.ebuild
deleted file mode 100644
index 9743d88c9aa9..000000000000
--- a/x11-terms/eterm/eterm-0.9.6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-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 )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
-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 +utempter"
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXmu
-	x11-libs/libXt
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-proto/xextproto
-	x11-proto/xproto
-	>=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_prepare() {
-	epatch "${FILESDIR}"/${P}-asm-gnu-stack.patch #440618
-}
-
-src_configure() {
-	export TIC="true"
-	econf \
-		--disable-static \
-		$(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) \
-		$(use_enable utempter utmp) \
-		--with-delete=execute \
-		--with-backspace=auto
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README ReleaseNotes
-	use escreen && dodoc doc/README.Escreen
-	dodoc bg/README.backgrounds
-
-	# We don't install headers to link against this library
-	rm -f "${D}"/usr/*/libEterm.{so,la}
-}
diff --git a/x11-terms/eterm/eterm-9999.ebuild b/x11-terms/eterm/eterm-9999.ebuild
index dfc9e2055dbb..6d24ce22d910 100644
--- a/x11-terms/eterm/eterm-9999.ebuild
+++ b/x11-terms/eterm/eterm-9999.ebuild
@@ -2,21 +2,11 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils autotools
-
-MY_P=Eterm-${PV}
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.enlightenment.org/apps/eterm.git"
-	inherit git-r3
-else
-	SRC_URI="http://www.eterm.org/download/${MY_P}.tar.gz
-		!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x86-macos"
-fi
+inherit autotools git-r3
 
 DESCRIPTION="A vt102 terminal emulator for X"
 HOMEPAGE="http://www.eterm.org/"
+EGIT_REPO_URI="https://git.enlightenment.org/apps/eterm.git"
 
 LICENSE="BSD"
 SLOT="0"
@@ -24,35 +14,23 @@ IUSE="escreen minimal cpu_flags_x86_mmx cpu_flags_x86_sse2 unicode +utempter"
 
 RDEPEND="
 	x11-libs/libX11
-	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libICE
 	x11-libs/libSM
 	x11-proto/xextproto
 	x11-proto/xproto
-	>=x11-libs/libast-0.6.1
+	x11-libs/libast
 	media-libs/imlib2[X]
 	media-fonts/font-misc-misc
 	escreen? ( app-misc/screen )
 "
 DEPEND="${RDEPEND}"
 
-if [[ ${PV} == "9999" ]] ; then
-	S=${WORKDIR}/${P}
-else
-	S=${WORKDIR}/${MY_P}
-fi
+DOCS=( ChangeLog README ReleaseNotes bg/README.backgrounds )
 
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-		cd "${S}" || die
-		eautoreconf
-	else
-		unpack ${MY_P}.tar.gz
-		cd "${S}" || die
-		use minimal || unpack Eterm-bg-${PV}.tar.gz
-	fi
+src_prepare() {
+	default
+	eautoreconf
 }
 
 src_configure() {
@@ -71,11 +49,8 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc ChangeLog README ReleaseNotes
-	use escreen && dodoc doc/README.Escreen
-	dodoc bg/README.backgrounds
-
+	use escreen && DOCS+=( doc/README.Escreen )
+	default
 	# We don't install headers to link against this library
-	rm -f "${D}"/usr/*/libEterm.{so,la}
+	rm -f "${ED%/}"/usr/*/libEterm.{so,la} || die
 }