From d52c5d9e88cdff18da6b49194ea81a4c7fd1ae51 Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Thu, 27 Oct 2016 19:38:48 +0200
Subject: dev-util/cscope: Add ncurses:0 slot dependency.

Update EAPI to 6.

Bug: 598164

Package-Manager: portage-2.3.2
RepoMan-Options: --force
---
 dev-util/cscope/cscope-15.8a-r1.ebuild | 65 ++++++++++++++++++++++++++++++++++
 dev-util/cscope/cscope-15.8a.ebuild    | 63 --------------------------------
 2 files changed, 65 insertions(+), 63 deletions(-)
 create mode 100644 dev-util/cscope/cscope-15.8a-r1.ebuild
 delete mode 100644 dev-util/cscope/cscope-15.8a.ebuild

diff --git a/dev-util/cscope/cscope-15.8a-r1.ebuild b/dev-util/cscope/cscope-15.8a-r1.ebuild
new file mode 100644
index 000000000000..407eada3c1d4
--- /dev/null
+++ b/dev-util/cscope/cscope-15.8a-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools elisp-common toolchain-funcs
+
+DESCRIPTION="Interactively examine a C program"
+HOMEPAGE="http://cscope.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="emacs"
+
+RDEPEND=">=sys-libs/ncurses-5.2:0
+	emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
+	eapply_user
+	mv configure.{in,ac} || die
+	eautoreconf		  # prevent maintainer mode later on
+}
+
+src_compile() {
+	emake CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+	if use emacs; then
+		cd "${S}"/contrib/xcscope || die
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	default
+
+	if use emacs; then
+		cd "${S}"/contrib/xcscope || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		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
deleted file mode 100644
index 208407b7d1e8..000000000000
--- a/dev-util/cscope/cscope-15.8a.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit autotools elisp-common eutils toolchain-funcs
-
-DESCRIPTION="Interactively examine a C program"
-HOMEPAGE="http://cscope.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 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
-	virtual/pkgconfig
-	virtual/yacc"
-
-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 CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-compile *.el
-	fi
-}
-
-src_install() {
-	default
-
-	if use emacs; then
-		cd "${S}"/contrib/xcscope || die
-		elisp-install ${PN} *.el *.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-		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
-}
-- 
cgit v1.2.3-65-gdbad