Fix linking with ncurses/tinfo, bug 498810. Remove old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

4 files changed, 11 insertions, 134 deletions

diff --git a/dev-util/cscope/ChangeLog b/dev-util/cscope/ChangeLog
index a4c94893f081..5cbddeef5df4 100644
--- a/dev-util/cscope/ChangeLog
+++ b/dev-util/cscope/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/cscope
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/ChangeLog,v 1.138 2012/09/29 18:45:43 armin76 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/ChangeLog,v 1.139 2014/01/25 10:24:50 ulm Exp $
+
+  25 Jan 2014; Ulrich Müller <ulm@gentoo.org> -cscope-15.7a-r1.ebuild,
+  -cscope-15.8.ebuild, cscope-15.8a.ebuild:
+  Fix linking with ncurses/tinfo, bug 498810. Remove old.
 
   29 Sep 2012; Raúl Porcel <armin76@gentoo.org> cscope-15.8a.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #434292
diff --git a/dev-util/cscope/cscope-15.7a-r1.ebuild b/dev-util/cscope/cscope-15.7a-r1.ebuild
deleted file mode 100644
index c4cec761d6a8..000000000000
--- a/dev-util/cscope/cscope-15.7a-r1.ebuild
+++ /dev/null
@@ -1,65 +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/cscope/cscope-15.7a-r1.ebuild,v 1.12 2012/07/05 21:46:18 ulm Exp $
-
-EAPI=4
-
-inherit elisp-common eutils
-
-DESCRIPTION="Interactively examine a C program"
-HOMEPAGE="http://cscope.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cscope/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="emacs"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison
-	>=sys-devel/autoconf-2.60"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-ocs-sysdir.patch" #269305
-}
-
-src_compile() {
-	make clean || die "make clean failed"
-	emake
-
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	einstall
-	dodoc AUTHORS ChangeLog NEWS README* TODO
-
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-install ${PN} *.el *.elc || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-		dobin cscope-indexer
-	fi
-
-	cd "${S}"/contrib/webcscope || die
-	docinto webcscope
-	dodoc INSTALL TODO cgi-lib.pl cscope hilite.c
-	docinto webcscope/icons
-	dodoc icons/*.gif
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cscope/cscope-15.8.ebuild b/dev-util/cscope/cscope-15.8.ebuild
deleted file mode 100644
index f9f4c49e4bb4..000000000000
--- a/dev-util/cscope/cscope-15.8.ebuild
+++ /dev/null
@@ -1,63 +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/cscope/cscope-15.8.ebuild,v 1.1 2012/07/05 21:46:18 ulm Exp $
-
-EAPI=4
-
-inherit autotools elisp-common eutils
-
-DESCRIPTION="Interactively examine a C program"
-HOMEPAGE="http://cscope.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cscope/${P}.tar.bz2"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="emacs"
-
-RDEPEND=">=sys-libs/ncurses-5.2
-	emacs? ( virtual/emacs )"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	sys-devel/bison"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
-	eautoreconf		  # prevent maintainer mode later on
-}
-
-src_compile() {
-	emake
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-compile *.el || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog.old ChangeLog NEWS README TODO
-
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-install ${PN} *.el *.elc || die
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-		dobin cscope-indexer
-	fi
-
-	cd "${S}"/contrib/webcscope || die
-	docinto webcscope
-	dodoc INSTALL TODO cgi-lib.pl cscope hilite.c
-	docinto webcscope/icons
-	dodoc icons/*.gif
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-util/cscope/cscope-15.8a.ebuild b/dev-util/cscope/cscope-15.8a.ebuild
index 2a542cd41eae..84da514d41ac 100644
--- a/dev-util/cscope/cscope-15.8a.ebuild
+++ b/dev-util/cscope/cscope-15.8a.ebuild
@@ -1,10 +1,10 @@
-# 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/cscope/cscope-15.8a.ebuild,v 1.8 2012/09/29 18:45:43 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cscope/cscope-15.8a.ebuild,v 1.9 2014/01/25 10:24:50 ulm Exp $
 
 EAPI=4
 
-inherit autotools elisp-common eutils
+inherit autotools elisp-common eutils toolchain-funcs
 
 DESCRIPTION="Interactively examine a C program"
 HOMEPAGE="http://cscope.sourceforge.net/"
@@ -19,6 +19,7 @@ RDEPEND=">=sys-libs/ncurses-5.2
 	emacs? ( virtual/emacs )"
 DEPEND="${RDEPEND}
 	sys-devel/flex
+	virtual/pkgconfig
 	virtual/yacc"
 
 SITEFILE="50${PN}-gentoo.el"
@@ -29,7 +30,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake
+	emake CURSES_LIBS=$("$(tc-getPKG_CONFIG)" --libs ncurses)
 	if use emacs; then
 		cd "${S}"/contrib/xcscope || die
 		elisp-compile *.el || die