Add tinfo as termcap-compatible library. Patch by Jeroen Roovers. Bug 458186. Remove old.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B1E955DB)

4 files changed, 38 insertions, 58 deletions

diff --git a/dev-util/ddd/ChangeLog b/dev-util/ddd/ChangeLog
index 8a5c07bd15f7..6a95cb8beb9f 100644
--- a/dev-util/ddd/ChangeLog
+++ b/dev-util/ddd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/ddd
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ChangeLog,v 1.75 2013/02/21 16:12:26 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ChangeLog,v 1.76 2014/04/08 00:48:03 reavertm Exp $
+
+*ddd-3.3.12-r4 (08 Apr 2014)
+
+  08 Apr 2014; Maciej Mrozowski <reavertm@gentoo.org> +ddd-3.3.12-r4.ebuild,
+  +files/ddd-3.3.12-tinfo.patch, -ddd-3.3.12-r1.ebuild, -ddd-3.3.12-r2.ebuild:
+  Add tinfo as termcap-compatible library. Patch by Jeroen Roovers. Bug 458186.
+  Remove old.
 
   21 Feb 2013; Agostino Sarubbo <ago@gentoo.org> ddd-3.3.12-r3.ebuild:
   Stable for sparc, wrt bug #456630
diff --git a/dev-util/ddd/ddd-3.3.12-r1.ebuild b/dev-util/ddd/ddd-3.3.12-r1.ebuild
deleted file mode 100644
index 849162bceca1..000000000000
--- a/dev-util/ddd/ddd-3.3.12-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.12-r1.ebuild,v 1.9 2012/10/24 19:09:45 ulm Exp $
-
-EAPI=1
-
-inherit eutils
-
-DESCRIPTION="Graphical openmotif front-end for command-line debuggers"
-HOMEPAGE="http://www.gnu.org/software/ddd"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3 LGPL-3 FDL-1.1"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=sys-devel/gdb-6.5
-	>=x11-libs/motif-2.3:0
-	x11-libs/libX11
-	x11-libs/libXp"
-
-RDEPEND="${DEPEND}
-	sci-visualization/gnuplot
-	x11-apps/xfontsel"
-
-RESTRICT="test"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_compile() {
-	econf || die
-
-	cd "${S}"/ddd
-	emake version.h build.h host.h root.h configinfo.C Ddd.ad.h || die "Failed to build headers"
-
-	cd "${S}"
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS CREDITS INSTALL NEWS PROBLEMS README TIPS TODO
-	cp -R "${S}"/doc/* "${D}"/usr/share/doc/${PF}
-
-	doicon "${S}"/icons/ddd.xpm
-}
diff --git a/dev-util/ddd/ddd-3.3.12-r2.ebuild b/dev-util/ddd/ddd-3.3.12-r4.ebuild
index af93204a453c..163754181e22 100644
--- a/dev-util/ddd/ddd-3.3.12-r2.ebuild
+++ b/dev-util/ddd/ddd-3.3.12-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.12-r2.ebuild,v 1.9 2012/10/24 19:09:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.12-r4.ebuild,v 1.1 2014/04/08 00:48:03 reavertm Exp $
 
 EAPI="4"
 
@@ -11,9 +11,9 @@ HOMEPAGE="http://www.gnu.org/software/ddd"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3 FDL-1.1"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="+gnuplot"
+IUSE="+gnuplot readline"
 
 COMMON_DEPEND="
 	sys-devel/gdb
@@ -26,6 +26,7 @@ COMMON_DEPEND="
 	>=x11-libs/motif-2.3:0
 	ppc? ( dev-libs/elfutils )
 	ppc64? ( dev-libs/elfutils )
+	readline? ( sys-libs/readline )
 "
 DEPEND="${COMMON_DEPEND}
 	x11-proto/xproto
@@ -39,6 +40,9 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/${P}-gcc44.patch"
+	"${FILESDIR}/${P}-gdb-disassembler-bug.patch"
+	"${FILESDIR}/${PN}-3.3.12-man.patch"
+	"${FILESDIR}/${PN}-3.3.12-tinfo.patch"
 )
 
 DOCS=(
@@ -46,6 +50,16 @@ DOCS=(
 	doc/ddd{-paper.ps,.pdf,-themes.pdf}
 )
 
+AUTOTOOLS_AUTORECONF=1
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		$(use_with readline)
+	)
+	autotools-utils_src_configure
+}
+
 src_install() {
 	# Remove app defaults
 	rm -f "${S}"/ddd/Ddd
diff --git a/dev-util/ddd/files/ddd-3.3.12-tinfo.patch b/dev-util/ddd/files/ddd-3.3.12-tinfo.patch
new file mode 100644
index 000000000000..ab7df14ae9d9
--- /dev/null
+++ b/dev-util/ddd/files/ddd-3.3.12-tinfo.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -360,7 +360,7 @@
+ dnl
+ _termlib="${ddd_termlib}"
+ if test "x${ddd_termlib}" = x; then
+-  _termlib="mytinfo ncurses curses termcap terminfo termlib"
++  _termlib="mytinfo ncurses tinfo curses termcap terminfo termlib"
+ fi
+ _termlib_path=
+ if test x"${ddd_termlib_libraries_path}" != x; then