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

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

5 files changed, 56 insertions, 41 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/Manifest b/app-editors/uemacs-pk/Manifest
index 5b3edac0a3fb..73aa72f9f804 100644
--- a/app-editors/uemacs-pk/Manifest
+++ b/app-editors/uemacs-pk/Manifest
@@ -3,27 +3,24 @@ Hash: SHA256
 
 AUX uemacs-pk-4.0.15_p20110825-gentoo.patch 302 SHA256 75281f6f4ea7057e2753b7e526fba85bd8e92237f5577733945317ab4c74e893 SHA512 6938e768e742ffcbd88469c58bba07325d0c2ae7d354bdba66fcc3f9d47d141a98923fce516a03a799032869461da301cbe8ce7f312196a51f69dddcbe5c069b WHIRLPOOL b20a3d4e2e6cd2673327e2b31f22fbd472ac290eea8ebe590e27e968d8f9ba56e76cb9da4a08e8b68258d1833aa70921bcb440ecff0a365beb0c65ee063aa20e
 DIST uemacs-4.0.15_p20120526.tar.bz2 148189 SHA256 595cc89a146bcc846656d99e6d2186d1777a767b423390c3273ad652fddc9762 SHA512 212d6c2a5f6b7e831ac4473f2a9b55972e7434c2c1e40f81c65af295d9c9bb1a9a8bd96c006387a0e143e5e250cc2588262d3dc68641672758ada9cc13742c6d WHIRLPOOL 3435970aa349e60aa6a78847b11d5a1263db791a2cddb3a33ab687e84add92a0d0d15bea857e848af7da5fb156b6c1f039e561952bfc51e42e57de46c40b59a4
-DIST uemacs-4.0.15_p20120816.tar.bz2 149235 SHA256 033f9394baf1501c14efc00233e41fdd6334086dba63eec87273a19d3b042e12 SHA512 fff509a335dd98cb74d5ae58dc9feab7e49fb5df2756071ce633e667535ac51c810ab933b99a6cc0a3b25d436e120e2edade843e1c1d83bc7908f194565b12ef WHIRLPOOL a8b7a54088db8aa2832a826598335110ea98c0950dc28c8928dbed16d1289082cd8c4cdba0968a805173990d83379de78cd6277f6eb4de1bacd71ad8f9e0658b
 DIST uemacs-4.0.15_p20120925.tar.bz2 149535 SHA256 8eeaa7327bd3127804641dcd9cc56c026f2678f15717967d86fe883d74aedc62 SHA512 91c2a681faa08dbc1fea5d6b996eb789049932043a15e86e67b06a2fe5251bd3cf233d1ca449d4d382ac395fcb8bef053138dd9bb7a9fbb67ddc1cc31ecc95b9 WHIRLPOOL a08c6fe5a96c424f23fe4f21560eeab4befb212db5789232a4e9687af13d591f4c91a06dc26c3b636d807de005e5887e082830f7fbb8f3712fcbbb246f36e758
