Version bump and clean up library install #403105 by David.

Package-Manager: portage-2.2.0_alpha86/cvs/Linux x86_64

4 files changed, 116 insertions, 16 deletions

diff --git a/x11-terms/eterm/ChangeLog b/x11-terms/eterm/ChangeLog
index dbfd589d0e44..1f1926aa0f9d 100644
--- a/x11-terms/eterm/ChangeLog
+++ b/x11-terms/eterm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-terms/eterm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.73 2009/08/16 20:21:57 nerdboy Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/ChangeLog,v 1.74 2012/02/23 20:28:34 vapier Exp $
+
+*eterm-0.9.6 (23 Feb 2012)
+
+  23 Feb 2012; Mike Frysinger <vapier@gentoo.org> +eterm-0.9.6.ebuild,
+  eterm-9999.ebuild:
+  Version bump and clean up library install #403105 by David.
 
   16 Aug 2009; Steve Arnold <nerdboy@gentoo.org> eterm-0.9.5.ebuild,
   eterm-9999.ebuild:
diff --git a/x11-terms/eterm/Manifest b/x11-terms/eterm/Manifest
index 917e1a410028..13f8a4f524ac 100644
--- a/x11-terms/eterm/Manifest
+++ b/x11-terms/eterm/Manifest
@@ -1,18 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 DIST Eterm-0.9.5.tar.gz 796872 RMD160 19e006f0fe2bdd6a95818f11b96bb978b9cb6762 SHA1 f2d75354a48734f63f018f7173cebee81f2358c7 SHA256 63ad6e3d89571a72d8302274ebb00d569b8789e24fae038beaee7aa4b8362bd2
+DIST Eterm-0.9.6.tar.gz 831756 RMD160 96e2ebf7ee7464ffab8bbecec2976a1e5935712e SHA1 b4cb00f898ffd2de9bf7ae0ecde1cc3a5fee9f02 SHA256 72b907aa64f8bcf053f2ecbc8a2e243c6de353a94ecaf579ff2c4e3ae5d7e13c
 DIST Eterm-bg-0.9.5.tar.gz 1883627 RMD160 acbab70cf5a22f1c45a16f5a8a92ed1e057a59a0 SHA1 26e81a1e91228c971c70ba06e006ef69490ef208 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55
+DIST Eterm-bg-0.9.6.tar.gz 1883627 RMD160 acbab70cf5a22f1c45a16f5a8a92ed1e057a59a0 SHA1 26e81a1e91228c971c70ba06e006ef69490ef208 SHA256 8be436c38337557b77bb73d31a65c4dfe21966e84b7d3306e1e28c5c1e809c55
 EBUILD eterm-0.9.5.ebuild 1849 RMD160 700b1b475348531884f236cc90eccc194ae63755 SHA1 b3231fad39e5ff65318b996e76175a08073da75f SHA256 a3d8e000e51e4daa319ec2142761219879c83a40ddb3ac0d2d2c3f766652baf6
