modular X deps

(Portage version: 2.1_pre4-r1)

4 files changed, 18 insertions, 95 deletions

diff --git a/app-editors/jed/ChangeLog b/app-editors/jed/ChangeLog
index 0f5178cfd286..ff161b0bc9f4 100644
--- a/app-editors/jed/ChangeLog
+++ b/app-editors/jed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/jed
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.28 2005/12/04 19:42:13 tgall Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.29 2006/02/10 17:51:48 liquidx Exp $
+
+  10 Feb 2006; Alastair Tse <liquidx@gentoo.org> -jed-0.99.16-r1.ebuild,
+  jed-0.99.16-r2.ebuild:
+  modular X deps
 
   04 Dec 2005; Tom Gall <tgall@gentoo.org> jed-0.99.16-r2.ebuild:
   stable on ppc64
diff --git a/app-editors/jed/files/digest-jed-0.99.16-r1 b/app-editors/jed/files/digest-jed-0.99.16-r1
deleted file mode 100644
index 180e8555d8af..000000000000
--- a/app-editors/jed/files/digest-jed-0.99.16-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c2bcd89c92a120559865a539c2705999 jed-0.99-16.tar.bz2 667623
diff --git a/app-editors/jed/jed-0.99.16-r1.ebuild b/app-editors/jed/jed-0.99.16-r1.ebuild
deleted file mode 100644
index e98659e65fba..000000000000
--- a/app-editors/jed/jed-0.99.16-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r1.ebuild,v 1.18 2005/01/01 13:28:15 eradicator Exp $
-
-P0=${PN}-0.99-16
-S=${WORKDIR}/${P0}
-DESCRIPTION="Console S-Lang-based editor"
-HOMEPAGE="http://www.jedsoft.org/jed/"
-SRC_URI="ftp://ftp.uni-stuttgart.de/pub/unix/misc/slang/jed/v0.99/${P0}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
-IUSE="X gpm truetype"
-
-RDEPEND=">=sys-libs/slang-1.4.5
-	X? ( virtual/x11 )
-	gpm? ( sys-libs/gpm )
-	X? ( truetype? ( virtual/xft
-		>=media-libs/freetype-2.0 ) )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-PROVIDE="virtual/editor"
-
-src_compile() {
-	export JED_ROOT=/usr/share/jed
-
-	./configure	--host=${CHOST} \
-		--prefix=$JED_ROOT \
-		--bindir=/usr/bin \
-		--mandir=/usr/share/man || die
-
-	if use gpm ; then
-		cd src
-		sed -i	-e 's/#MOUSEFLAGS/MOUSEFLAGS/' \
-			-e 's/#MOUSELIB/MOUSELIB/' \
-			-e 's/#GPMMOUSEO/GPMMOUSEO/' \
-			-e 's/#OBJGPMMOUSEO/OBJGPMMOUSEO/' \
-			Makefile
-		cd ${S}
-	fi
-
-	if use X && use truetype ; then
-	   cd src
-	   sed -i -e 's/#XRENDERFONTLIBS/XRENDERFONTLIBS/' Makefile
-	   sed -i -e 's/^CONFIG_H = config.h/xterm_C_FLAGS = `freetype-config --cflags`\nCONFIG_H = config.h/' Makefile
-	   sed -i -e 's/#define XJED_HAS_XRENDERFONT 0/#define XJED_HAS_XRENDERFONT 1/' jed-feat.h
-	   cd ${S}
-	fi
-
-	make clean || die
-
-	emake || die
-
-	if use X ; then
-		emake xjed || die
-	fi
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	cd doc
-	cp README AUTHORS
-
-	cd ${S}
-	dodoc INSTALL INSTALL.unx README doc/AUTHORS doc/manual/jed.tex
-
-	cd ${S}/info
-	rm info.info
-	epatch ${FILESDIR}/jed.info.diff
-	cd ${S}
-
-	insinto /usr/share/info
-	doins info/*
-
-	insinto /etc
-	doins lib/jed.conf
-
-	# replace IDE mode with EMACS mode
-	sed -i -e 's/\(_Jed_Default_Emulation = \).*/\1"emacs";/' ${D}/etc/jed.conf || die "patching jed.conf failed"
-
-	cd ${D}
-	rm -rf usr/share/jed/info
-	# can't rm usr/share/jed/doc -- used internally by jed/xjed
-}
diff --git a/app-editors/jed/jed-0.99.16-r2.ebuild b/app-editors/jed/jed-0.99.16-r2.ebuild
index ac39385370d7..649db02b4d77 100644
--- a/app-editors/jed/jed-0.99.16-r2.ebuild
+++ b/app-editors/jed/jed-0.99.16-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r2.ebuild,v 1.15 2005/12/04 19:42:13 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.16-r2.ebuild,v 1.16 2006/02/10 17:51:48 liquidx Exp $
 
 inherit eutils
 
@@ -16,12 +16,18 @@ KEYWORDS="amd64 ppc ~ppc-macos ppc64 sparc x86"
 IUSE="X gpm truetype"
 
 RDEPEND=">=sys-libs/slang-1.4.5
-	X? ( virtual/x11 )
+	X? ( || ( 
+              ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender )
+			  virtual/x11 
+         ) 
+    )
 	gpm? ( sys-libs/gpm )
-	X? ( truetype? ( virtual/xft
-		>=media-libs/freetype-2.0 ) )"
+	X? ( truetype? ( || ( x11-libs/libXft virtual/xft )
+   	 				>=media-libs/freetype-2.0 ) )"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
+	>=sys-apps/sed-4
+	X? ( || ( x11-proto/xproto virtual/x11 ) )"
+
 PROVIDE="virtual/editor"
 
 src_unpack() {