-EBUILD uemacs-pk-4.0.15_p20120526.ebuild 1149 SHA256 236029605d235b68fede786645ceeccb3322038ea18665a1cb8446b00875998f SHA512 0d0d6172dfcd231cf91b57701cd044d371a700891aa11017908c9a301888e0b33a29ed27814a4cc0a0206e30f4a963a374dcdd123d3f229deee40e39b8054e96 WHIRLPOOL 9bfa9bbcec9dafd6b0b718f0cd0310a18af1f65f992a8251235a8f63812c2516e89ce53337d2ff7554b97db17faa1e4c9f655859dd8bc575a8bce7989dfb68d1
-EBUILD uemacs-pk-4.0.15_p20120816.ebuild 1148 SHA256 ca4e455f9c20369967ac519c9ed7bb800b764e0278884fca1010341bcd095d38 SHA512 38a286f250a97272619f7ee5bf537d32119f98d2d9141164008c9c611e5d9a53c39f5ea0a11b4af8251e917311fd0711cf3e918c05a2c36fae0494f62fb048ad WHIRLPOOL f10f3f2ad84b5f95f3c23e6a7aeccbe94f37a833a815e8b333f884c93ad0b4916f4d3791cb6ab013865df4ce3e80f6a6fde12a700c0f3703bd644df9f3273aff
-EBUILD uemacs-pk-4.0.15_p20120925.ebuild 1148 SHA256 c6eedcbaaf25e089c8e0a14ea28ec4387925d9a4f8d7aba2eda7fb0a238c9ed4 SHA512 cdaf49615d7773191cd3ae2c49088dbf3bffc2417ee15cca4e20a3b5bcc1f13f8f968a94ff816ee761b0c0ea06c00b9d10754cf9ed600d28c6880b6b4ae91613 WHIRLPOOL 0ecb77870b1586486b3308d0e77a1b5f610f1eafd3fffae8ed0a70de84c7a1e1d17e41193bca0c03df7de6b4e287b7b873477d665aff58def0c1167717a6f8c0
-MISC ChangeLog 3338 SHA256 6c336c6d0296c55c4b6514f0ac48b1f243d24e27a7f12a841dac9927fcb2db63 SHA512 a0ce604c88a91039c8b5d365dc35ffd5ae72dd16c513be89f88eed607b0dc6486af955fd68d329ec346ff405fb4f9723530bb6b65c6a4d58d8cc8e4097eb2d59 WHIRLPOOL cd9fa648416845e0ec72b507e5943e771b6c39eefbafcbccf4918d47de0b7f83113c545080961a881be574edbbf8e20c5a9ab0c505341becfa2ba71b1f887dfc
+DIST uemacs-4.0.15_p20130222.tar.xz 151928 SHA256 eafab30840c684006876133f5d5042df19fa31ca3cf69a4e38998d950d5ec5ba SHA512 1815acba3b5165c5df0f71d34d687cd0022e7fc812bdd2cdd6778e371dd0e08ede4f670b241cf75c65f16f63f464017b83a113a1db4f0265e81441cc6dec3c0e WHIRLPOOL 5767f13984e61c82e41e68c034d48dd11aeef67433be4918e7eaf2c6e2870b52a43d71994b106287d3fddbcbf78ad2dd4d9e5807384a1712930161f6f46d74fe
+EBUILD uemacs-pk-4.0.15_p20120526.ebuild 1233 SHA256 2caa9a9edcf237aeadd6660f81bb442a15e1588baad542b658553b6a5cf338e4 SHA512 992a0d92c752a8b45f889ee2a1ce708aae4b0fd6ac7d6d08fb130316d686dcc420af89cdada71c5955d1246be7123e30d16b653cffdba2b6a9cfed63445bf2fd WHIRLPOOL fd0234218d8d66444e8ca8dece9660eae1b2b700234b46bc16a8be953df35433089796f963ab934483c9b719ef1e53c2e1b8f30ce691ce93a08270f527c94dd7
+EBUILD uemacs-pk-4.0.15_p20120925.ebuild 1235 SHA256 b73bc74546f4b1acdfbc607042e60f5b7d0978bf2c7072182a13f90c7877e34e SHA512 00e916165e5e2f76dc74943cf062dfeb36f78f50a8368634456c903bbcda7b86636db7a5395cf70541d7a71ad328f4b0bd1b49b77c5e77e871493376a6729ce7 WHIRLPOOL c01ff66e87edb756e1f2583e47eabd465617c8b6dc42a70dff03d9bd987594845d1130775d4a1bbd3fc45c660a9c3d5e86c2909ee64453502ff441709907a1a3
+EBUILD uemacs-pk-4.0.15_p20130222.ebuild 1072 SHA256 96ff2c6fd902feea089e5ba2967a99ff26e0740ae1037db9d364694b523e9b71 SHA512 def3a554a293b89c16bf5c0737a7e112768f7a4492ef7ede55a74a7458f3839b9d9348bc78f0b25e839c99d1d6f1037977b7168f936a3771abec9d76789ceec0 WHIRLPOOL 88719c46bb1ce3a8bf69c1121df6f061a2e33c23b8033a21098aef2a5e8a648d4ced27b57e59306d07b920eaec01c1739e0d5b9c7593981fc94d8f59c3a6bad5
+MISC ChangeLog 3664 SHA256 b5573c09dc497eceeef536e78ca4affbac593c399e618cca88c64223dc5e335b SHA512 dbae483e2e3cf9cf0b62d093951f3b744f9059d28e31abf2db344345ae2922b453fa0fef68cbed7e3d715c56f3484637182c7311fc70f655226ea11b411dcbdd WHIRLPOOL da5b0335c20b13a5890db27f0613cadf071a20162defc45308879714b5fd52872d19806f1e63a7bd772b0fe73d01ae024931059c3a8202f30c1910999c38bdad
 MISC metadata.xml 945 SHA256 20f67b1215ecb8d611237bcad8b1091fc0c62580bdab27ce6185469851365c80 SHA512 b7d4a8ed8cdea1d53e2f2f4c1633b4baab7271a42038fb6b51624f47eb6e8c317035df3c6fc20741328f929c02c51a05317e609edaebb55058304b170e59b3cd WHIRLPOOL db5215e876cd6577ce57659f01b7b40947b1b094e6136612e2ff802cb1c6eace62bcafa8fe484b2692852b375c6f1c2983451cf63554b30ccac85d5ae1fb3ff0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQZazRAAoJEDxpGckxwJCBVpEP/iPlffq5DXJBOnMPRDoh/XNP
