Remove deprecated XFree86 -time library support, xview, from jove ebuilds wrt #88334.

(Portage version: 2.1.6_rc2/cvs/Linux 2.6.27.7 i686)

3 files changed, 23 insertions, 44 deletions

diff --git a/app-editors/jove/ChangeLog b/app-editors/jove/ChangeLog
index f059d383a3e1..3ef1803ef6cb 100644
--- a/app-editors/jove/ChangeLog
+++ b/app-editors/jove/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/jove
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/ChangeLog,v 1.22 2008/10/24 06:23:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/ChangeLog,v 1.23 2008/12/02 20:17:37 ssuominen Exp $
+
+  02 Dec 2008; <ssuominen@gentoo.org> jove-4.16.0.70.3.ebuild,
+  jove-4.16.0.70.3.1.ebuild:
+  Remove deprecated XFree86 -time library support, xview, from jove ebuilds
+  wrt #88334.
 
   24 Oct 2008; Ulrich Mueller <ulm@gentoo.org> jove-4.16.0.70.3.1.ebuild:
   Honour CC variable, fixes bug 243562.
diff --git a/app-editors/jove/jove-4.16.0.70.3.1.ebuild b/app-editors/jove/jove-4.16.0.70.3.1.ebuild
index c6628f5ef3f3..ebfe5c750ab4 100644
--- a/app-editors/jove/jove-4.16.0.70.3.1.ebuild
+++ b/app-editors/jove/jove-4.16.0.70.3.1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/jove-4.16.0.70.3.1.ebuild,v 1.3 2008/10/24 06:23:50 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/jove-4.16.0.70.3.1.ebuild,v 1.4 2008/12/02 20:17:37 ssuominen Exp $
 
 inherit eutils flag-o-matic toolchain-funcs versionator
 
 MY_P=${PN}_$(get_version_component_range 1-4)
 MY_DIFFP=${MY_P}-$(get_version_component_range 5-6)
+
 DESCRIPTION="Jonathan's Own Version of Emacs - a light emacs-like editor without LISP bindings"
 HOMEPAGE="ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/"
 SRC_URI="mirror://debian/pool/main/j/${PN}/${MY_P}.orig.tar.gz
@@ -14,15 +15,13 @@ SRC_URI="mirror://debian/pool/main/j/${PN}/${MY_P}.orig.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="X unix98"
-
-RDEPEND="sys-libs/ncurses
-	X? ( x11-libs/xview )"
+IUSE="unix98"
 
+RDEPEND="sys-libs/ncurses"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
-S="${WORKDIR}/${MY_P/_/}"
+S=${WORKDIR}/${MY_P/_/}
 
 src_unpack() {
 	unpack ${A}
@@ -39,26 +38,14 @@ src_compile() {
 	tc-export CC
 
 	if use unix98 ; then
-		emake SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" || die
+		emake SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" || die "emake failed."
 	else
-		emake || die
-	fi
-
-	if use X ; then
-		emake XJOVEHOME=/usr makexjove || die
+		emake || die "emake failed."
 	fi
 }
 
 src_install() {
 	# parallel install fails
-	emake -j1 DESTDIR="${D}" install || die
-
-	if use X ; then
-		emake -j1 DESTDIR="${D}" \
-			XJOVEHOME="${D}"/usr \
-			MANDIR="${D}"/usr/share/man/man1 \
-			installxjove || die
-	fi
-
+	emake -j1 DESTDIR="${D}" install || die "emake install failed."
 	keepdir /var/lib/jove/preserve
 }
diff --git a/app-editors/jove/jove-4.16.0.70.3.ebuild b/app-editors/jove/jove-4.16.0.70.3.ebuild
index 9b0264139bd1..e7ca62c7cb38 100644
--- a/app-editors/jove/jove-4.16.0.70.3.ebuild
+++ b/app-editors/jove/jove-4.16.0.70.3.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/jove-4.16.0.70.3.ebuild,v 1.4 2008/02/24 17:24:18 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jove/jove-4.16.0.70.3.ebuild,v 1.5 2008/12/02 20:17:37 ssuominen Exp $
 
 inherit eutils flag-o-matic
 
 MY_P=${P/-/_}
 MY_DIFFP=${MY_P%.*}-${MY_P##*.}.diff
 MY_P=${MY_P%.*}
+
 DESCRIPTION="Jonathan's Own Version of Emacs -- a light emacs-like editor without LISP bindings"
 HOMEPAGE="ftp://ftp.cs.toronto.edu/cs/ftp/pub/hugh/jove-dev/"
 SRC_URI="mirror://debian/pool/main/j/${PN}/${MY_P}.orig.tar.gz
@@ -15,15 +16,13 @@ SRC_URI="mirror://debian/pool/main/j/${PN}/${MY_P}.orig.tar.gz
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="X unix98"
-
-RDEPEND="sys-libs/ncurses
-	X? ( x11-libs/xview )"
+IUSE="unix98"
 
+RDEPEND="sys-libs/ncurses"
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
-S="${WORKDIR}/${MY_P/_/}"
+S=${WORKDIR}/${MY_P/_/}
 
 src_unpack() {
 	unpack ${A}
@@ -39,26 +38,14 @@ src_unpack() {
 
 src_compile() {
 	local myconf
-	if use unix98 ; then
-		emake SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" || die
+	if use unix98; then
+		emake SYSDEFS="-DSYSVR4 -D_XOPEN_SOURCE=500" || die "emake failed."
 	else
-		emake || die
-	fi
-
-	if use X ; then
-		emake XJOVEHOME=/usr makexjove || die
+		emake || die "emake failed."
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if use X ; then
-		make DESTDIR="${D}" \
-			XJOVEHOME="${D}"/usr \
-			MANDIR="${D}"/usr/share/man/man1 \
-			installxjove || die
-	fi
-
+	emake DESTDIR="${D}" install || die "emake install failed."
 	keepdir /var/lib/jove/preserve
 }