-EBUILD eterm-9999.ebuild 1858 RMD160 417fea764a25c6032055dbd6e88b789caeaa1939 SHA1 496ee0e2d3eb2d86d7705bf43e90ca0934ec255c SHA256 0a861fab0b9c6bd7230de918091ee9a1801dac427aa24eac63496bb04dced878
-MISC ChangeLog 10384 RMD160 e75f7e4ee9ed9773ad6e4d9598b348f19f102284 SHA1 027624f664a09a6a46e1db2907eac545aeb65d15 SHA256 f40457eec1027ce6ef1c707d3c758945cc0cc48ab3d36878bf769b5393e044de
+EBUILD eterm-0.9.6.ebuild 1847 RMD160 982a2ad0a26d7cfafd133d59d3aefb1bd37468f6 SHA1 731278f03cf51f5ec8faec7d7f38e0b00cb81be0 SHA256 b4f461b56c159890209f9402c7f8caa0e12f7d184826e0a973b0d312380a631f
+EBUILD eterm-9999.ebuild 1847 RMD160 54e3a3452d0b44d44f0a15328b309ebfa0d0b221 SHA1 794ba21716afce34379b235d3a8f9a1e93cca30a SHA256 5042a5418ee25819d108cc610997329a9cece2958a4ba3a26f557194e69ce34c
+MISC ChangeLog 10566 RMD160 fdd8c8aa9a414ab7f680c11754cfe5151c279e7f SHA1 f45113d3f7df3f1f62d8a55dbeab7b2e4ec24e9d SHA256 f992182ad7b792454aa3b490128dd5beabfda3be40f81af7fede0a3f030268a2
 MISC metadata.xml 705 RMD160 3e17127da592345f4555b656dcbd22454e76863b SHA1 df9f89c13f5d8950f53eccaad3be81dfd8087e0b SHA256 86da5c0945a99a8622cf19200d60bfd2c4ac97d7e9edebf8470eb9e1e4ebfd97
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQEIAAYFAk59uswACgkQfXuS5UK5QB3kQQQAoudw5AdxNotpuM82wwt7qsWy
-7+s1u3IZiVjMv0Y4kZqyIpXo6apTsybNPa9UrqW0zB3qeqmPUqSub7bvllEcszNa
-G/zQMwJdVNOxVFiGU3QDu4BW971etJhUVDFBqyYG9lZ3tI4pYRrHuAVLsff/jq6x
-gOhFX07UO+cqXgBHJaY=
-=3Qpz
+iQIcBAEBAgAGBQJPRqF6AAoJELEHsLL7fEFWF8oP/3BSgsJLMiaqGaOkdKvvrJZH
+rSISKTLdZ4aNY7fTWcXsOFpuvkS5GL+XwLVqeBNhkjom1zKdGh2itOFM3Zxc6ajU
+KedebBdJthiwWQE7j2zoRSnG6Ky0lDL970x7RksrDFKGhLvmzbwQrU5wx9xdFBqz
+S1TPptHNQ9/ToUJiqkw3Lp/2l5VSbCTcJMC3h46YU5MJwPo4h0lDvWjDYYWEoWuJ
+Gbyw8uYTsRNKc3uM0SxMq03HAutbviC5kts84I8Yvtd4aLOovXn9cLgLAm8lrxux
+APvcAE793ZV0uejBw+6zGcuv/kk2nBgns3kvutYs4i75gSaaG/6MUjHCC904VsbZ
+eOv8Cv0PAAquIdFcRKXArh44yUHBGn9qjwEmQwiZ42EZbvnzWNZ7WYlOZzi5qT+3
+dEVAXQv0fwVsNJ4eF8ow3h2ZVEggaw+AtZt2ALWXw5Re+rNa1a7Ft2Ni2mLdQXq4
+bXFlEca48rPFa3oMiFdZiJPeA3R8BF7gxslUhlisDt6W1X3WhTbFh4C17zHjTVmz
+TdoI8a0K4uGTUvQbEP3/rKNxBDQ0Z1vvrHQn2sb+G2ELgP+3JNbnfdjujCO7R6nl
+ILjAMdRqh8Z2QjlKP0huYpNdKAAw61CyM2kmbIQV+W/UvfPXTNgJeyVSNZ4zEFzu
+EoP9iGSXLGNJb2XLXMtn
+=L4y2
 -----END PGP SIGNATURE-----
diff --git a/x11-terms/eterm/eterm-0.9.6.ebuild b/x11-terms/eterm/eterm-0.9.6.ebuild
new file mode 100644
index 000000000000..2083b1c23b45
--- /dev/null
+++ b/x11-terms/eterm/eterm-0.9.6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-0.9.6.ebuild,v 1.1 2012/02/23 20:28:34 vapier Exp $
+
+EAPI="2"
+inherit eutils autotools
+
+MY_P=Eterm-${PV}
+
+if [[ ${PV} == "9999" ]] ; then
+	ESVN_REPO_URI="http://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 ~x86-fbsd"
+fi
+
+DESCRIPTION="A vt102 terminal emulator for X"
+HOMEPAGE="http://www.eterm.org/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="escreen minimal mmx sse2 unicode"
+
+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_configure() {
+	export TIC="true"
+	econf \
+		--disable-static \
+		$(use_enable escreen) \
+		--with-imlib \
+		--enable-trans \
+		$(use_enable mmx) \
+		$(use_enable sse2) \
+		$(use_enable unicode multi-charset) \
+		--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 829095c7b720..73afc5d8f24d 100644
--- a/x11-terms/eterm/eterm-9999.ebuild
+++ b/x11-terms/eterm/eterm-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-9999.ebuild,v 1.18 2009/08/16 20:21:57 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/eterm/eterm-9999.ebuild,v 1.19 2012/02/23 20:28:34 vapier Exp $
 
 EAPI="2"
 inherit eutils autotools
@@ -14,9 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	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 )"
+		!minimal? ( http://www.eterm.org/download/Eterm-bg-${PV}.tar.gz )"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
@@ -61,6 +59,7 @@ src_unpack() {
 src_configure() {
 	export TIC="true"
 	econf \
+		--disable-static \
 		$(use_enable escreen) \
 		--with-imlib \
 		--enable-trans \
@@ -72,8 +71,11 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	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}
 }