-szthytOGojixsXUx17hJB/ZziVNana0+GE9MczJIhFS7pwi/8spC+ujz2e1uIEf2
-PFwJWJHRkdcEAJz7zEttvOZHuvXUz+KPNCpP1EmXxRB7l1V2N2dLiiIq2C3hB4Kl
-lwpg4mTbdWUSgE4pBcrNS5DpDRl6hJBsyk1mXnSOGQOGqA2oroq1ysG/WBgBlvxb
-P0ypV+ZYZQCf7N/CIDyMm7gsBYej2Zxh+5+gtge2dtzHnjlb+cPYe4F1uird7ism
-fUCSB/3RF3EeND+ZxZ0gQ3gNHPx/X0otbvvx2kiHpMxbIcKTya1EIPUidObpeY1x
-OtCdt55Qq8GmYX05l7oraKAOgiXbqDebrEyM6J88LdPx+RbYBTcfaWSNa2+g+XkF
-92fqdW4EaNTY641M3W37JIx5jpIEESeJbqKgNqxbSIRhl6ANLHMYiVAKAcOuEEHj
-5/BSjmtBcZ1TRqg3ygHRvM8xTlbAguqsJiVynacs6eosIq9iTbYviIkIws8ZfY7b
-tgJs7U8QyNAAkiZ7GVh5xgSApFm43fONIOd06W/5oao+g/MZJ6HuD9RhyxopLNxH
-EpCLWh5/p6jXfkep5TPlMzuUmzYf7SseJV8fJOLRDXYRr6uHFejS8Boy0ezchfHl
-DI1Yy2waP3f6u08/l5M8
-=apXl
+iQGcBAEBCAAGBQJRL5ZOAAoJEJQzkH1pP7W4okAL/38WN0Vk5c2qN5c46iRNWrNU
+GQcUbsouBiDzaNlCIPMSeLio64f33rMt0+n946b2t89zPeDT6cFP0vD+3NfGd3PX
+xrDed/mPXfJ8clyivZx0DgrHwc/oTRS7o1J9S44t5XTbR8UBGJ46zSCJ2hKQ1cgB
+HRoHyKpa42eez3TI9SV+NO9zmmcRlyZn3RzpRKn8tko6C9ontphQrc61HkGglTv2
+JdQZYQ7cvEBBQhkKzhAmhfzYNQ1VzAfLGPyHaGIKWtW5e3r3Jmf/vGj2iZzhis0p
+kXufjRtJBH8DfzMR44re3fMch9shp2yIgC6lqNFnMndY2eiFW7oLrI3cTiQ1bFgo
+7pRea3XkswledrDV2h0vUAL5Va7j7gJNXZhGmFsWMF+XO2s3Fdkd8Y/9iW/4TXwS
+PBR+DBUwUeIv93kmdOUTd8r+rU92MY0TLhdGJsHTImo4Gvxn0X7q7WujkvRgWidU
+AO/IOkxxCr4QpWiY3bXzV7n21lQLKLpaj7P5XNFiOQ==
+=9WXe
 -----END PGP SIGNATURE-----
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\"."
-}