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

Package-Manager: portage-2.1.6_rc2/cvs/Linux 2.6.27.7 i686

4 files changed, 26 insertions, 57 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/Manifest b/app-editors/jove/Manifest
index 15871f78c803..a2eb686b6e8c 100644
--- a/app-editors/jove/Manifest
+++ b/app-editors/jove/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST jove_4.16.0.70-3.1.diff.gz 16063 RMD160 d39641b4f4e9ed081138ff21cf9d71f014da0bd9 SHA1 d38caae7c3c1a09b459f987d53491e13e232420b SHA256 0d41388c5070fee94ef87f32e5ef467082e3175793aa5dba3bf9f9de903318cd
 DIST jove_4.16.0.70-3.diff.gz 14549 RMD160 fc3687a1474c695ffcef75e919d2c52560d2a7e7 SHA1 69dbe80c393628defe21471f2baad7204138fd92 SHA256 51718f5b22e5ec606e3d176222ad4c4ef91638debf0d4bedadf94aae61247c27
 DIST jove_4.16.0.70.orig.tar.gz 451492 RMD160 37fdabc3b91be411e51d71d9029485491d2dec8f SHA1 a954003c177bdc3a0af560df7caa74ee5b2b5735 SHA256 619035b5a5e882ce907498b7252e02d997b346d990e4cb057fbed351ba9a5ec7
-EBUILD jove-4.16.0.70.3.1.ebuild 1474 RMD160 4df1d30973c3d2229ffc6a9b9e604068a0be54bf SHA1 9cc157e771ea601d8394d65db07a73926f1c290c SHA256 42a336b11a9f64a3fe3321e3d79b60fabd9026485c2cab5995b144dfe5b9fff3
-EBUILD jove-4.16.0.70.3.ebuild 1433 RMD160 37224b3e5beb73ef7183d3395991ab3f92d23b2f SHA1 77f0442d94919407d035c0e18fbaa6efcbdbd92d SHA256 db1502cfdf9168764bef8d9308a3f7dee047231e49abc036d06535a5a46eab32
-MISC ChangeLog 3930 RMD160 e5692a44ba3d642b59e6aaa6e9fbe7c92bea3303 SHA1 2fc5d73bfeef3582b61334cf8e68a817723150b7 SHA256 af48ac637b555979891c655b9adb0b021ad10bfeb021cc5a22cd74a71f9bd294
+EBUILD jove-4.16.0.70.3.1.ebuild 1308 RMD160 e872acdaf77cd78c713ab2180290d1212b26a057 SHA1 90911f0945e9e5445c525b5fc0de8efd15e66f00 SHA256 f8a0a694e8d082398cb090990f110f222d852e2d1b6f1bf9549481d460f34ccc
+EBUILD jove-4.16.0.70.3.ebuild 1269 RMD160 ad15b02e397698d3979b5f04a1e888cb36afca32 SHA1 d8c7709eee6af8b585c699a853cdb422bdf37bd1 SHA256 dc51518813a2437a4a8ec6a5657e04d96a5a2332c74829c09555ad84a7465566
+MISC ChangeLog 4119 RMD160 6b1dbd1b3585b78aff7de435e03f062d0b8ed496 SHA1 1ab17ce161fb98329ddf2dc267ea993ac21c2751 SHA256 ab691629e567b6c2425165e5f8950a91e943b357a323534422338506ca72d013
 MISC metadata.xml 611 RMD160 4c06a7334369482c540b9e63920dca1847d07979 SHA1 7407da956422bdbe23f440db8299d0d266d1d736 SHA256 f26b2edc723fc043f51e70f0052bb119663dd3176e0f2afc87d3e4b4fd79c2a8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.9 (GNU/Linux)
-
-iEYEARECAAYFAkkBagEACgkQOeoy/oIi7uxH+wCgniEhLK1QRdv4Ctuvvxa0umQ6
-FuYAoJObfVTfsLWdo7oRnCt/Ns1zQt27
-=LrFU
------END PGP SIGNATURE-----
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
 }