Fix jed to link against slang-2.1.3.

Package-Manager: portage-2.1.4.1

3 files changed, 37 insertions, 52 deletions

diff --git a/app-editors/jed/ChangeLog b/app-editors/jed/ChangeLog
index bae978a3ef66..a63b0d18fb9d 100644
--- a/app-editors/jed/ChangeLog
+++ b/app-editors/jed/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/jed
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.40 2007/11/16 16:53:53 fmccor Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.41 2008/02/09 09:16:05 ulm Exp $
+
+  09 Feb 2008; Ulrich Mueller <ulm@gentoo.org> jed-0.99.18.ebuild:
+  Fix jed to link against slang-2.1.3. Some cleanup of the ebuild.
 
   16 Nov 2007; Ferris McCormick <fmccor@gentoo.org> jed-0.99.18.ebuild:
   Add ~sparc for testing; this and slang seem to work fine (even though
diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index a494ee6da143..f100fa9559ed 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX jed-0.99.16-darwin.patch 479 RMD160 373249f9853dcd8c84d82c261f4b94f82746c324 SHA1 9cf9097fe3765596ef91e0bc900630642bd9e7e3 SHA256 c308d8a9911dc4625b60baad13873ef71eca5cad4be065a231a67f16778c9756
 AUX jed-0.99.16-gentoo-shmode.sl 2434 RMD160 2bd5ebefa0088849ae68abf967629b5dcc7b8f1b SHA1 6b2c7d16f3cd9f619efeb153034c75c1a639df8f SHA256 a26473d613ace535b027d21afeb8986bd334224a898a6867fa7e16e6e66c3c67
 AUX jed-0.99.16-jed.info.patch 1508 RMD160 83c29b57ce74d9478f98f43b51183a98a64a5d57 SHA1 211e556c7722bf9ddae0fd4605e6f1cf8a914f2f SHA256 d5a9fb2577ae4c82075d6168fb20d467a8a88de741aae489aa1c1487f9cbb658
@@ -5,6 +8,13 @@ AUX jed.info.diff 333 RMD160 05eb299d22391f803ae87c0cf2e2440be7a81e02 SHA1 45492
 DIST jed-0.99-16.tar.bz2 667623 RMD160 1c7dc29feb7513a46af13ead11e6abf3f5303ec3 SHA1 34649571fb5caa61314553c10db2e15ebf248d82 SHA256 f820bc26c1e4ad2d97f8c122b78b5eb0202734b799968875867128c679078036
 DIST jed-0.99-18.tar.bz2 762826 RMD160 6925b67eab24d6dd2d5b5a975c350cfda515632d SHA1 fa4b3313fdde0466546e36100b0de2d9cc75806d SHA256 71c394640cf07286ffc7abe45d91477a64310e2024f81a1d5a79729887d8d43e
 EBUILD jed-0.99.16-r2.ebuild 2370 RMD160 7dba515741740305a22bd7f87bde5fb6299a20b2 SHA1 7434c647b7a56c92919fe70a3894b6eb14c126fa SHA256 9629dee95382bc09095eb1e2ad8c6fd0db4fd3bc3337913a0ec5c8c6779871bb
-EBUILD jed-0.99.18.ebuild 2573 RMD160 b46dd437d07b1861ed7318bb55235bc77e464e85 SHA1 c744733e35a4dfa18c7b2597ea039d5b5df93bba SHA256 502d5c5ab8cabb1bde546921ae2bfa4f5154e06189dd8cac92ed0fa7b4fb185d
-MISC ChangeLog 5001 RMD160 9ae73d280995a88c4629c1d93af1583cd2e07ac0 SHA1 8d04c597296cd049a6130d1c219307ef94b474dc SHA256 149edf9c7aae569018e1537fa8313d20b5511dfa1c886491bfa24e2ff7bfd547
+EBUILD jed-0.99.18.ebuild 2024 RMD160 b7f432b4344f6c7c5db0798eb0bd1df72cc47d2d SHA1 7c1ae89f9f5f5c8868ca590b18d93c309675e21c SHA256 af3214832ea1e33c71da1f8ff507ce41fe70bc6d5ebe4c550fc4fcbc5596bf32
+MISC ChangeLog 5133 RMD160 36710de53cbade91d6cd1a8998c2c5b803d167d8 SHA1 62ff07184f94a7810171e6cb0ee0a4463386956f SHA256 7e9af594b333c7b44dd6ec5255a29103b773baee167c7ef588486953f45dd150
 MISC metadata.xml 159 RMD160 f997186a466cc3629429a6adbb6d6c609c621a7a SHA1 da32fed3458e2338a09e325da366caca249ea44e SHA256 1a2c240d1d46720c2d261c95e014a19171e6147da6651e92557a51df3f2feb37
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.8 (GNU/Linux)
+
+iEYEARECAAYFAketb3YACgkQOeoy/oIi7uyHOACgzuoNwFpfqV14CObdpq5KoC32
+aRcAoMQpAleUx3oG9lhyKdtwnlrtuUh/
+=JpEJ
+-----END PGP SIGNATURE-----
diff --git a/app-editors/jed/jed-0.99.18.ebuild b/app-editors/jed/jed-0.99.18.ebuild
index 85c835dbf995..24456e8ba36b 100644
--- a/app-editors/jed/jed-0.99.18.ebuild
+++ b/app-editors/jed/jed-0.99.18.ebuild
@@ -1,69 +1,49 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.18.ebuild,v 1.4 2007/11/16 16:53:53 fmccor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.18.ebuild,v 1.5 2008/02/09 09:16:05 ulm Exp $
 
-inherit eutils versionator
+inherit versionator
 
-MY_PV=$(replace_version_separator 2 '-')
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
+MY_P=${PN}-$(replace_version_separator 2 '-')
 DESCRIPTION="Console S-Lang-based editor"
 HOMEPAGE="http://www.jedsoft.org/jed/"
 SRC_URI="ftp://space.mit.edu/pub/davis/jed/v0.99/${MY_P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~sparc ~x86"
 IUSE="X gpm truetype"
 
-RDEPEND="=sys-libs/slang-2*
+RDEPEND=">=sys-libs/slang-2
 	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXrender )
 	X? ( truetype? ( || ( x11-libs/libXft virtual/xft )
 					>=media-libs/freetype-2.0 ) )
 	gpm? ( sys-libs/gpm )"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4"
