Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/rapidsvn: metadata.xml ChangeLog rapidsvn-0.12.0.ebuild rapidsvn-0.9.8.ebuild rapidsvn-0.10.0.ebuild
Date: Tue, 31 Jan 2012 16:20:19
Message-Id: 20120131162008.D4FFE2004B@flycatcher.gentoo.org
1 jlec 12/01/31 16:20:08
2
3 Modified: metadata.xml ChangeLog rapidsvn-0.12.0.ebuild
4 Removed: rapidsvn-0.9.8.ebuild rapidsvn-0.10.0.ebuild
5 Log:
6 Added myself as maintainer, upgraded to EAPI=4 to drop built_with_use (#305365), thanks agostino for the patch #390469; dropped old
7
8 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.2 dev-vcs/rapidsvn/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/rapidsvn/metadata.xml?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/rapidsvn/metadata.xml?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/rapidsvn/metadata.xml?r1=1.1&r2=1.2
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/metadata.xml,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- metadata.xml 10 Feb 2011 21:35:45 -0000 1.1
24 +++ metadata.xml 31 Jan 2012 16:20:08 -0000 1.2
25 @@ -1,13 +1,17 @@
26 <?xml version="1.0" encoding="UTF-8"?>
27 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
28 <pkgmetadata>
29 -<herd>dev-tools</herd>
30 -<maintainer>
31 - <email>nerdboy@g.o</email>
32 - <name>Steve Arnold</name>
33 - <description>Primary Maintainer</description>
34 -</maintainer>
35 -<longdescription>
36 + <herd>dev-tools</herd>
37 + <maintainer>
38 + <email>nerdboy@g.o</email>
39 + <name>Steve Arnold</name>
40 + <description>Primary Maintainer</description>
41 + </maintainer>
42 + <maintainer>
43 + <email>jlec@g.o</email>
44 + <name>Justin Lecher</name>
45 + </maintainer>
46 + <longdescription>
47 RapidSVN is a cross-platform GUI front-end for the Subversion revision system written in C++ using the wxWidgets framework. This project also includes a Subversion client C++ API.
48 </longdescription>
49 </pkgmetadata>
50
51
52
53 1.5 dev-vcs/rapidsvn/ChangeLog
54
55 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/rapidsvn/ChangeLog?rev=1.5&view=markup
56 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/rapidsvn/ChangeLog?rev=1.5&content-type=text/plain
57 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/rapidsvn/ChangeLog?r1=1.4&r2=1.5
58
59 Index: ChangeLog
60 ===================================================================
61 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/ChangeLog,v
62 retrieving revision 1.4
63 retrieving revision 1.5
64 diff -u -r1.4 -r1.5
65 --- ChangeLog 4 Dec 2011 16:41:54 -0000 1.4
66 +++ ChangeLog 31 Jan 2012 16:20:08 -0000 1.5
67 @@ -1,6 +1,11 @@
68 # ChangeLog for dev-vcs/rapidsvn
69 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
70 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/ChangeLog,v 1.4 2011/12/04 16:41:54 hwoarang Exp $
71 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
72 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/ChangeLog,v 1.5 2012/01/31 16:20:08 jlec Exp $
73 +
74 + 31 Jan 2012; Justin Lecher <jlec@g.o> -rapidsvn-0.9.8.ebuild,
75 + -rapidsvn-0.10.0.ebuild, rapidsvn-0.12.0.ebuild, metadata.xml:
76 + Added myself as maintainer, upgraded to EAPI=4 to drop built_with_use
77 + (#305365), thanks agostino for the patch #390469; dropped old
78
79 04 Dec 2011; Markos Chandras <hwoarang@g.o> rapidsvn-0.12.0.ebuild:
80 Stable on amd64 wrt bug #377737
81
82
83
84 1.5 dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild
85
86 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild?rev=1.5&view=markup
87 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild?rev=1.5&content-type=text/plain
88 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild?r1=1.4&r2=1.5
89
90 Index: rapidsvn-0.12.0.ebuild
91 ===================================================================
92 RCS file: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild,v
93 retrieving revision 1.4
94 retrieving revision 1.5
95 diff -u -r1.4 -r1.5
96 --- rapidsvn-0.12.0.ebuild 4 Dec 2011 16:41:54 -0000 1.4
97 +++ rapidsvn-0.12.0.ebuild 31 Jan 2012 16:20:08 -0000 1.5
98 @@ -1,104 +1,86 @@
99 -# Copyright 1999-2011 Gentoo Foundation
100 +# Copyright 1999-2012 Gentoo Foundation
101 # Distributed under the terms of the GNU General Public License v2
102 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild,v 1.4 2011/12/04 16:41:54 hwoarang Exp $
103 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/rapidsvn/rapidsvn-0.12.0.ebuild,v 1.5 2012/01/31 16:20:08 jlec Exp $
104
105 -EAPI="2"
106 +EAPI=4
107
108 WANT_AUTOCONF="2.5"
109 WX_GTK_VER=2.8
110 -inherit versionator confutils libtool autotools wxwidgets flag-o-matic fdo-mime
111 +
112 +AUTOTOOLS_AUTORECONF=true
113 +
114 +inherit autotools-utils fdo-mime flag-o-matic libtool versionator wxwidgets
115
116 MY_PV=$(get_version_component_range 1-2)
117 MY_REL="1"
118
119 -DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system."
120 +DESCRIPTION="Cross-platform GUI front-end for the Subversion revision system"
121 HOMEPAGE="http://rapidsvn.tigris.org/"
122 SRC_URI="http://www.rapidsvn.org/download/release/${MY_PV}/${P}-${MY_REL}.tar.gz"
123 +
124 LICENSE="GPL-2 LGPL-2.1 FDL-1.2"
125 SLOT="0"
126 -KEYWORDS="amd64 ppc ppc64 ~sparc x86"
127 -IUSE="doc"
128 -
129 -COMMON_DEP=">=dev-vcs/subversion-1.5.0
130 - x11-libs/wxGTK:2.8[X]
131 - >=dev-libs/apr-1.2.10
132 - >=dev-libs/apr-util-1.2.10"
133 +KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
134 +IUSE="doc static-libs"
135
136 +COMMON_DEP="
137 + dev-libs/apr
138 + dev-libs/apr-util
139 + || (
140 + dev-vcs/subversion[webdav-neon]
141 + dev-vcs/subversion[webdav-serf] )
142 + x11-libs/wxGTK:2.8[X]"
143 DEPEND="${COMMON_DEP}
144 - doc? ( dev-libs/libxslt
145 + doc? (
146 + dev-libs/libxslt
147 app-text/docbook-sgml-utils
148 app-doc/doxygen
149 app-text/docbook-xsl-stylesheets )"
150 -
151 RDEPEND="${COMMON_DEP}"
152
153 -RESTRICT=""
154 -
155 S="${WORKDIR}/${P}-${MY_REL}"
156
157 -pkg_setup() {
158 - einfo "Checking for subversion compiled with WebDAV support..."
159 - confutils_require_built_with_any \
160 - dev-vcs/subversion webdav-serf webdav-neon
161 - einfo "Found WebDAV support; continuing..."
162 -
163 - # if you compiled subversion without (the) apache2 (flag) and with the
164 - # berkdb flag, you may get an error that it can't find the lib db4
165 - # Note: this should be fixed in rapidsvn 0.9.3 and later
166 -
167 - # check for the proper wxGTK support
168 - need-wxwidgets unicode
169 -}
170 +PATCHES=( "${FILESDIR}/${PN}-svncpp_link.patch" )
171 +AUTOTOOLS_IN_SOURCE_BUILD=1
172 +DOCS=( HACKING.txt TRANSLATIONS )
173
174 -src_prepare() {
175 - # Apparently we still need the --as-needed link patch...
176 - #export EPATCH_OPTS="-F3 -l"
177 - epatch "${FILESDIR}/${PN}-svncpp_link.patch"
178 - eautoreconf
179 +pkg_setup() {
180 + wxwidgets_pkg_setup
181 }
182
183 src_configure() {
184 - local myconf
185 - local apr_suffix=""
186 -
187 - if has_version ">dev-libs/apr-util-1"; then
188 - apr_suffix="-1"
189 - fi
190 + local myeconfargs=( --with-wx-config=${WX_CONFIG} )
191
192 if use doc; then
193 - myconf="--with-manpage=yes"
194 + myeconfargs+=( --with-manpage=yes )
195 else
196 - myconf="--without-xsltproc --with-manpage=no \
197 - --without-doxygen --without-dot"
198 + myeconfargs+=(
199 + --without-xsltproc
200 + --with-manpage=no
201 + --without-doxygen
202 + --without-dot )
203 fi
204
205 - myconf="${myconf} --with-wx-config=${WX_CONFIG}"
206 + append-flags $( "${EPREFIX}"/usr/bin/apr-1-config --cppflags )
207
208 - append-flags $( /usr/bin/apr${apr_suffix}-config --cppflags )
209 -
210 - econf --with-svn-lib=/usr/$(get_libdir) \
211 - --with-svn-include=/usr/include \
212 - --with-apr-config="/usr/bin/apr${apr_suffix}-config" \
213 - --with-apu-config="/usr/bin/apu${apr_suffix}-config" \
214 - ${myconf} || die "econf failed"
215 -}
216 -
217 -src_compile() {
218 - emake || die "emake failed"
219 + myeconfargs+=(
220 + --with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
221 + --with-svn-include="${EPREFIX}"/usr/include
222 + --with-apr-config="${EPREFIX}/usr/bin/apr-1-config"
223 + --with-apu-config="${EPREFIX}/usr/bin/apu-1-config"
224 + )
225 + autotools-utils_src_configure
226 }
227
228 src_install() {
229 - einstall || die "einstall failed"
230 + autotools-utils_src_install
231
232 doicon src/res/rapidsvn.ico
233 make_desktop_entry rapidsvn "RapidSVN ${PV}" \
234 - "/usr/share/pixmaps/rapidsvn.ico" \
235 + "${EPREFIX}/usr/share/pixmaps/rapidsvn.ico" \
236 "RevisionControl;Development"
237
238 - dodoc HACKING.txt TRANSLATIONS
239 -
240 if use doc ; then
241 - dodoc AUTHORS CHANGES NEWS README
242 dohtml "${S}"/doc/svncpp/html/*
243 fi
244 }