1 |
ulm 13/02/28 07:59:40 |
2 |
|
3 |
Modified: jasspa-microemacs-20091011-r2.ebuild ChangeLog |
4 |
Log: |
5 |
Fix build failure with separate tinfo library, bug 459644. |
6 |
|
7 |
(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.6 app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild?rev=1.6&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild?rev=1.6&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild?r1=1.5&r2=1.6 |
15 |
|
16 |
Index: jasspa-microemacs-20091011-r2.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild,v |
19 |
retrieving revision 1.5 |
20 |
retrieving revision 1.6 |
21 |
diff -u -r1.5 -r1.6 |
22 |
--- jasspa-microemacs-20091011-r2.ebuild 5 Sep 2012 07:09:11 -0000 1.5 |
23 |
+++ jasspa-microemacs-20091011-r2.ebuild 28 Feb 2013 07:59:40 -0000 1.6 |
24 |
@@ -1,6 +1,6 @@ |
25 |
-# Copyright 1999-2012 Gentoo Foundation |
26 |
+# Copyright 1999-2013 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild,v 1.5 2012/09/05 07:09:11 jlec Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r2.ebuild,v 1.6 2013/02/28 07:59:40 ulm Exp $ |
30 |
|
31 |
EAPI=4 |
32 |
|
33 |
@@ -15,7 +15,7 @@ |
34 |
http://www.jasspa.com/release_20090909/jasspa-mehtml-${PV}.tar.gz |
35 |
http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )" |
36 |
|
37 |
-LICENSE="GPL-2" |
38 |
+LICENSE="GPL-2+" |
39 |
SLOT="0" |
40 |
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" |
41 |
IUSE="nanoemacs X xpm" |
42 |
@@ -26,6 +26,7 @@ |
43 |
nanoemacs? ( !app-editors/ne )" |
44 |
|
45 |
DEPEND="${RDEPEND} |
46 |
+ virtual/pkgconfig |
47 |
X? ( x11-libs/libXt |
48 |
x11-proto/xproto )" |
49 |
|
50 |
@@ -46,7 +47,8 @@ |
51 |
epatch "${FILESDIR}/${PV}-linux3.patch" |
52 |
|
53 |
# allow for some variables to be passed to make |
54 |
- sed -i '/make/s/\$OPTIONS/& CC="$CC" COPTIMISE="$CFLAGS" LDFLAGS="$LDFLAGS" STRIP=true/' \ |
55 |
+ sed -i -e \ |
56 |
+ '/make/s/\$OPTIONS/& CC="$CC" COPTIMISE="$CFLAGS" LDFLAGS="$LDFLAGS" CONSOLE_LIBS="$CONSOLE_LIBS" STRIP=true/' \ |
57 |
build || die "sed failed" |
58 |
} |
59 |
|
60 |
@@ -57,7 +59,9 @@ |
61 |
use X && type=cw |
62 |
use xpm || export XPM_INCLUDE=. # prevent Xpm autodetection |
63 |
|
64 |
- CC="$(tc-getCC)" ./build ${me} \ |
65 |
+ CC="$(tc-getCC)" \ |
66 |
+ CONSOLE_LIBS="$(pkg-config --libs ncurses)" \ |
67 |
+ ./build ${me} \ |
68 |
-t ${type} \ |
69 |
-p "~/.jasspa:${pkgdatadir}/site:${pkgdatadir}" \ |
70 |
|| die "build failed" |
71 |
@@ -73,9 +77,7 @@ |
72 |
keepdir /usr/share/jasspa/site |
73 |
insinto /usr/share |
74 |
doins -r "${WORKDIR}/jasspa" |
75 |
- if use X; then |
76 |
- domenu "${FILESDIR}/${PN}.desktop" |
77 |
- fi |
78 |
+ use X && domenu "${FILESDIR}/${PN}.desktop" |
79 |
fi |
80 |
|
81 |
dodoc ../faq.txt ../readme.txt ../change.log |
82 |
|
83 |
|
84 |
|
85 |
1.55 app-editors/jasspa-microemacs/ChangeLog |
86 |
|
87 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog?rev=1.55&view=markup |
88 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog?rev=1.55&content-type=text/plain |
89 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog?r1=1.54&r2=1.55 |
90 |
|
91 |
Index: ChangeLog |
92 |
=================================================================== |
93 |
RCS file: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v |
94 |
retrieving revision 1.54 |
95 |
retrieving revision 1.55 |
96 |
diff -u -r1.54 -r1.55 |
97 |
--- ChangeLog 5 Sep 2012 07:09:11 -0000 1.54 |
98 |
+++ ChangeLog 28 Feb 2013 07:59:40 -0000 1.55 |
99 |
@@ -1,6 +1,10 @@ |
100 |
# ChangeLog for app-editors/jasspa-microemacs |
101 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
102 |
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.54 2012/09/05 07:09:11 jlec Exp $ |
103 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
104 |
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/ChangeLog,v 1.55 2013/02/28 07:59:40 ulm Exp $ |
105 |
+ |
106 |
+ 28 Feb 2013; Ulrich Müller <ulm@g.o> |
107 |
+ jasspa-microemacs-20091011-r2.ebuild: |
108 |
+ Fix build failure with separate tinfo library, bug 459644. |
109 |
|
110 |
05 Sep 2012; Justin Lecher <jlec@g.o> |
111 |
jasspa-microemacs-20091011-r2.ebuild: |