-
-src_unpack() {
-	unpack ${A}
+DEPEND="${RDEPEND}"
 
-	# Gennto slotted slang-2
-	cd "${S}"
-	sed -e 's:-lslang:-lslang-2:g' -i src/Makefile.in
-	sed -e 's:libslang:libslang-2:g' -i configure
-
-	#cd ${S}; epatch ${FILESDIR}/${P}-jed.info.patch
-	#use userland_Darwin && epatch ${FILESDIR}/${P}-darwin.patch
-}
+S="${WORKDIR}/${MY_P}"
 
 src_compile() {
 	export JED_ROOT=/usr/share/jed
 
-	./configure	--host=${CHOST} \
-		--prefix=$JED_ROOT \
-		--bindir=/usr/bin \
-		--mandir=/usr/share/man \
-		--with-slanginc=/usr/include/slang-2 || die
+	econf --prefix=${JED_ROOT} \
+		--bindir=/usr/bin || 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}"
+			src/Makefile
 	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}"
+	   sed -i -e 's/#XRENDERFONTLIBS/XRENDERFONTLIBS/' src/Makefile
+	   sed -i -e 's/^CONFIG_H = config.h/xterm_C_FLAGS = `freetype-config --cflags`\nCONFIG_H = config.h/' src/Makefile
+	   sed -i -e 's/#define XJED_HAS_XRENDERFONT 0/#define XJED_HAS_XRENDERFONT 1/' src/jed-feat.h
 	fi
 
 	make clean || die
-
 	emake || die
 
 	if use X ; then
@@ -77,27 +57,19 @@ src_install() {
 	cd "${S}/src"
 	make DESTDIR="${D}" install || die
 
-	cd "${S}/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}"
+	dodoc INSTALL INSTALL.unx README changes.txt doc/manual/jed.tex
+	newdoc doc/README AUTHORS
 
-	insinto /usr/share/info
-	doins info/*
+	doinfo info/jed*
 
 	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"
+	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
+	rm -rf "${D}"/usr/share/jed/info
 	# can't rm usr/share/jed/doc -- used internally by jed/xjed
 }