Fix build failure with separate tinfo library, bug 459728. Version bump. Remove old.

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

4 files changed, 41 insertions, 23 deletions

diff --git a/app-editors/uemacs-pk/ChangeLog b/app-editors/uemacs-pk/ChangeLog
index 3be592536a21..f65b26ce4ebd 100644
--- a/app-editors/uemacs-pk/ChangeLog
+++ b/app-editors/uemacs-pk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/uemacs-pk
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/uemacs-pk/ChangeLog,v 1.21 2012/09/28 13:48:30 ulm Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/uemacs-pk/ChangeLog,v 1.22 2013/02/28 17:34:52 ulm Exp $
+
+*uemacs-pk-4.0.15_p20130222 (28 Feb 2013)
+
+  28 Feb 2013; Ulrich Müller <ulm@gentoo.org>
+  uemacs-pk-4.0.15_p20120526.ebuild, -uemacs-pk-4.0.15_p20120816.ebuild,
+  uemacs-pk-4.0.15_p20120925.ebuild, +uemacs-pk-4.0.15_p20130222.ebuild:
+  Fix build failure with separate tinfo library, bug 459728. Version bump.
+  Remove old.
 
 *uemacs-pk-4.0.15_p20120925 (28 Sep 2012)
 
diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120526.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120526.ebuild
index b197ee99d0f0..c9bc7afadd6f 100644
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120526.ebuild
+++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120526.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120526.ebuild,v 1.4 2012/06/25 07:43:18 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120526.ebuild,v 1.5 2013/02/28 17:34:52 ulm Exp $
 
 EAPI=4
 
@@ -17,8 +17,9 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 S="${WORKDIR}/uemacs"
 
@@ -27,7 +28,11 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake V=1 \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
 }
 
 src_install() {
diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120925.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120925.ebuild
index 85cabe17ce31..5a846a439bce 100644
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120925.ebuild
+++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120925.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120925.ebuild,v 1.1 2012/09/28 13:48:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120925.ebuild,v 1.2 2013/02/28 17:34:52 ulm Exp $
 
 EAPI=4
 
@@ -17,8 +17,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 S="${WORKDIR}/uemacs"
 
@@ -27,7 +28,11 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake V=1 \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
 }
 
 src_install() {
diff --git a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120816.ebuild b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20130222.ebuild
index 18c9e48a7ada..f41a0a7e1910 100644
--- a/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120816.ebuild
+++ b/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20130222.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20120816.ebuild,v 1.1 2012/08/18 21:08:00 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/uemacs-pk/uemacs-pk-4.0.15_p20130222.ebuild,v 1.1 2013/02/28 17:34:52 ulm Exp $
 
 EAPI=4
 
@@ -10,15 +10,16 @@ DESCRIPTION="uEmacs/PK is an enhanced version of MicroEMACS"
 HOMEPAGE="http://git.kernel.org/?p=editors/uemacs/uemacs.git;a=summary
 	ftp://ftp.cs.helsinki.fi/pub/Software/Local/uEmacs-PK"
 # snapshot from git repo
-SRC_URI="mirror://gentoo/uemacs-${PV}.tar.bz2"
+SRC_URI="mirror://gentoo/uemacs-${PV}.tar.xz"
 
 LICENSE="free-noncomm"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE=""
 
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
+RDEPEND="sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 S="${WORKDIR}/uemacs"
 
@@ -27,7 +28,11 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake V=1 \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
 }
 
 src_install() {
@@ -37,8 +42,3 @@ src_install() {
 	newins emacs.rc .emacsrc
 	dodoc README readme.39e emacs.ps UTF-8-demo.txt
 }
-
-pkg_postinst() {
-	einfo "If you are upgrading from version 4.0.18, please note that the"
-	einfo "executable is now installed as \"em\" instead of \"uemacs\"."
-}