Fix the usage of /usr/bin/apr-${apr_suffix}-config --cppflags in src_compile (thanks to Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA at gmail.com> in #182168).

(Portage version: 2.1.3_rc3)

3 files changed, 387 insertions, 1 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index a18ffb471d62..60959dccedad 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.264 2007/06/15 15:54:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.265 2007/06/17 16:37:31 phreak Exp $
+
+*subversion-1.4.4-r1 (17 Jun 2007)
+
+  17 Jun 2007; Christian Heim <phreak@gentoo.org>
+  +subversion-1.4.4-r1.ebuild:
+  Fix the usage of /usr/bin/apr-${apr_suffix}-config --cppflags in src_compile
+  (thanks to Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA at gmail.com>
+  in #182168).
+
+  17 Jun 2007; Christian Heim <phreak@gentoo.org> subversion-1.4.4.ebuild:
+  Adding apr_suffix to the apr-config call in src_compile, as apr-config is in
+  fact called apr-1-config w/ apr-1.2.8.
 
   15 Jun 2007; Raúl Porcel <armin76@gentoo.org> subversion-1.3.2-r4.ebuild:
   alpha/ia64/x86 stable wrt #178264
diff --git a/dev-util/subversion/files/digest-subversion-1.4.4-r1 b/dev-util/subversion/files/digest-subversion-1.4.4-r1
new file mode 100644
index 000000000000..e3c9fe8133a5
--- /dev/null
+++ b/dev-util/subversion/files/digest-subversion-1.4.4-r1
@@ -0,0 +1,3 @@
+MD5 d4aa5aeb09acb3307841022d279ab895 subversion-1.4.4.tar.bz2 4723349
+RMD160 24ec3733d337206a3106be434c4505f5cc2e20ec subversion-1.4.4.tar.bz2 4723349
+SHA256 91769f992e142eaeb5017e9ec95be52505a056ef05f93427868a3c0c89e2e966 subversion-1.4.4.tar.bz2 4723349
diff --git a/dev-util/subversion/subversion-1.4.4-r1.ebuild b/dev-util/subversion/subversion-1.4.4-r1.ebuild
new file mode 100644
index 000000000000..03d221095dcb
--- /dev/null
+++ b/dev-util/subversion/subversion-1.4.4-r1.ebuild
@@ -0,0 +1,371 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.4-r1.ebuild,v 1.1 2007/06/17 16:37:31 phreak Exp $
+
+inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
+
+DESCRIPTION="A compelling replacement for CVS"
+HOMEPAGE="http://subversion.tigris.org/"
+SRC_URI="http://subversion.tigris.org/downloads/${P/_rc/-rc}.tar.bz2"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="apache2 berkdb python emacs perl java nls nowebdav ruby"
+RESTRICT="test"
+
+COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
+	!apache2? ( >=dev-libs/apr-util-0.9.7 )
+	python? ( >=dev-lang/python-2.0 )
+	perl? ( >=dev-lang/perl-5.8.6-r6
+		!=dev-lang/perl-5.8.7 )
+	ruby? ( >=dev-lang/ruby-1.8.2 )
+	!nowebdav? ( net-misc/neon )
+	berkdb? ( =sys-libs/db-4* )
+	java? ( >=virtual/jdk-1.4 )
+	emacs? ( virtual/emacs )"
+RDEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jre-1.4 )"
+
+DEPEND="${COMMONDEPEND}
+	java? ( >=virtual/jdk-1.4 )
+	>=sys-devel/autoconf-2.59"
+
+S=${WORKDIR}/${P/_rc/-rc}
+
+# Allow for custion repository locations.
+# This can't be in pkg_setup because the variable needs to be available to
+# pkg_config.
+: ${SVN_REPOS_LOC:=/var/svn}
+
+pkg_setup() {
+	if use berkdb && has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]]; then
+		echo
+		ewarn "Presently you have $(best_version dev-util/subversion)"
+		ewarn "Subversion has changed the repository filesystem schema from 0.34.0."
+		ewarn "So you MUST dump your repositories before upgrading."
+		ewarn
+		ewarn 'After doing so call emerge with SVN_DUMPED=1 emerge !*'
+		ewarn
+		ewarn "More details on dumping:"
+		ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
+		echo
+		die "Ensure that you dump your repository first"
+	fi
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack $A
+	cd ${S}
+
+	epatch ${FILESDIR}/subversion-1.4-db4.patch
+	epatch ${FILESDIR}/subversion-1.1.1-perl-vendor.patch
+	epatch ${FILESDIR}/subversion-hotbackup-config.patch
+	epatch ${FILESDIR}/subversion-1.3.1-neon-config.patch
+	epatch ${FILESDIR}/subversion-apr_cppflags.patch
+	epatch ${FILESDIR}/subversion-1.4.3-debug-config.patch
+	epatch ${FILESDIR}/subversion-1.4.3-neon-0.26.3.patch
+	# rapidsvn developers work with 1.3.2
+
+	export WANT_AUTOCONF=2.5
+	autoconf
+	sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
+
+	elibtoolize
+}
+
+src_compile() {
+	local myconf
+	local apr_suffix=""
+
+	if use apache2; then
+		myconf="--with-apxs=${APXS2}"
+		apache_minor="$(best_version net-www/apache | cut -d. -f2)"
+		if [ ${apache_minor} -gt 0 ]; then
+			apr_suffix="-1"
+		fi
+	else
+		if has_version ">dev-libs/apr-util-1"; then
+			apr_suffix="-1"
+		fi
+		myconf="--without-apxs"
+	fi
+
+	myconf="${myconf} $(use_enable java javahl)"
+	use java && myconf="${myconf} --without-jikes --with-jdk=${JAVA_HOME}"
+
+	if use python || use perl || use ruby; then
+		myconf="${myconf} --with-swig"
+	else
+		myconf="${myconf} --without-swig"
+	fi
+
+	if use nowebdav; then
+		myconf="${myconf} --without-neon"
+	else
+		myconf="${myconf} --with-neon=/usr"
+	fi
+
+	append-flags $( /usr/bin/apr${apr_suffix}-config --cppflags )
+
+	econf ${myconf} \
+		$(use_with berkdb berkeley-db) \
+		$(use_with python) \
+		$(use_enable nls) \
+		--with-apr="/usr/bin/apr${apr_suffix}-config" \
+		--with-apr-util="/usr/bin/apu${apr_suffix}-config" \
+		--disable-experimental-libtool \
+		--disable-mod-activation || die "econf failed"
+
+	# Respect the user LDFLAGS
+	export EXTRA_LDFLAGS="${LDFLAGS}"
+
+	# Build subversion, but do it in a way that is safe for parallel builds.
+	# Also apparently the included apr has a libtool that doesn't like -L flags.
+	# So not specifying it at all when not building apache modules and only
+	# specify it for internal parts otherwise.
+	( emake external-all && emake LT_LDFLAGS="-L${D}/usr/$(get_libdir)" local-all ) || die "make of subversion failed"
+
+	if use python; then
+		# Building fails without the apache apr-util as includes are wrong.
+		emake swig-py || die "subversion python bindings failed"
+	fi
+
+	if use perl; then
+		# Work around a buggy Makefile.PL, bug 64634
+		mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
+		make swig-pl || die "Perl library building failed"
+	fi
+
+	if use ruby; then
+		make swig-rb || die "Ruby library building failed"
+	fi
+
+	if use java; then
+		# ensure that the destination dir exists, else some compilation fails
+		mkdir -p ${S}/subversion/bindings/java/javahl/classes
+		# Compile javahl
+		make JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Compilation failed"
+	fi
+
+	if use emacs; then
+		einfo "compiling emacs support"
+		elisp-compile ${S}/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
+		elisp-compile ${S}/contrib/client-side/vc-svn.el || die "emacs modules failed"
+	fi
+}
+
+
+src_install () {
+	python_version
+	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
+
+	make DESTDIR=${D} install || die "Installation of subversion failed"
+
+#	This might not be necessary with the new install
+#	if [[ -e ${D}/usr/$(get_libdir)/apache2 ]]; then
+#		if [ "${APACHE2_MODULESDIR}" != "/usr/$(get_libdir)/apache2/modules" ]; then
+#			mkdir -p ${D}/`dirname ${APACHE2_MODULESDIR}`
+#			mv ${D}/usr/$(get_libdir)/apache2/modules ${D}/${APACHE2_MODULESDIR}
+#			rmdir ${D}/usr/$(get_libdir)/apache2 2>/dev/null
+#		fi
+#	fi
+
+
+	dobin svn-config
+	if use python; then
+		make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D}	LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" || die "Installation of subversion python bindings failed"
+
+		# move python bindings
+		mkdir -p ${D}${PYTHON_DIR}/site-packages
+		mv ${D}/usr/$(get_libdir)/svn-python/svn ${D}${PYTHON_DIR}/site-packages
+		mv ${D}/usr/$(get_libdir)/svn-python/libsvn ${D}${PYTHON_DIR}/site-packages
+		rmdir ${D}/usr/$(get_libdir)/svn-python
+	fi
+	if use perl; then
+		make DESTDIR=${D} install-swig-pl || die "Perl library building failed"
+		fixlocalpod
+	fi
+	if use ruby; then
+		make DESTDIR=${D} install-swig-rb || die "Installation of subversion ruby bindings failed"
+	fi
+	if use java; then
+		make DESTDIR="${D}" install-javahl || die "installation failed"
+		java-pkg_regso ${D}/usr/$(get_libdir)/libsvnjavahl*.so
+		java-pkg_dojar ${D}/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+		rm -r ${D}/usr/$(get_libdir)/svn-javahl/*.jar
+	fi
+
+	# Install apache module config
+	if useq apache2; then
+		MOD=`echo "${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"|sed -e "s,^//*,,"`
+		mkdir -p ${D}/${APACHE2_MODULES_CONFDIR}
+		cat <<EOF >${D}/${APACHE2_MODULES_CONFDIR}/47_mod_dav_svn.conf
+<IfDefine SVN>
+	<IfModule !mod_dav_svn.c>
+		LoadModule dav_svn_module	${MOD}/mod_dav_svn.so
+	</IfModule>
+	<Location /svn/repos>
+		DAV svn
+		SVNPath ${SVN_REPOS_LOC}/repos
+		AuthType Basic
+		AuthName "Subversion repository"
+		AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
+		Require valid-user
+	</Location>
+	<IfDefine SVN_AUTHZ>
+		<IfModule !mod_authz_svn.c>
+			LoadModule authz_svn_module	${MOD}/mod_authz_svn.so
+		</IfModule>
+	</IfDefine>
+</IfDefine>
+EOF
+	fi
+
+	# Bug 43179 - Install bash-completion if user wishes
+	dobashcompletion tools/client-side/bash_completion subversion
+
+	# Install hot backup script, bug 54304
+	newbin tools/backup/hot-backup.py svn-hot-backup
+
+	# The svn_load_dirs script is installed by Debian and looks like a good
+	# candidate for us to install as well
+	newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
+
+	# Install svnserve init-script and xinet.d snippet, bug 43245
+	newinitd ${FILESDIR}/svnserve.initd svnserve
+	insinto /etc/xinetd.d ; newins ${FILESDIR}/svnserve.xinetd svnserve
+
+	if use apache2 >/dev/null; then
+		newconfd ${FILESDIR}/svnserve.confd svnserve
+	else
+		newconfd ${FILESDIR}/svnserve.confd2 svnserve
+	fi
+
+	# Install documentation
+
+	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
+	dodoc CHANGES
+	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
+	find contrib tools -name \*.in -print0 | xargs -0 rm -f
+	mkdir -p ${D}/usr/share/doc/${PF}/
+	cp -r tools/{client-side,examples,hook-scripts} ${D}/usr/share/doc/${PF}/
+	cp -r contrib/hook-scripts ${D}/usr/share/doc/${PF}/
+
+	docinto notes
+	for f in notes/*
+	do
+		[[ -f ${f} ]] && dodoc ${f}
+	done
+
+	# Install emacs lisps
+	if use emacs; then
+		elisp-install ${PN} contrib/client-side/psvn/psvn.el*
+		elisp-install ${PN}/compat contrib/client-side/vc-svn.el*
+		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
+
+		elisp-site-file-install ${FILESDIR}/70svn-gentoo.el
+	fi
+}
+
+src_test() {
+	ewarn "Testing does not work for subversion"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use perl && perl-module_pkg_postinst
+
+	elog "Subversion Server Notes"
+	elog "-----------------------"
+	elog
+
+	elog "If you intend to run a server, a repository needs to be created using"
+	elog "svnadmin (see man svnadmin) or the following command to create it in"
+	elog "/var/svn:"
+	elog
+	elog "	  emerge --config =${CATEGORY}/${PF}"
+	elog
+	elog "If you upgraded from an older version of berkely db and experience"
+	elog "problems with your repository then run the following commands as root:"
+	elog "	  db4_recover -h ${SVN_REPOS_LOC}/repos"
+	elog "	  chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
+	elog
+	elog "Subversion has multiple server types, take your pick:"
+	elog
+	elog " - svnserve daemon: "
+	elog "	 1. edit /etc/conf.d/svnserve"
+	elog "	 2. start daemon: /etc/init.d/svnserve start"
+	elog "	 3. make persistent: rc-update add svnserve default"
+	elog
+	elog " - svnserve via xinetd:"
+	elog "	 1. edit /etc/xinetd.d/svnserve (remove disable line)"
+	elog "	 2. restart xinetd.d: /etc/init.d/xinetd restart"
+	elog
+	elog " - svn over ssh:"
+	elog "	 1. Fix the repository permissions:"
+	elog "		  groupadd svnusers"
+	elog "		  chown -R root:svnusers /var/svn/repos/"
+	elog "		  chmod -R g-w /var/svn/repos"
+	elog "		  chmod -R g+rw /var/svn/repos/db"
+	elog "		  chmod -R g+rw /var/svn/repos/locks"
+	elog "	 2. create an svnserve wrapper in /usr/local/bin to set the umask you"
+	elog "		want, for example:"
+	elog "		   #!/bin/bash"
+	elog "		   umask 002"
+	elog "		   exec /usr/bin/svnserve \"\$@\""
+	elog
+
+	if use apache2 >/dev/null; then
+		elog " - http-based server:"
+		elog "	 1. edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
+		elog "	 2. create an htpasswd file:"
+		elog "		htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
+		elog
+	fi
+
+	elog "If you intend to use svn-hot-backup, you can specify the number of"
+	elog "backups to keep per repository by specifying an environment variable."
+	elog "If you want to keep e.g. 2 backups, do the following:"
+	elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion"
+	elog "echo 'SVN_HOTBACKUP_NUM_BACKUPS=2' >> /etc/env.d/80subversion"
+	elog ""
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use perl && perl-module_pkg_postrm
+
+	if use python ; then
+		python_mod_optimize ${ROOT}usr/$(get_libdir)/python*/site-packages/svn
+		python_mod_optimize ${ROOT}usr/$(get_libdir)/python*/site-packages/libsvn
+	fi
+}
+
+pkg_config() {
+	if [[ ! -x /usr/bin/svnadmin ]]; then
+		die "You seem to only have built the subversion client"
+	fi
+
+	einfo ">>> Initializing the database in ${SVN_REPOS_LOC}..."
+	if [[ -e ${SVN_REPOS_LOC}/repos ]]; then
+		echo "A subversion repository already exists and I will not overwrite it."
+		echo "Delete ${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
+	else
+		mkdir -p ${SVN_REPOS_LOC}/conf
+		einfo ">>> Populating repository directory ..."
+		# create initial repository
+		/usr/bin/svnadmin create ${SVN_REPOS_LOC}/repos
+
+		einfo ">>> Setting repository permissions ..."
+		if use apache2 >/dev/null; then
+			chown -Rf apache:apache ${SVN_REPOS_LOC}/repos
+		else
+			enewgroup svnusers
+			enewuser svn -1 -1 /var/svn svnusers
+			chown -Rf svn:svnusers ${SVN_REPOS_LOC}/repos
+		fi
+		chmod -Rf 755 ${SVN_REPOS_LOC}/repos
+	fi
+}