Attachment #365128 for bug #474848




LICENSE="Subversion GPL-2"
SLOT="0"
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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-serf"

COMMON_DEPEND=">=dev-db/sqlite-3.7.12
	>=dev-libs/apr-1.3:1
	>=dev-libs/apr-util-1.3:1
	dev-libs/expat
	sys-libs/zlib
	app-arch/bzip2
	berkdb? ( >=sys-libs/db-4.0.14 )
	ctypes-python? ( ${PYTHON_DEPS} )
	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )
	perl? ( dev-lang/perl )
	python? ( ${PYTHON_DEPS} )
	ruby? ( >=dev-lang/ruby-1.9.3:1.9
		dev-ruby/rubygems[ruby_targets_ruby19] )
	sasl? ( dev-libs/cyrus-sasl )
	webdav-serf? ( >=net-libs/serf-1.2.1 )"
	webdav-serf? ( >=net-libs/serf-0.3.0 )"
RDEPEND="${COMMON_DEPEND}
	apache2? ( www-servers/apache[apache2_modules_dav] )
	java? ( >=virtual/jre-1.5 )

	java? ( >=virtual/jdk-1.5 )
	kde? ( virtual/pkgconfig )
	nls? ( sys-devel/gettext )
	webdav-serf? ( virtual/pkgconfig )"

REQUIRED_USE="
	ctypes-python? ( ${PYTHON_REQUIRED_USE} )


	java-pkg-opt-2_pkg_setup

	if ! use webdav-serf; then
		ewarn "WebDAV support is disabled. You need WebDAV to"
		ewarn "access repositories through the HTTP protocol."
		ewarn "Consider enabling one of the following USE-flags:"
		ewarn "  webdav-serf"
		echo -ne "\a"
	fi


src_prepare() {
	epatch "${FILESDIR}"/${PN}-1.5.4-interix.patch \
		"${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \
		"${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch \
		"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch
	epatch_user


		myconf+=" --without-junit"
	fi

	if use kde || use nls; then
		myconf+=" --enable-nls"
	else
		myconf+=" --disable-nls"
	fi

	case ${CHOST} in
		*-aix*)
			# avoid recording immediate path to sharedlibs into executables


	#force ruby-1.8 for bug 399105
	#allow overriding Python include directory
	ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby19 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc19 \
	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
		$(use_with apache2 apache-libexecdir) \
		$(use_with apache2 apxs "${APXS}") \
		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \
		--disable-bdb6 \
		$(use_with ctypes-python ctypesgen "${EPREFIX}/usr") \
		$(use_enable dso runtime-module-search) \
		$(use_with gnome-keyring) \
		$(use_enable java javahl) \
		$(use_with java jdk "${JAVA_HOME}") \
		$(use_with kde kwallet) \
		$(use_enable nls)
		$(use_with sasl) \
		$(use_with webdav-neon neon) \
		$(use_with webdav-serf serf "${EPREFIX}/usr") \
		${myconf} \
		--with-apr="${EPREFIX}/usr/bin/apr-1-config" \

		--disable-experimental-libtool \
		--without-jikes \
		--disable-mod-activation \
		--disable-neon-version-check \
		--disable-static
}


Return to bug 474848

Lines 18-41 Link Here

(-)subversion-1.7.13.ebuild (-19 / +14 lines)
18	LICENSE="Subversion GPL-2"	18	LICENSE="Subversion GPL-2"
19	SLOT="0"	19	SLOT="0"
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 ~arm-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 ~arm-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 test 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 test vim-syntax +webdav-serf"
22		22
23	COMMON_DEPEND=">=dev-db/sqlite-3.6.18[threadsafe(+)]	23	COMMON_DEPEND=">=dev-db/sqlite-3.7.12
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
27	sys-libs/zlib	27	sys-libs/zlib
		28	app-arch/bzip2
