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

(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)

3 files changed, 97 insertions, 8 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/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}
 }