| 1 |
jer 14/10/28 22:11:40 |
| 2 |
|
| 3 |
Modified: ChangeLog pal-0.4.3-r1.ebuild |
| 4 |
Log: |
| 5 |
Remove odd USE=unicode. Fix building against sys-libs/ncurses[tinfo] (bug #483478). |
| 6 |
|
| 7 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.38 app-misc/pal/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/pal/ChangeLog?rev=1.38&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/pal/ChangeLog?rev=1.38&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/pal/ChangeLog?r1=1.37&r2=1.38 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/pal/ChangeLog,v |
| 19 |
retrieving revision 1.37 |
| 20 |
retrieving revision 1.38 |
| 21 |
diff -u -r1.37 -r1.38 |
| 22 |
--- ChangeLog 21 Nov 2012 13:25:13 -0000 1.37 |
| 23 |
+++ ChangeLog 28 Oct 2014 22:11:40 -0000 1.38 |
| 24 |
@@ -1,6 +1,12 @@ |
| 25 |
# ChangeLog for app-misc/pal |
| 26 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-misc/pal/ChangeLog,v 1.37 2012/11/21 13:25:13 kensington Exp $ |
| 28 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-misc/pal/ChangeLog,v 1.38 2014/10/28 22:11:40 jer Exp $ |
| 30 |
+ |
| 31 |
+ 28 Oct 2014; Jeroen Roovers <jer@g.o> pal-0.4.3-r1.ebuild, |
| 32 |
+ files/0.4.3-ldflags.patch, +files/pal-0.4.3-pkg_config.patch, |
| 33 |
+ files/0.4.3-strip.patch, files/pal-0.4.3-prefix.patch: |
| 34 |
+ Remove odd USE=unicode. Fix building against sys-libs/ncurses[tinfo] (bug |
| 35 |
+ #483478). |
| 36 |
|
| 37 |
21 Nov 2012; Michael Palimaka <kensington@g.o> |
| 38 |
-files/0.3.4-ldflags.patch, -files/0.3.4-strip.patch, -pal-0.4.3.ebuild: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.5 app-misc/pal/pal-0.4.3-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/pal/pal-0.4.3-r1.ebuild?rev=1.5&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/pal/pal-0.4.3-r1.ebuild?rev=1.5&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/pal/pal-0.4.3-r1.ebuild?r1=1.4&r2=1.5 |
| 47 |
|
| 48 |
Index: pal-0.4.3-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/app-misc/pal/pal-0.4.3-r1.ebuild,v |
| 51 |
retrieving revision 1.4 |
| 52 |
retrieving revision 1.5 |
| 53 |
diff -u -r1.4 -r1.5 |
| 54 |
--- pal-0.4.3-r1.ebuild 20 Nov 2012 20:45:40 -0000 1.4 |
| 55 |
+++ pal-0.4.3-r1.ebuild 28 Oct 2014 22:11:40 -0000 1.5 |
| 56 |
@@ -1,9 +1,9 @@ |
| 57 |
-# Copyright 1999-2012 Gentoo Foundation |
| 58 |
+# Copyright 1999-2014 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
-# $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 $ |
| 61 |
+# $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 $ |
| 62 |
|
| 63 |
-EAPI=4 |
| 64 |
-inherit toolchain-funcs eutils prefix |
| 65 |
+EAPI=5 |
| 66 |
+inherit eutils prefix toolchain-funcs |
| 67 |
|
| 68 |
DESCRIPTION="pal command-line calendar program" |
| 69 |
HOMEPAGE="http://palcal.sourceforge.net/" |
| 70 |
@@ -12,28 +12,32 @@ |
| 71 |
LICENSE="GPL-2" |
| 72 |
SLOT="0" |
| 73 |
KEYWORDS="amd64 ~hppa ppc x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos" |
| 74 |
-IUSE="nls unicode" |
| 75 |
+IUSE="nls" |
| 76 |
|
| 77 |
-RDEPEND=">=dev-libs/glib-2.0 |
| 78 |
+RDEPEND=" |
| 79 |
+ >=dev-libs/glib-2.0 |
| 80 |
+ nls? ( virtual/libintl ) |
| 81 |
+ sys-libs/ncurses |
| 82 |
sys-libs/readline |
| 83 |
- sys-libs/ncurses[unicode?] |
| 84 |
- nls? ( virtual/libintl )" |
| 85 |
-DEPEND="${RDEPEND} |
| 86 |
+" |
| 87 |
+DEPEND=" |
| 88 |
+ ${RDEPEND} |
| 89 |
+ nls? ( sys-devel/gettext ) |
| 90 |
virtual/pkgconfig |
| 91 |
- nls? ( sys-devel/gettext )" |
| 92 |
+" |
| 93 |
|
| 94 |
S=${WORKDIR}/${P}/src |
| 95 |
|
| 96 |
src_prepare() { |
| 97 |
epatch "${FILESDIR}"/${PV}-strip.patch |
| 98 |
epatch "${FILESDIR}"/${PV}-ldflags.patch |
| 99 |
- if use unicode; then |
| 100 |
- sed -i "/^LIBS/s/-lncurses/&w/" "${S}"/Makefile || die |
| 101 |
- fi |
| 102 |
- |
| 103 |
+ epatch "${FILESDIR}"/${P}-pkg_config.patch |
| 104 |
epatch "${FILESDIR}"/${P}-prefix.patch |
| 105 |
+ |
| 106 |
eprefixify Makefile.defs input.c Makefile |
| 107 |
sed -i -e 's/ -o root//g' {.,convert}/Makefile || die |
| 108 |
+ |
| 109 |
+ tc-export PKG_CONFIG |
| 110 |
} |
| 111 |
|
| 112 |
src_compile() { |
Archives