28	berkdb? ( >=sys-libs/db-4.0.14 )	29	berkdb? ( >=sys-libs/db-4.0.14 )
29	ctypes-python? ( ${PYTHON_DEPS} )	30	ctypes-python? ( ${PYTHON_DEPS} )
30	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )	31	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
31	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )	32	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )
32	perl? ( dev-lang/perl )	33	perl? ( dev-lang/perl )
33	python? ( ${PYTHON_DEPS} )	34	python? ( ${PYTHON_DEPS} )
34	ruby? ( >=dev-lang/ruby-1.8.2:1.8	35	ruby? ( >=dev-lang/ruby-1.9.3:1.9
35	dev-ruby/rubygems[ruby_targets_ruby18] )	36	dev-ruby/rubygems[ruby_targets_ruby19] )
36	sasl? ( dev-libs/cyrus-sasl )	37	sasl? ( dev-libs/cyrus-sasl )
37	webdav-neon? ( >=net-libs/neon-0.28 )	38	webdav-serf? ( >=net-libs/serf-1.2.1 )"
38	webdav-serf? ( >=net-libs/serf-0.3.0 )"
39	RDEPEND="${COMMON_DEPEND}	39	RDEPEND="${COMMON_DEPEND}
40	apache2? ( www-servers/apache[apache2_modules_dav] )	40	apache2? ( www-servers/apache[apache2_modules_dav] )
41	java? ( >=virtual/jre-1.5 )	41	java? ( >=virtual/jre-1.5 )
Lines 52-58 Link Here
52	java? ( >=virtual/jdk-1.5 )	52	java? ( >=virtual/jdk-1.5 )
53	kde? ( virtual/pkgconfig )	53	kde? ( virtual/pkgconfig )
54	nls? ( sys-devel/gettext )	54	nls? ( sys-devel/gettext )
55	webdav-neon? ( virtual/pkgconfig )"	55	webdav-serf? ( virtual/pkgconfig )"
56		56
57	REQUIRED_USE="	57	REQUIRED_USE="
58	ctypes-python? ( ${PYTHON_REQUIRED_USE} )	58	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
Lines 92-102 Link Here
92		92
93	java-pkg-opt-2_pkg_setup	93	java-pkg-opt-2_pkg_setup
94		94
95	if ! use webdav-neon && ! use webdav-serf; then	95	if ! use webdav-serf; then
96	ewarn "WebDAV support is disabled. You need WebDAV to"	96	ewarn "WebDAV support is disabled. You need WebDAV to"
97	ewarn "access repositories through the HTTP protocol."	97	ewarn "access repositories through the HTTP protocol."
98	ewarn "Consider enabling one of the following USE-flags:"	98	ewarn "Consider enabling one of the following USE-flags:"
99	ewarn " webdav-neon webdav-serf"	99	ewarn " webdav-serf"
100	echo -ne "\a"	100	echo -ne "\a"
101	fi	101	fi
102		102
Lines 111-117 Link Here
111	src_prepare() {	111	src_prepare() {
112	epatch "${FILESDIR}"/${PN}-1.5.4-interix.patch \	112	epatch "${FILESDIR}"/${PN}-1.5.4-interix.patch \
113	"${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \	113	"${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \
114	"${FILESDIR}"/${PN}-1.6.3-hpux-dso.patch \	114	"${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch \
115	"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch	115	"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch
116	epatch_user	116	epatch_user
117		117
Lines 151-162 Link Here
151	myconf+=" --without-junit"	151	myconf+=" --without-junit"
152	fi	152	fi
153		153
154	if use kde \|\| use nls; then
155	myconf+=" --enable-nls"
156	else
157	myconf+=" --disable-nls"
158	fi
159
160	case ${CHOST} in	154	case ${CHOST} in
161	-aix)	155	-aix)
162	# avoid recording immediate path to sharedlibs into executables	156	# avoid recording immediate path to sharedlibs into executables
Lines 196-214 Link Here
196		190
197	#force ruby-1.8 for bug 399105	191	#force ruby-1.8 for bug 399105
198	#allow overriding Python include directory	192	#allow overriding Python include directory
199	ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby18 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc18 \	193	ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby19 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc19 \
200	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \	194	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
201	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \	195	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
		196	$(use_with apache2 apache-libexecdir) \
202	$(use_with apache2 apxs "${APXS}") \	197	$(use_with apache2 apxs "${APXS}") \
203	$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \	198	$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \
		199	--disable-bdb6 \
204	$(use_with ctypes-python ctypesgen "${EPREFIX}/usr") \	200	$(use_with ctypes-python ctypesgen "${EPREFIX}/usr") \
205	$(use_enable dso runtime-module-search) \	201	$(use_enable dso runtime-module-search) \
206	$(use_with gnome-keyring) \	202	$(use_with gnome-keyring) \
207	$(use_enable java javahl) \	203	$(use_enable java javahl) \
208	$(use_with java jdk "${JAVA_HOME}") \	204	$(use_with java jdk "${JAVA_HOME}") \
209	$(use_with kde kwallet) \	205	$(use_with kde kwallet) \
		206	$(use_enable nls)
210	$(use_with sasl) \	207	$(use_with sasl) \
211	$(use_with webdav-neon neon) \
212	$(use_with webdav-serf serf "${EPREFIX}/usr") \	208	$(use_with webdav-serf serf "${EPREFIX}/usr") \
213	${myconf} \	209	${myconf} \
214	--with-apr="${EPREFIX}/usr/bin/apr-1-config" \	210	--with-apr="${EPREFIX}/usr/bin/apr-1-config" \
Lines 216-222 Link Here
216	--disable-experimental-libtool \	212	--disable-experimental-libtool \
217	--without-jikes \	213	--without-jikes \
218	--disable-mod-activation \	214	--disable-mod-activation \
219	--disable-neon-version-check \
220	--disable-static	215	--disable-static
221	}	216	}
222		217