Hello! This is the ebuild for the new version of subversion 0.32.1. This fixes bug 31106. And this ebuild based on subversion-0.31.0. (revision 1.4) Thank you.
Created attachment 19933 [details] subversion-0.32.1.ebuild
CHANGES: * removed ssl use flag, this flag is used by neon's configure script. * S=${WORKDIR}/${PN}-${PN} -> S="${WORKDIR}/${P}", this is equal. * removed S_DB variable, this variable is not used. * removed followings from DEPEND: sys-apps/diffutils-2.7.7 >=sys-devel/libtool-1.4.1-r1 >=sys-devel/bison-1.28-r3 ~sys-devel/m4-1.4 these do not have the necessity of writing clearly. * In the src_unpack(): * removed "cd ${WORKDIR}", initial directory of src_unpack() is ${WORKDIR}. * unpack ${PN}-${PV}.tar.gz -> unpack ${A}, this is equal. * patch -p1 -> epatch. inherit eutils. * removed "export WANT_AUTOCONF_2_5=1", this is bug of subversion 0.28.0, and this bug was solved in subversion 0.28.1. Please see CHANGES. * removed libtool from inherit, and removed elibtoolize. this is not really required. if you do not trust me, please test this ebuild on your box. * removed (cd apr; autoconf), (cd apr-util; autoconf). this is not required, subversion's configure.in is not used by apr and apr-util's configure script. * removed sed, this is already commented out. * In the src_compile(): * removed "cd ${S}", initial directory of src_compile() is ${S}. * removed ssl related steps. * moved --disable-mod-activation from econf, this is apache related option. * removed --disable-experimental-libtool option from econf. * replaced emake steps to just "emake", this works correctly. * use "&&" instead of nested if. * replaced "emake swig-py" steps to just "emake swig-py". * In the src_install(): * removed "use apache2 && mkdir -p ${D}/etc/apache2/conf". * moved "if [ -e ${D}/usr/lib/apache2 ]" block. [1] * added "rm -rf ${D}/usr/share/build", this is apr's garbage. * In the "if use python" block. * turn was replaced to install svn-config. before: use python -> use berkdb after: use berkdb -> use python * replaced "make install-swig-py" step to just "make DESTDIR=${D} install-swig-py". * replaced: dobin tools/cvs2svn/cvs2svn.py mv ${D}/usr/bin/cvs2svn.py ${D}/usr/bin/cvs2svn -> newbin tools/cvs2svn/cvs2svn.py cvs2svn * mkdir -p ${D}/usr/lib/python2.2/site-packages -> dodir /usr/lib/python2.2, this is equal. * added "rm -rf tools/cvs2svn/rcsparse/CVS" before "cp -r tools/cvs2svn/rcsparse ${D}/usr/lib/python2.2/site-packages". * replaced: mv ${D}/usr/lib/svn-python/svn ${D}/usr/lib/python2.2/site-packages mv ${D}/usr/lib/svn-python/libsvn ${D}/usr/lib/python2.2/site-packages rmdir ${D}/usr/lib/svn-python -> mv ${D}/usr/lib/svn-python ${D}/usr/lib/python2.2/site-packages * replaced: dodoc BUGS COMMITTERS COPYING HACKING INSTALL README dodoc CHANGES -> dodoc [A-Z][A-Z]* * moved "dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl". [2] * removed "cd ${S}", initial directory of src_install() is ${S}. * removed "echo "installing html book"". * replaced: dohtml -r doc/book/book/book.html doc/book/book/styles.css doc/book/book/images -> dohtml -r doc/book/book * added install tools directory steps, [2] is here. * In the "if use apache2" block. * replaced: mkdir -p ${D}/etc/apache2/conf/modules.d -> dodir /etc/apache2/conf/modules.d * [1] is here. * In the pkg_postrm(): * use emacs && elisp-site-regen -> elisp-site-regen. if someone install subversion with emacs use flag, and remove without emacs use flag, then garbage remains in site-start.el. * In the pkg_config(): * mkdir -p ${SVN_REPOS_LOC} -> mkdir -p ${SVN_REPOS_LOC}/conf. in pkg_postinst(): "To allow web access a htpasswd file needs to be created using the" "following command:" "htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME" but, ${SVN_REPOS_LOC/conf does not exist.
I'll look at your changes. However please believe me, elibtoolize is necessary to compile in all cases. If not applied initial installs will fail. I just put them back in 0.31 as I tried to remove them and it generated many bugs.
fails for me: -------------%>------------- gcc -shared swigutil_py.lo -L/var/tmp/portage/subversion-0.32.1/work/subversion-0.32.1/subversion/libsvn_subr/.libs -L/var/tmp/portage/subversion-0.32.1/image//usr/lib -L/usr/lib -lsvn_subr-1 -lsvn_delta-1 -laprutil-0 -lgdbm -ldb-4.0 -lexpat -lapr-0 -lrt -lm -lcrypt -lnsl -ldl -pthread -Wl,-soname -Wl,libsvn_swig_py-1.so.0 -o .libs/libsvn_swig_py-1.so.0.0.0 /var/tmp/portage/subversion-0.32.1/work/subversion-0.32.1/ac-helpers/install-sh -c .libs/libsvn_swig_py-1.so.0.0.0T /var/tmp/portage/subversion-0.32.1/image//usr/lib/libsvn_swig_py-1.so.0.0.0 (cd /var/tmp/portage/subversion-0.32.1/image//usr/lib && rm -f libsvn_swig_py-1.so.0 && ln -s libsvn_swig_py-1.so.0.0.0 libsvn_swig_py-1.so.0) (cd /var/tmp/portage/subversion-0.32.1/image//usr/lib && rm -f libsvn_swig_py-1.so && ln -s libsvn_swig_py-1.so.0.0.0 libsvn_swig_py-1.so) /var/tmp/portage/subversion-0.32.1/work/subversion-0.32.1/ac-helpers/install-sh -c .libs/libsvn_swig_py-1.lai /var/tmp/portage/subversion-0.32.1/image//usr/lib/libsvn_swig_py-1.la /var/tmp/portage/subversion-0.32.1/work/subversion-0.32.1/ac-helpers/install-sh -c .libs/libsvn_swig_py-1.a /var/tmp/portage/subversion-0.32.1/image//usr/lib/libsvn_swig_py-1.a ranlib /var/tmp/portage/subversion-0.32.1/image//usr/lib/libsvn_swig_py-1.a chmod 644 /var/tmp/portage/subversion-0.32.1/image//usr/lib/libsvn_swig_py-1.a libtool: install: warning: remember to run `libtool --finish /usr/lib' subversion/svnversion/svnversion . /repos/svn/trunk > /var/tmp/portage/subversion-0.32.1/image//usr/include/subversion-1/svn-revision.txt make: *** [revision-install] Error 139 !!! ERROR: dev-util/subversion-0.32.1 failed. !!! Function src_install, Line 132, Exitcode 2 !!! Installation of subversion failed -------------%>------------- versions of dependecies: swig-1.3.16 neon-0.24.4 apache-2.0.48-r1 apache was recompiled with these versions. this is similar to an earlier bug: http://bugs.gentoo.org/show_bug.cgi?id=29925 which was tracked down to a sed script error by paul
Markus, try unmerging the old version first and then only merging the new version. Further please do not put comments on bugs which are different. It makes it impossible to track bugs.
that did it :) sorry, i thought it was ebuild related and it would fit here better. next time...
