Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 458192 | Differences between
and this patch

Collapse All | Expand All

(-)a/gx86/dev-vcs/subversion/subversion-1.7.7-r1.ebuild (-17 / +17 lines)
Lines 2-8 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.7.ebuild,v 1.12 2013/01/26 17:44:46 grobian Exp $
3
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.7.ebuild,v 1.12 2013/01/26 17:44:46 grobian Exp $
4
4
5
EAPI="3"
5
EAPI=5
6
SUPPORT_PYTHON_ABIS="1"
6
SUPPORT_PYTHON_ABIS="1"
7
RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
7
RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
8
WANT_AUTOMAKE="none"
8
WANT_AUTOMAKE="none"
Lines 20-26 SLOT="0" Link Here
20
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
20
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
21
IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
21
IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
22
22
23
CDEPEND=">=dev-db/sqlite-3.4
23
COMMON_DEPEND=">=dev-db/sqlite-3.4
24
	>=dev-libs/apr-1.3:1
24
	>=dev-libs/apr-1.3:1
25
	>=dev-libs/apr-util-1.3:1
25
	>=dev-libs/apr-util-1.3:1
26
	dev-libs/expat
26
	dev-libs/expat
Lines 35-47 CDEPEND=">=dev-db/sqlite-3.4 Link Here
35
	sasl? ( dev-libs/cyrus-sasl )
35
	sasl? ( dev-libs/cyrus-sasl )
36
	webdav-neon? ( >=net-libs/neon-0.28 )
36
	webdav-neon? ( >=net-libs/neon-0.28 )
37
	webdav-serf? ( >=net-libs/serf-0.3.0 )"
37
	webdav-serf? ( >=net-libs/serf-0.3.0 )"
38
RDEPEND="${CDEPEND}
38
RDEPEND="${COMMON_DEPEND}
39
	apache2? ( www-servers/apache[apache2_modules_dav] )
39
	apache2? ( www-servers/apache[apache2_modules_dav] )
40
	java? ( >=virtual/jre-1.5 )
40
	java? ( >=virtual/jre-1.5 )
41
	kde? ( kde-base/kwalletd )
41
	kde? ( kde-base/kwalletd )
42
	nls? ( virtual/libintl )
42
	nls? ( virtual/libintl )
43
	perl? ( dev-perl/URI )"
43
	perl? ( dev-perl/URI )"
44
DEPEND="${CDEPEND}
44
DEPEND="${COMMON_DEPEND}
45
	!!<sys-apps/sandbox-1.6
45
	!!<sys-apps/sandbox-1.6
46
	ctypes-python? ( dev-python/ctypesgen )
46
	ctypes-python? ( dev-python/ctypesgen )
47
	doc? ( app-doc/doxygen )
47
	doc? ( app-doc/doxygen )
Lines 110-115 src_prepare() { Link Here
110
		"${FILESDIR}"/${PN}-1.6.3-hpux-dso.patch \
110
		"${FILESDIR}"/${PN}-1.6.3-hpux-dso.patch \
111
		"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch \
111
		"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch \
112
		"${FILESDIR}"/${PN}-1.7.6-kwallet.patch
112
		"${FILESDIR}"/${PN}-1.7.6-kwallet.patch
113
	epatch_user
113
114
114
	fperms +x build/transform_libtool_scripts.sh
115
	fperms +x build/transform_libtool_scripts.sh
115
116
Lines 205-211 src_configure() { Link Here
205
}
206
}
206
207
207
src_compile() {
208
src_compile() {
208
	emake local-all || die "Building of core of Subversion failed"
209
	emake local-all
209
210
210
	if use ctypes-python; then
211
	if use ctypes-python; then
211
		python_copy_sources subversion/bindings/ctypes-python
212
		python_copy_sources subversion/bindings/ctypes-python
Lines 241-272 src_compile() { Link Here
241
	fi
242
	fi
242
243
243
	if use perl; then
244
	if use perl; then
244
		emake swig-pl || die "Building of Subversion SWIG Perl bindings failed"
245
		emake swig-pl
245
	fi
246
	fi
246
247
247
	if use ruby; then
248
	if use ruby; then
248
		emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed"
249
		emake swig-rb
249
	fi
250
	fi
250
251
251
	if use java; then
252
	if use java; then
252
		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed"
253
		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
253
	fi
254
	fi
254
255
255
	if use extras; then
256
	if use extras; then
256
		emake tools || die "Building of tools failed"
257
		emake tools
257
	fi
258
	fi
258
259
259
	if use doc; then
260
	if use doc; then
260
		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
261
		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
261
262
262
		if use java; then
263
		if use java; then
263
			emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
264
			emake doc-javahl
264
		fi
265
		fi
265
	fi
266
	fi
266
}
267
}
267
268
268
src_install() {
269
src_install() {
269
	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
270
	emake -j1 DESTDIR="${D}" local-install
270
271
271
	if use ctypes-python; then
272
	if use ctypes-python; then
272
		ctypes_python_bindings_installation() {
273
		ctypes_python_bindings_installation() {
Lines 302-318 src_install() { Link Here
302
	fi
303
	fi
303
304
304
	if use perl; then
305
	if use perl; then
305
		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
306
		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
306
		fixlocalpod
307
		fixlocalpod
307
		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
308
		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
308
	fi
309
	fi
309
310
310
	if use ruby; then
311
	if use ruby; then
311
		emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
312
		emake DESTDIR="${D}" install-swig-rb
312
	fi
313
	fi
313
314
314
	if use java; then
315
	if use java; then
315
		emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
316
		emake DESTDIR="${D}" install-javahl
316
		java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname)
317
		java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname)
317
		java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
318
		java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
318
		rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar
319
		rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar
Lines 373-379 EOF Link Here
373
	fi
374
	fi
374
375
375
	if use doc; then
376
	if use doc; then
376
		dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed"
377
		dohtml -r doc/doxygen/html/*
377
378
378
		if use java; then
379
		if use java; then
379
			java-pkg_dojavadoc doc/javadoc
380
			java-pkg_dojavadoc doc/javadoc
380
- 

Return to bug 458192