Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/nano: nano-2.3.1-r1.ebuild ChangeLog
Date: Sun, 01 Jan 2012 07:34:51
Message-Id: 20120101073431.92FDD2004B@flycatcher.gentoo.org
1 vapier 12/01/01 07:34:31
2
3 Modified: nano-2.3.1-r1.ebuild ChangeLog
4 Log:
5 Search for ncurses via pkg-config files.
6
7 (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.2 app-editors/nano/nano-2.3.1-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nano/nano-2.3.1-r1.ebuild?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nano/nano-2.3.1-r1.ebuild?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nano/nano-2.3.1-r1.ebuild?r1=1.1&r2=1.2
15
16 Index: nano-2.3.1-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.1-r1.ebuild,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- nano-2.3.1-r1.ebuild 29 Aug 2011 18:08:00 -0000 1.1
23 +++ nano-2.3.1-r1.ebuild 1 Jan 2012 07:34:31 -0000 1.2
24 @@ -1,12 +1,13 @@
25 -# Copyright 1999-2011 Gentoo Foundation
26 +# Copyright 1999-2012 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.1-r1.ebuild,v 1.1 2011/08/29 18:08:00 grobian Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.3.1-r1.ebuild,v 1.2 2012/01/01 07:34:31 vapier Exp $
30
31 EAPI="3"
32 -inherit eutils
33 +
34 +inherit eutils autotools
35 if [[ ${PV} == "9999" ]] ; then
36 ESVN_REPO_URI="svn://svn.savannah.gnu.org/nano/trunk/nano"
37 - inherit subversion
38 + inherit subversion autotools
39 else
40 MY_P=${PN}-${PV/_}
41 SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
42 @@ -20,16 +21,15 @@
43 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
44 IUSE="debug justify minimal ncurses nls slang spell unicode"
45
46 -DEPEND=">=sys-libs/ncurses-5.2[unicode?]
47 +RDEPEND=">=sys-libs/ncurses-5.9-r1[unicode?]
48 nls? ( sys-devel/gettext )
49 !ncurses? ( slang? ( sys-libs/slang ) )"
50 +DEPEND="${RDEPEND}
51 + dev-util/pkgconfig"
52
53 src_prepare() {
54 - if [[ ! -e configure ]] ; then
55 - ./autogen.sh || die
56 - fi
57 - # Prefix fix for odd ncursesw logic, bug #361251
58 - sed -i -e "s:-I\(/usr/include/ncursesw\):-I${EPREFIX}\1:" configure || die
59 + epatch "${FILESDIR}"/${PN}-2.3.1-ncurses-pkg-config.patch
60 + eautoreconf
61 }
62
63 src_configure() {
64 @@ -63,14 +63,6 @@
65
66 dodir /usr/bin
67 dosym /bin/nano /usr/bin/nano
68 -
69 - insinto /usr/share/nano
70 - local f
71 - for f in "${FILESDIR}"/*.nanorc ; do
72 - [[ -e ${ED}/usr/share/nano/${f##*/} ]] && continue
73 - doins "${f}" || die
74 - echo "# include \"${EPREFIX}/usr/share/nano/${f##*/}\"" >> "${ED}"/etc/nanorc
75 - done
76 }
77
78 pkg_postinst() {
79
80
81
82 1.266 app-editors/nano/ChangeLog
83
84 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nano/ChangeLog?rev=1.266&view=markup
85 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nano/ChangeLog?rev=1.266&content-type=text/plain
86 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nano/ChangeLog?r1=1.265&r2=1.266
87
88 Index: ChangeLog
89 ===================================================================
90 RCS file: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v
91 retrieving revision 1.265
92 retrieving revision 1.266
93 diff -u -r1.265 -r1.266
94 --- ChangeLog 29 Aug 2011 18:08:00 -0000 1.265
95 +++ ChangeLog 1 Jan 2012 07:34:31 -0000 1.266
96 @@ -1,6 +1,10 @@
97 # ChangeLog for app-editors/nano
98 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
99 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.265 2011/08/29 18:08:00 grobian Exp $
100 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
101 +# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.266 2012/01/01 07:34:31 vapier Exp $
102 +
103 + 01 Jan 2012; Mike Frysinger <vapier@g.o> nano-2.3.1-r1.ebuild,
104 + +files/nano-2.3.1-ncurses-pkg-config.patch:
105 + Search for ncurses via pkg-config files.
106
107 *nano-2.3.1-r1 (29 Aug 2011)