Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/elvis: elvis-2.2.0-r4.ebuild ChangeLog
Date: Fri, 01 Mar 2013 07:42:30
Message-Id: 20130301074226.6E1212171D@flycatcher.gentoo.org
1 ssuominen 13/03/01 07:42:26
2
3 Modified: elvis-2.2.0-r4.ebuild ChangeLog
4 Log:
5 cleanup and fix building wrt bug 459654
6
7 (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
8
9 Revision Changes Path
10 1.7 app-editors/elvis/elvis-2.2.0-r4.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/elvis/elvis-2.2.0-r4.ebuild?rev=1.7&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/elvis/elvis-2.2.0-r4.ebuild?rev=1.7&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/elvis/elvis-2.2.0-r4.ebuild?r1=1.6&r2=1.7
15
16 Index: elvis-2.2.0-r4.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r4.ebuild,v
19 retrieving revision 1.6
20 retrieving revision 1.7
21 diff -u -r1.6 -r1.7
22 --- elvis-2.2.0-r4.ebuild 9 Sep 2012 17:10:12 -0000 1.6
23 +++ elvis-2.2.0-r4.ebuild 1 Mar 2013 07:42:26 -0000 1.7
24 @@ -1,10 +1,9 @@
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/elvis/elvis-2.2.0-r4.ebuild,v 1.6 2012/09/09 17:10:12 armin76 Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/elvis-2.2.0-r4.ebuild,v 1.7 2013/03/01 07:42:26 ssuominen Exp $
30
31 -EAPI="3"
32 -
33 -inherit eutils versionator
34 +EAPI=5
35 +inherit eutils versionator toolchain-funcs
36
37 MY_PV=$(replace_version_separator 2 '_')
38
39 @@ -17,31 +16,34 @@
40 KEYWORDS="amd64 ppc ppc64 x86 ~x86-interix ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris"
41 IUSE="X"
42
43 -DEPEND=">=sys-libs/ncurses-5.2
44 +RDEPEND=">=sys-libs/ncurses-5.7-r7
45 X? ( >=x11-proto/xproto-7.0.4
46 >=x11-libs/libX11-1.0.0
47 >=x11-libs/libXt-1.0.0
48 >=x11-libs/libXpm-3.5.4.2
49 >=x11-libs/libXft-2.1.8.2 )
50 app-admin/eselect-vi"
51 +DEPEND="${RDEPEND}
52 + virtual/pkgconfig"
53
54 S=${WORKDIR}/${PN}-${MY_PV}
55
56 src_prepare() {
57 - epatch "${FILESDIR}"/ft2.3-symbol-collision-fix.patch \
58 - "${FILESDIR}"/${P}-glibc-2.10.patch
59 - epatch "${FILESDIR}"/${P}-interix.patch
60 + epatch \
61 + "${FILESDIR}"/ft2.3-symbol-collision-fix.patch \
62 + "${FILESDIR}"/${P}-glibc-2.10.patch \
63 + "${FILESDIR}"/${P}-interix.patch
64 }
65
66 -src_compile() {
67 +src_configure() {
68 ./configure \
69 - --libs="-lncurses" \
70 + --libs="$($(tc-getPKG_CONFIG) --libs ncurses)" \
71 --prefix="${EPREFIX}"/usr \
72 --bindir="${EPREFIX}"/usr/bin \
73 --datadir="${EPREFIX}"/usr/share/elvis \
74 - --docdir="${EPREFIX}"/usr/share/doc/"${PF}" \
75 + --docdir="${EPREFIX}"/usr/share/doc/${PF} \
76 $(use_with X x) \
77 - || die "configure failed"
78 + || die
79
80 # Some Makefile fixups (must happen after configure)
81 # Use our CFLAGS
82 @@ -62,19 +64,19 @@
83 dodir /usr/bin
84 dodir /usr/share/man/man1
85 dodir /usr/share/elvis
86 - dodir /usr/share/doc/"${PF}"
87 + dodir /usr/share/doc/${PF}
88 dodir /etc
89 - make install \
90 + emake install \
91 PREFIX="${ED}"/usr \
92 BINDIR="${ED}"/usr/bin \
93 DATADIR="${ED}"/usr/share/elvis \
94 - DOCDIR="${ED}"/usr/share/doc/"${PF}" || die 'make install failed'
95 + DOCDIR="${ED}"/usr/share/doc/${PF}
96
97 # Install the man-pages
98 mv doc/elvis.man doc/elvis.1
99 mv doc/elvtags.man doc/elvtags.1
100 mv doc/ref.man doc/ref.1
101 - doman doc/*.1 || die 'doman failed'
102 + doman doc/*.1
103
104 # Fixup some READMEs
105 sed -i -e "s,${ED},,g" "${ED}"/etc/elvis/README \
106
107
108
109 1.50 app-editors/elvis/ChangeLog
110
111 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/elvis/ChangeLog?rev=1.50&view=markup
112 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/elvis/ChangeLog?rev=1.50&content-type=text/plain
113 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/elvis/ChangeLog?r1=1.49&r2=1.50
114
115 Index: ChangeLog
116 ===================================================================
117 RCS file: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v
118 retrieving revision 1.49
119 retrieving revision 1.50
120 diff -u -r1.49 -r1.50
121 --- ChangeLog 9 Sep 2012 17:10:12 -0000 1.49
122 +++ ChangeLog 1 Mar 2013 07:42:26 -0000 1.50
123 @@ -1,6 +1,10 @@
124 # ChangeLog for app-editors/elvis
125 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
126 -# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.49 2012/09/09 17:10:12 armin76 Exp $
127 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
128 +# $Header: /var/cvsroot/gentoo-x86/app-editors/elvis/ChangeLog,v 1.50 2013/03/01 07:42:26 ssuominen Exp $
129 +
130 + 01 Mar 2013; Samuli Suominen <ssuominen@g.o> elvis-2.2.0-r4.ebuild:
131 + Move ./configure from src_compile() to src_configure(). Fix building with
132 + sys-libs/ncurses[tinfo] wrt #459654 by Diego Elio Pettenò
133
134 09 Sep 2012; Raúl Porcel <armin76@g.o> elvis-2.2.0-r3.ebuild,
135 elvis-2.2.0-r4.ebuild: