commit: 6eaf7b8b42f48f3f08aa7f18461a4bb9ba11cc0a Author: Harri Nieminen <moikkis <AT> gmail <DOT> com> AuthorDate: Thu Nov 23 20:06:32 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Dec 2 13:03:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eaf7b8b
x11-terms/eterm: EAPI 3 -> 6 libXmu dependency was removed upstream https://git.enlightenment.org/apps/eterm.git/commit/?id=c81f5795de828ab88232f5a7481437f17b9e6831 Package-Manager: Portage-2.3.16, Repoman-2.3.6 Closes: https://github.com/gentoo/gentoo/pull/6273 x11-terms/eterm/Manifest | 4 +- x11-terms/eterm/eterm-0.9.6-r1.ebuild | 62 +++++++++++++++++++++++++ x11-terms/eterm/eterm-0.9.6.ebuild | 85 ----------------------------------- 3 files changed, 64 insertions(+), 87 deletions(-) diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest index 5d89a30677e..179e40cf1d3 100644 --- a/x11-terms/eterm/Manifest +++ b/x11-terms/eterm/Manifest @@ -1,4 +1,4 @@ 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 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 00000000000..f7c451c110e --- /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 9743d88c9aa..00000000000 --- 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} -}
