TODO: - send patches upstream and add reference to patch header - verify case $CHOST ... esac is still needed. - use "'#!/usr/bin/env sh'" for build/transform_libtool_scripts.sh
Could you have a look if subversion-1.6.17-r3 in the tree is more prefix-compatible please?
(In reply to comment #1) > Could you have a look if subversion-1.6.17-r3 in the tree is more > prefix-compatible please? Very close after a quick read. Got a few more things to work out... stand by.
Here is an inline diff, can attach/apply as you wish. % diff -u subversion-1.6.17-r4* --- subversion-1.6.17-r4.ebuild 2011-08-26 15:17:35.000000000 +0000 +++ subversion-1.6.17-r4.ebuild.1 2011-08-26 20:01:33.000000000 +0000 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r4.ebuild,v 1.4 2011/08/26 15:17:35 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r4.ebuild,v 1.3 2011/08/23 08:12:07 polynomial-c Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" @@ -17,7 +17,7 @@ LICENSE="Subversion" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~ppc-aix ~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" IUSE="apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf" CDEPEND=">=dev-db/sqlite-3.4 @@ -56,6 +56,9 @@ "${FILESDIR}/${PN}-1.6.0-disable_linking_against_unneeded_libraries.patch" "${FILESDIR}/${PN}-1.6.2-local_library_preloading.patch" "${FILESDIR}/${PN}-1.6.3-kwallet_window.patch" + "${FILESDIR}/${PN}-1.5.4-interix.patch" + "${FILESDIR}/${PN}-1.5.6-aix-dso.patch" + "${FILESDIR}/${PN}-1.6.3-hpux-dso.patch" ) want_apache @@ -121,6 +124,10 @@ sed -e "/SWIG_PY_INCLUDES=/s/\$ac_cv_python_includes/\\\\\$(PYTHON_INCLUDES)/" -i build/ac-macros/swig.m4 || die "sed failed" + # this bites us in particular on Solaris + sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \ + die "/bin/sh is not POSIX shell!" + eautoconf elibtoolize @@ -146,6 +153,21 @@ myconf+=" --disable-nls" fi + case ${CHOST} in + *-solaris*) + # -lintl isn't added for some reason (makes Neon check fail) + use nls && append-libs -lintl + ;; + *-aix*) + # avoid recording immediate path to sharedlibs into executables + append-ldflags -Wl,-bnoipath + ;; + *-interix*) + # loader crashes on the LD_PRELOADs... + myconf="${myconf} --disable-local-library-preloading" + ;; + esac + econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ $(use_with apache2 apxs "${APXS}") \ $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \ The additional patches can be found at the overlay for you to look at: http://overlays.gentoo.org/proj/alt/browser/trunk/prefix-overlay/dev-vcs/subversion/files
At your option, please apply to -r5 and keyword or create an -r6 if you wish to do any unconditional patching. The latter is the preferred option. This is reviewed and accepted, please proceed :)
+*subversion-1.6.17-r6 (31 Aug 2011) + + 31 Aug 2011; Jeremy Olexa <darkside@gentoo.org> + +files/subversion-1.5.4-interix.patch, +files/subversion-1.5.6-aix-dso.patch, + +files/subversion-1.6.3-hpux-dso.patch, +subversion-1.6.17-r6.ebuild: + Revision bump to finish Gentoo Prefix support, signed off by maintainer in + bug 329505 On a personal note: Thank you for being a pleasure to work with.
