Remove odd USE=unicode. Fix building against sys-libs/ncurses[tinfo] (bug #483478).

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

7 files changed, 60 insertions, 39 deletions

diff --git a/app-misc/pal/ChangeLog b/app-misc/pal/ChangeLog
index d9bda65836e9..3b464f439345 100644
--- a/app-misc/pal/ChangeLog
+++ b/app-misc/pal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/pal
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pal/ChangeLog,v 1.37 2012/11/21 13:25:13 kensington Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pal/ChangeLog,v 1.38 2014/10/28 22:11:40 jer Exp $
+
+  28 Oct 2014; Jeroen Roovers <jer@gentoo.org> pal-0.4.3-r1.ebuild,
+  files/0.4.3-ldflags.patch, +files/pal-0.4.3-pkg_config.patch,
+  files/0.4.3-strip.patch, files/pal-0.4.3-prefix.patch:
+  Remove odd USE=unicode. Fix building against sys-libs/ncurses[tinfo] (bug
+  #483478).
 
   21 Nov 2012; Michael Palimaka <kensington@gentoo.org>
   -files/0.3.4-ldflags.patch, -files/0.3.4-strip.patch, -pal-0.4.3.ebuild:
diff --git a/app-misc/pal/Manifest b/app-misc/pal/Manifest
index f2f7c054245c..7e1f07f97911 100644
--- a/app-misc/pal/Manifest
+++ b/app-misc/pal/Manifest
@@ -1,21 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 0.4.3-ldflags.patch 204 SHA256 2e2c5a269184abc17feec9d1d98772aec45bc8ec23770b1a23b69b5f8412bb58 SHA512 68bf231df3fbb29f8a78518663f4176bc4539d82f1d572d25939b2e6236dda43f6b5a20ff74a67e16f6e3ea6fd3390cad2a881fff2b6d42fe6923867a5bda6c3 WHIRLPOOL 0495b0642f9594700a231fc126b69b3a097b58b6a78218e1096e94db386f294a393d84495f923391fb7b4995d9758c7cae02b943a62efee5483a9dec47859e4f
-AUX 0.4.3-strip.patch 316 SHA256 abb4d6f9d710eacf3005ded7907d3e10bd60f77eeba55eb5c33351e0feaf0e71 SHA512 db47b0d4f3010da08b887b59665efef5de5d50793819538feb1fde377c4de9bd23f235275c3c27e49c049b7b4af3bfe79ff16c4d59254a53ffc076d1e90fced8 WHIRLPOOL 79205e09c274c64151237cb4f5c2e476f54a0f176c3f24e3d2e58d5399e8a0769b034f887c4831b067f59f4f6aa8a75df65db92a7b1531e5a8b92889f0ffdd06
-AUX pal-0.4.3-prefix.patch 1642 SHA256 78edecca80affa43c611a6b8035a42ac1c30e387130e5658d4211eedcfbfd53a SHA512 754bea44472cb36d72a9b7017a7542858535c7054a51e42d13002722e84fde41b71444f9a568519698d5aca1b890b8a05e17b6b2607d0d0bf20c9abdeb654b3f WHIRLPOOL 2e988888f552f7f1bc34fdec0ee974418cbefa0270d100032401a99c4d9ce01b815ac17bb7029704d51d29f3026b25021c9a00dbd6599fe228504a15a7158347
+AUX 0.4.3-ldflags.patch 188 SHA256 b40a4b472ae36b68718fc17b7b454b7c12c85fb7f404caa79b07ee1846a760f4 SHA512 590852462185b57907c57f76bf76d7b4444e9deae8df85f66fc3aecee0b2539e41ce27f1097b7b24e12da46659bde163bb666317df8ec107cfbd6e26e1027d66 WHIRLPOOL 05ff60b0de939e945f1ab5b0116b9cd61adb39debce5ffa54d186e408e25adb54f3c7a5828d789991cbd2160f7d8de196f00172c8b1194f2dfe911b385070bea
+AUX 0.4.3-strip.patch 300 SHA256 64d1a77c31b64c1be4a43eb4ae468deceb702c12d87372a689623b29ce38b23d SHA512 1ccf90c0c968e098fd1ad0dd61cc177ebc484ffa207b469b75aec63263dfb1cf9850218571b3f9609c4fea30c10678b115f24d78b4b17d0f57173712f7d5cf86 WHIRLPOOL 8cd014a10536c8b78e679e7a746571d3d596ef07550b2609c6b11aa1bcdbf8110b178ad7352ea593a79b85698498c7f905f0a74ff049fee448ecfd584bbabd88
+AUX pal-0.4.3-pkg_config.patch 521 SHA256 588701828764e094f87872cccfc4355d821bf40b4016cba688d5b32f54fe8ad4 SHA512 216d34abd73cdfd7f539d4881c25717ae2bdf919df05ad553bf4ed3a0a8e8a616dcb688f06f6beee6b2f5943f3accf1d144ae3a226ee5a2d0078d5450640eaa5 WHIRLPOOL 6a7e420364d8b5fe963ea5774f6b98369103f0a2f4b9da2bc15eb7fc327977ed541a51659d36c1c1f7c99e3a25cad32fc7baf0a07909828a55e395ce84fcd43d
+AUX pal-0.4.3-prefix.patch 1519 SHA256 535f83042a6faaad01603e56a7c7c66f3e3eeadfc9d4f2627878926d6eafd39f SHA512 428cc71d6775f33916e6b9025627027dc8b75fa66dadb4cef42b3e2167a662e04d94fff7edec68916efc3a1944f3579fa88e3324e0a131b7bc10d7f3105ea2c9 WHIRLPOOL 6c322e0bf3ef6390c7fc78e28d3774339a24446e5e95249f2941f6e74275efce12e32531699528b7925a8817f8c43310156f14c11c4b20ec1793b4090eb538e0
 DIST pal-0.4.3.tgz 130865 SHA256 ce470cb7be76522ff58cd0325ad7817b6cc2132a5e0cea55de8c9eb63b54551c SHA512 8d543706e6dcabbdeb246ff18917b490da43c3211266dc67417906eb92602a107b066e2cb156da2b5362a19ac4992d1f21dc873485d3250912a53143f8257bf8 WHIRLPOOL ffe71469258a9f78ce47deed4b488b49df466c6ed2144186852ade1a55ee670747580ff18140dba92b007c148701bfa8a2c68a260259831f5eb357f5c8bf4d5c
-EBUILD pal-0.4.3-r1.ebuild 1304 SHA256 39815cf501a93a8ca023137774cf0c21830927d3a6c093f8ea6317173fb93bd5 SHA512 07af98889f56755990f1674b5d1611b10be7190a2e19c3c8a7697e7434b613e7f1c2af6cfc8df86cce109af7641a0422a58d38d74c8a8c71eb159271d275873a WHIRLPOOL 16970cc99a80d0ce5586fc97dcea0f3c6b8ab2f740997e8e16b767d862326163077b96caa8c1ac28d495ef556e275130e9bd8db06da64ee6ee7a21b74b3882db
-MISC ChangeLog 4566 SHA256 71a68e2ba3b9681b17114e52eff2ca8e00bcd45c26794345c62eb54c20c1153d SHA512 04e9f3f30e4226b5803aa6e7d154ba2993994fac36374d1fe2cd943257ed647fa8662b9cd4792f66a655ec3a1fb0d7244ec2ba69ea2edf29ec575673a292e8ae WHIRLPOOL be3726cc2c69ffc1428dcd095badbca6a23c65d65bee0c327e89c245aede3ab4b0982713c7796e0d85e9cd1d667c99d7667033821d399e662a2dcb7128a84834
+EBUILD pal-0.4.3-r1.ebuild 1276 SHA256 42bb0485ade8cac68721b98163f784a779c4cce2a487d2637c5a8d9d44a6e6b7 SHA512 6e372d85752a3a3a16801e64ad45b31fc604b800ccf0dc0e55baf34166cb3c881e179207eaa6e5d2a99d9446ba0bbe5a71a533286f561623dcbe35862b4f1eb9 WHIRLPOOL 3ec89e00e4b493ea55973a52c93472857cdba13e102c47bc0b064e02c6bbdeec6a15e972ced42c61955f9389f469c2bdbed1f25a4f2777abeb74f741bb8137f3
+MISC ChangeLog 4837 SHA256 df66484ee80b1944d7659cac7dfe6d4a917f7e0b3149ce8247783c9060249252 SHA512 1441e9a15c5df93ab96879e88f6e15922ce9cbd1e6c57c3545d45dbf63bba5d04318bdf37e3d2659a98065ef3084c67ae1cb981d82cb7c299d87b09d0f46e513 WHIRLPOOL 7e6396ea7e4e9d247e8e203f8fc935fe416c44a62ebb7eeca5c6f4ad4e7ad5c587ee6bacc1a5f1e18fa3d475b3b6795565f9b9da156c592dc1e3219065df150d
 MISC metadata.xml 481 SHA256 2fe310c92832aab45276ba7bffb5c196d1d48cd1a3a5b4c1e43ab86b7a9bc08a SHA512 be89614f2a571af32418c747e7f9093de2b6cfe95a3498474c31cb93b55562f3344b7b23516e206fcacb9ff8911d41b5b3c04aadc8c746fe7bf1c373a5c9d521 WHIRLPOOL c86c827ffdfce7fe1e186e5de3f4319f9d327ed1ce4c81dc4a4db4f55406bda1a288b43a46abdd120f380a37cc5867bcb29dd9a8276906b3e24949ab77f47e18
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJQrNXTAAoJEMbwO6tnXQ0sRZcIAJmDVzq9hH85dSosHGWThLEj
-vZdRkz/EpJD+V6E/agXb64ectwasCu+nd+tqkwuBf7xeuMQi2tnWU2j3V9pPwzJE
-hLjSySGShWfQCa3qVS+NjpXHVX1SWk57a0Wf+7HJZHkDaXgC5Ev/hkfGWJimCxd2
-2QJREwCtlv9dhjXxMgdxM+h7ghlUssBjt7b50JlRODhFUYt5dZS2e8SozESnktDv
-bTKyM53oQsKf0Hdae6GuPhq0YGC7sBsev94aklh8zItqHUaYngPTFnJVcc832KTa
-EpqyIVzvFNQYNjv2LPUcaKTF3wYFLgGvsUQM2LpXSFAHi6MLyPnlH012zB90sSw=
-=alQS
+iEYEAREIAAYFAlRQFJ0ACgkQVWmRsqeSphMmbwCfVqPuUaRN0yM23iSE4bgB4c4k
+55cAnApmU7tDRM03aciPgqf9RGVO+Bll
+=j3Zw
 -----END PGP SIGNATURE-----
diff --git a/app-misc/pal/files/0.4.3-ldflags.patch b/app-misc/pal/files/0.4.3-ldflags.patch
index abd8da3fe85f..0bfd750ac5e7 100644
--- a/app-misc/pal/files/0.4.3-ldflags.patch
+++ b/app-misc/pal/files/0.4.3-ldflags.patch
@@ -1,5 +1,5 @@
---- pal-0.4.3/src/Makefile.defs
-+++ pal-0.4.3/src/Makefile.defs
+--- a/src/Makefile.defs
++++ b/src/Makefile.defs
 @@ -25,4 +25,4 @@
  
  CFLAGS   = ${OPT} 
diff --git a/app-misc/pal/files/0.4.3-strip.patch b/app-misc/pal/files/0.4.3-strip.patch
index 00ff9a6d5c46..b3bfe3fd99f1 100644
--- a/app-misc/pal/files/0.4.3-strip.patch
+++ b/app-misc/pal/files/0.4.3-strip.patch
@@ -1,5 +1,5 @@
---- pal-0.4.2/src/Makefile
-+++ pal-0.4.2/src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -21,10 +21,10 @@
  $(NAME): $(OBJ)
  	@echo " [gcc] $(NAME)"
diff --git a/app-misc/pal/files/pal-0.4.3-pkg_config.patch b/app-misc/pal/files/pal-0.4.3-pkg_config.patch
new file mode 100644
index 000000000000..2a299538e999
--- /dev/null
+++ b/app-misc/pal/files/pal-0.4.3-pkg_config.patch
@@ -0,0 +1,14 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -2,9 +2,9 @@
+ 
+ include Makefile.defs
+ 
+-INCLDIR = -I${prefix}/include `pkg-config --cflags glib-2.0`
++INCLDIR = -I${prefix}/include $(shell ${PKG_CONFIG} --cflags glib-2.0)
+ LIBDIR  =
+-LIBS    = `pkg-config --libs glib-2.0` -lreadline -lncurses
++LIBS    = $(shell ${PKG_CONFIG} --libs glib-2.0) -lreadline $(shell ${PKG_CONFIG} --libs ncurses)
+ 
+ SRC     = main.c colorize.c output.c input.c event.c rl.c html.c latex.c \
+           add.c edit.c del.c remind.c search.c manage.c
diff --git a/app-misc/pal/files/pal-0.4.3-prefix.patch b/app-misc/pal/files/pal-0.4.3-prefix.patch
index 1175d966bb97..08dfba41c7e7 100644
--- a/app-misc/pal/files/pal-0.4.3-prefix.patch
+++ b/app-misc/pal/files/pal-0.4.3-prefix.patch
@@ -1,5 +1,5 @@
---- Makefile.defs~	2007-10-12 04:11:32 +0200
-+++ Makefile.defs	2007-10-12 04:11:59 +0200
+--- a/src/Makefile.defs
++++ b/src/Makefile.defs
 @@ -3,7 +3,7 @@
  
  # directory to install to. Depending on your distribution, you might
@@ -9,8 +9,8 @@
  CC      = gcc
  
  PAL_VERSION = 0.3.5_pre1
---- input.c~	2007-10-12 04:08:59 +0200
-+++ input.c	2007-10-12 04:17:45 +0200
+--- a/src/input.c
++++ b/src/input.c
 @@ -567,7 +567,7 @@
  	    }
  
@@ -29,8 +29,8 @@
  		pal_output_error(_("ERROR: Can't open file: " PREFIX "/share/pal/pal.conf\n"));
  		pal_output_error(_("ERROR: This indicates an improper installation.\n"));
  		return ht;
---- Makefile~	2007-10-12 04:23:38 +0200
-+++ Makefile	2007-10-12 04:24:23 +0200
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -51,8 +51,8 @@
  	@echo " --- Installing global data --- "
  	@mkdir -p ${DESTDIR}${prefix}/share/pal;
diff --git a/app-misc/pal/pal-0.4.3-r1.ebuild b/app-misc/pal/pal-0.4.3-r1.ebuild
index bfafb9f76d13..160962cf468d 100644
--- a/app-misc/pal/pal-0.4.3-r1.ebuild
+++ b/app-misc/pal/pal-0.4.3-r1.ebuild
@@ -1,9 +1,9 @@
-# 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/app-misc/pal/pal-0.4.3-r1.ebuild,v 1.4 2012/11/20 20:45:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pal/pal-0.4.3-r1.ebuild,v 1.5 2014/10/28 22:11:40 jer Exp $
 
-EAPI=4
-inherit toolchain-funcs eutils prefix
+EAPI=5
+inherit eutils prefix toolchain-funcs
 
 DESCRIPTION="pal command-line calendar program"
 HOMEPAGE="http://palcal.sourceforge.net/"
@@ -12,28 +12,32 @@ SRC_URI="mirror://sourceforge/palcal/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="nls unicode"
+IUSE="nls"
 
-RDEPEND=">=dev-libs/glib-2.0
+RDEPEND="
+	>=dev-libs/glib-2.0
+	nls? ( virtual/libintl )
+	sys-libs/ncurses
 	sys-libs/readline
-	sys-libs/ncurses[unicode?]
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+"
 
 S=${WORKDIR}/${P}/src
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-strip.patch
 	epatch "${FILESDIR}"/${PV}-ldflags.patch
-	if use unicode; then
-		sed -i "/^LIBS/s/-lncurses/&w/" "${S}"/Makefile || die
-	fi
-
+	epatch "${FILESDIR}"/${P}-pkg_config.patch
 	epatch "${FILESDIR}"/${P}-prefix.patch
+
 	eprefixify Makefile.defs input.c Makefile
 	sed -i -e 's/ -o root//g' {.,convert}/Makefile || die
+
+	tc-export PKG_CONFIG
 }
 
 src_compile() {