Missing build dependencies x11-libs/libXt (for X11/Intrinsic.h) and x11-proto/xproto (X11/keysym.h). Thanks to fouDuBassan (Freenode, IRC) for reporting.

Package-Manager: portage-2.2.0_alpha107/cvs/Linux x86_64

3 files changed, 52 insertions, 26 deletions

diff --git a/app-editors/jed/ChangeLog b/app-editors/jed/ChangeLog
index a2a5e3519b58..65cc7d656dcc 100644
--- a/app-editors/jed/ChangeLog
+++ b/app-editors/jed/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/jed
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.61 2011/03/20 16:37:13 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/ChangeLog,v 1.62 2012/05/20 15:44:55 ssuominen Exp $
+
+  20 May 2012; Samuli Suominen <ssuominen@gentoo.org> jed-0.99.19.ebuild:
+  Missing build dependencies x11-libs/libXt (for X11/Intrinsic.h) and
+  x11-proto/xproto (X11/keysym.h). Thanks to fouDuBassan (Freenode, IRC) for
+  reporting.
 
   20 Mar 2011; Raúl Porcel <armin76@gentoo.org> jed-0.99.19.ebuild:
   Add ~alpha
diff --git a/app-editors/jed/Manifest b/app-editors/jed/Manifest
index 95e8ebcf7d3d..7d9e5f57b127 100644
--- a/app-editors/jed/Manifest
+++ b/app-editors/jed/Manifest
@@ -1,4 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST jed-0.99-19.tar.bz2 884198 RMD160 c6182d918322c30922f7590c7e8b15a1da0ba22f SHA1 7783ac9035c7221575e74b544902151309d0d0ef SHA256 97a339ce2fb0a446767ee550786e6914fa2e8cdbad39a402e48368cd0d6b5763
-EBUILD jed-0.99.19.ebuild 1307 RMD160 1ffdda4a609c74255306068ed0705b23c904d52d SHA1 7262c57f4040cde356076693cd5227f094a90cd9 SHA256 437c0996c1982796e417942ad3980663c8a2dc3e3e77dfb301bf2f56119225d6
-MISC ChangeLog 7242 RMD160 21f192b59d81f7d73845cf64eba7f444de607b69 SHA1 47c12ea9ddf0f8a2229c75ec6ab36ae9339cf251 SHA256 9c9aa1efe257cf757f749de8262d68dd339e93573758a945739ccca22588963d
+EBUILD jed-0.99.19.ebuild 1283 RMD160 68b79e473a42fb66cb5d4d9e42f47cf60a813963 SHA1 f790cb42fa801626870269ba7eae6b95032d023c SHA256 8525f3e93e7461c72d59988c935d6adb6a2d98a1b984280c6cbf0e4c6660bf55
+MISC ChangeLog 7479 RMD160 0ec169e5b254bdb81525739a695d20d5a0a9ca0a SHA1 6add040047938ad9d362a8c50260c04e3fed76c5 SHA256 92fda9f1a28af0f84b6103ec4ed7986d2a06462291c9ef511d4e54d091b3b54b
 MISC metadata.xml 521 RMD160 2e3d889dc11e30fbf682ca23e5f5d79b268c40b0 SHA1 b6eca4d4efd852902a44c8827b827a8f6f87ec1f SHA256 f7a8128bee209ec8255e69c7c44789cf4f22ebfe831d54f4aec7e94bca4555fe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPuRDHAAoJEEdUh39IaPFNzM8H/2qCoKc71ReSXu7FVg5mcYjO
+Ea1AoSzHW6zILIZ+lL4mfynd6UxOIi8ElpkDv4jHrJu8HvN3fIZxRlscqcOHxgs7
+is6K4JW/GEeoNt+O7tTOP8GENnmc2lxtEJ30ruXIUkv5UKIgH20zvy8q3xAbJgZg
+iEbI5/AVYoVRCddzWmBKutOHaC7xNSwbBzPgayuNabTnuvycZB+HMRBEVAwKiCOE
+6JlYWg/8u1A3F90LWepdmd6yjK9Yr77lOGDKpoEdlpars2UiDI2Q6RPag9cuwyfo
+6IOG4sajxRpAxRf8nL0MBUYKFJDgr+/5AaC3uLBift86CS/C8Zw7FukCq68+7FA=
+=JRqU
+-----END PGP SIGNATURE-----
diff --git a/app-editors/jed/jed-0.99.19.ebuild b/app-editors/jed/jed-0.99.19.ebuild
index 02dfcc196754..679a8e2d11a1 100644
--- a/app-editors/jed/jed-0.99.19.ebuild
+++ b/app-editors/jed/jed-0.99.19.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.19.ebuild,v 1.7 2011/03/20 16:37:13 armin76 Exp $
-
-EAPI=3
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jed/jed-0.99.19.ebuild,v 1.8 2012/05/20 15:44:55 ssuominen Exp $
 
+EAPI=4
 inherit versionator
 
 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"
+SRC_URI="ftp://space.mit.edu/pub/davis/jed/v${PV%.*}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,40 +17,47 @@ KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="X gpm xft"
 
 RDEPEND=">=sys-libs/slang-2
-	X? ( x11-libs/libX11
-		xft? ( x11-libs/libXext
+	gpm? ( sys-libs/gpm )
+	X? (
+		x11-libs/libX11
+		xft? (
+			>=media-libs/freetype-2
+			x11-libs/libXext
 			x11-libs/libXft
 			x11-libs/libXrender
-			>=media-libs/freetype-2.0 ) )
-	gpm? ( sys-libs/gpm )"
-DEPEND="${RDEPEND}"
+			)
+		)"
+DEPEND="${RDEPEND}
+	X? (
+		x11-libs/libXt
+		x11-proto/xproto
+		)"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_configure() {
-	export JED_ROOT="${EPREFIX}/usr/share/jed"
+	export JED_ROOT="${EPREFIX}"/usr/share/jed
 	econf \
 		$(use_enable gpm) \
 		$(use_enable xft)
 }
 
 src_compile() {
-	emake || die
-	if use X; then
-		emake xjed || die
-	fi
+	emake
+	use X && emake xjed
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install || die
+	emake -j1 DESTDIR="${D}" install
 
-	dodoc INSTALL INSTALL.unx README changes.txt || die
-	doinfo info/jed* || die
+	dodoc changes.txt INSTALL{,.unx} README
+	doinfo info/jed*
 
 	insinto /etc
-	doins lib/jed.conf || die
+	doins lib/jed.conf
 
 	# replace IDE mode with EMACS mode
-	sed -i -e 's/\(_Jed_Default_Emulation = \).*/\1"emacs";/' \
-		"${ED}"/etc/jed.conf || die "patching jed.conf failed"
+	sed -i \
+		-e 's/\(_Jed_Default_Emulation = \).*/\1"emacs";/' \
+		"${ED}"/etc/jed.conf || die
 }