diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest index 73024e32c..8369bd390 100644 --- a/dev-vcs/subversion-java/Manifest +++ b/dev-vcs/subversion-java/Manifest @@ -1,13 +1,2 @@ -AUX 70svn-gentoo.el 443 RMD160 300189eea80dfefa0f2a8479f67d255b39fd2adb SHA1 245b5ed611755276016bc76de2eabdc117e2c511 SHA256 23aa9effa5aea7ae73d14ae4df1a9269135137a5e483b4ff2a501dc130d7d1be -AUX subversion-1.5.4-interix.patch 4375 RMD160 4e10804e8a5ed2a61e66674588a6ccf0f61bba75 SHA1 fd614971d98c21dd4c9794b8f8b3d8c34d8e25d1 SHA256 1cb7dec795921a89e90f792d0176c52239aa3d87064bafbd5af9ded4df981dbe -AUX subversion-1.5.6-aix-dso.patch 787 RMD160 9c1278e65300aaa74b3c23c6ee65096a325b404a SHA1 bfbb8819b8b2ef96547f04cc153a74adadc9edb3 SHA256 2790b21e035ea77358d33c14e7e7c3c8977e1b3f5d4150768912eea719e2cf6c -AUX subversion-1.6.3-hpux-dso.patch 627 RMD160 1286a74c3f54e992be3dcaa2b72df36a3f0ce84a SHA1 fa761a80bf045a5859ef131ae044f8390ae8319a SHA256 0fa69598635ea9630e95e3e8b693cd5f1b853784900e34d58ffe9e03d8c65b36 -AUX subversion-1.7.6-revert-mod_dontdothat-move.patch 6001 RMD160 629e0791a0fe5212f1c67f9236d23fba4f344efc SHA1 30c3752cca125e7136ddbb1625b6f74aeaf653b8 SHA256 c01a12f8fd96c6470caabce97c7a3ef651b4fbe8dd8656bc8854fc3f65e4f7dd -AUX svnserve.confd 322 RMD160 e291d91f05da848a3517aa76611c1f05527c11e4 SHA1 c07020ea270b787ddf0dbb738391e20d3c8347af SHA256 45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97 -AUX svnserve.initd 818 RMD160 6a24ac0599ef46b2d1ef0ae9cde70bdc8124db68 SHA1 f3ef120b584d81124171ccaf5bafec709222d04e SHA256 4f9d38d5b32d4436dcb302f7e3c7284e67d6339b25b0f057a306b978f4a06142 -AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d478fc257a40626888f9b12ee218df55dac570 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2 -DIST subversion-1.7.5.tar.bz2 6002955 RMD160 e16682869311056d777016f35f63ebcff272ec9a SHA1 05c079762690d5ac1ccd2549742e7ef70fa45cf1 SHA256 cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec -DIST subversion-1.7.6.tar.bz2 6006767 RMD160 bbf9fb7eeb719745bbc67b9456164ab33b213088 SHA1 5b76a9f49e2c4bf064041a7d6b1bfcc3aa4ed068 SHA256 d1a4f13c5c992a1527a2aeac262c6f54e073963ce1d13abfabb2a90980fa7d05 -EBUILD subversion-java-1.7.5.ebuild 3655 RMD160 df2f4f6a239aeeb453a2c3584116c9b66be53648 SHA1 bd3900ad9b82fe13f1e75f9ae5ff956a65a18409 SHA256 4699a2b6c073e876cc2c28de35415784ab24eaff00186dd9a243a964afe89fa7 -EBUILD subversion-java-1.7.6.ebuild 3690 RMD160 8a5f7f9c1a985e0a9081ab3abfc2dcef56a5a9a2 SHA1 eb170ebcaf3a791c1e9780fedb758a8d65e0008e SHA256 beb261d18f8626a477fd35dc8c2f0fa780d41a5857faa70fc856d1f4e067ebbd -MISC metadata.xml 286 RMD160 2431b313f7dbef6ca78fdd87c1b4de2077634c01 SHA1 39ab12a0f999d65946182288e157f5222598e6f1 SHA256 f67628961bf775bf88adcc6abf072eb4126a0f85e48d848054f3a7bc0ec951bb +DIST subversion-1.7.6.tar.bz2 6006767 SHA256 d1a4f13c5c992a1527a2aeac262c6f54e073963ce1d13abfabb2a90980fa7d05 +DIST subversion-1.7.7.tar.bz2 6023686 SHA256 fc85a9341d1dc275b279e470776014b02328a028e48a7ac7868ac07d4a40a321 SHA512 0ce0a22e05c76132d9a1650cee3d7fdf6eb7606eb7197ee604e48129e6e3ba7ebc910d71c756ef2aced7100c8cd9a7d1dc3da8744315be0a8c506fdafa8ada19 WHIRLPOOL d0c82ab9abd8e95cbd5a5cf0d082a5b1eda7451bfaa5754d33a10279d94548f8c1457b3089c4bbb3347569b96be293e04371c05965ab2019aa38084831bc111d diff --git a/dev-vcs/subversion-java/subversion-java-1.7.5.ebuild b/dev-vcs/subversion-java/subversion-java-1.7.7.ebuild similarity index 89% rename from dev-vcs/subversion-java/subversion-java-1.7.5.ebuild rename to dev-vcs/subversion-java/subversion-java-1.7.7.ebuild index fd526a946..5e929df98 100644 --- a/dev-vcs/subversion-java/subversion-java-1.7.5.ebuild +++ b/dev-vcs/subversion-java/subversion-java-1.7.7.ebuild @@ -16,7 +16,7 @@ inherit autotools eutils flag-o-matic java-pkg-2 libtool multilib DESCRIPTION="Java bindings for Subversion" HOMEPAGE="http://subversion.apache.org/" -SRC_URI="http://subversion.tigris.org/downloads/${MY_SVN_P}.tar.bz2" +SRC_URI="mirror://apache/${PN}/${MY_SVN_P}.tar.bz2" S="${WORKDIR}/${MY_SVN_P/_/-}" LICENSE="Subversion" @@ -84,11 +84,20 @@ src_configure() { # loader crashes on the LD_PRELOADs... myconf+=" --disable-local-library-preloading" ;; + *-solaris*) + # need -lintl to link + use nls && append-libs intl + ;; esac #workaround for bug 387057 has_version =dev-vcs/subversion-1.6* && myconf+=" --disable-disallowing-of-undefined-references" + #version 1.7.7 again tries to link against the older installed version and fails, when trying to + #compile for x86 on amd64, so workaround this issue again + #check newer versions, if this is still/again needed + myconf+=" --disable-disallowing-of-undefined-references" + econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ --without-apxs \ --without-berkeley-db \ @@ -109,8 +118,7 @@ src_configure() { --enable-local-library-preloading \ --disable-mod-activation \ --disable-neon-version-check \ - --disable-static \ - --with-sqlite="${EPREFIX}/usr" + --disable-static } src_compile() { diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index 5b99147f7..8369bd390 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -1,15 +1,2 @@ -AUX 47_mod_dav_svn.conf 422 RMD160 658703e00882a0bce007709372cf40a407fee915 SHA1 3a1ffd40391a1cca3cb9cfb1b9d153c1a4f169a0 SHA256 bdb10203ae3154da723655b07118f630ef1e83ec38a79e31a53e436e0c071d27 -AUX subversion-1.5.4-interix.patch 4375 RMD160 4e10804e8a5ed2a61e66674588a6ccf0f61bba75 SHA1 fd614971d98c21dd4c9794b8f8b3d8c34d8e25d1 SHA256 1cb7dec795921a89e90f792d0176c52239aa3d87064bafbd5af9ded4df981dbe -AUX subversion-1.5.6-aix-dso.patch 787 RMD160 9c1278e65300aaa74b3c23c6ee65096a325b404a SHA1 bfbb8819b8b2ef96547f04cc153a74adadc9edb3 SHA256 2790b21e035ea77358d33c14e7e7c3c8977e1b3f5d4150768912eea719e2cf6c -AUX subversion-1.6.3-hpux-dso.patch 627 RMD160 1286a74c3f54e992be3dcaa2b72df36a3f0ce84a SHA1 fa761a80bf045a5859ef131ae044f8390ae8319a SHA256 0fa69598635ea9630e95e3e8b693cd5f1b853784900e34d58ffe9e03d8c65b36 -AUX subversion-1.7.6-kwallet.patch 1624 RMD160 5ee2481a61fb6d46fe4d7ecd0bd4a3a8f9922ad9 SHA1 b28f2f38b38f9155bee5f103154c4d4fbc0b9ed0 SHA256 61a1f2c9a05553ab874a07765e9680bcf7af5adc843fcfaf7f6c4c0a1e5454a7 -AUX subversion-1.7.6-revert-mod_dontdothat-move.patch 6001 RMD160 629e0791a0fe5212f1c67f9236d23fba4f344efc SHA1 30c3752cca125e7136ddbb1625b6f74aeaf653b8 SHA256 c01a12f8fd96c6470caabce97c7a3ef651b4fbe8dd8656bc8854fc3f65e4f7dd -AUX subversion-fix-parallel-build-support-for-perl-bindings.patch 515 RMD160 1f05e6910c119dca9a0f171a9d1f846b2c0d6530 SHA1 ba9c49aee40c7a7e4a799fb54a4852de51d51956 SHA256 c7a9fe0f095de7e49e219af5cabdff28751ee39aa42e712c4b8b3bc0ed64d50c -AUX svnserve.confd 322 RMD160 e291d91f05da848a3517aa76611c1f05527c11e4 SHA1 c07020ea270b787ddf0dbb738391e20d3c8347af SHA256 45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97 -AUX svnserve.initd2 828 RMD160 3b471e0adecb55f6712b7db360768f13feb6b65d SHA1 7f6f088eaf358c6dde50fe445cc2e3d344f661ae SHA256 8f123253c3bfb9bbe87210a9e1facc7f52df371747dbc188396740a5cf4fa713 -AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d478fc257a40626888f9b12ee218df55dac570 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2 -DIST subversion-1.7.5.tar.bz2 6002955 RMD160 e16682869311056d777016f35f63ebcff272ec9a SHA1 05c079762690d5ac1ccd2549742e7ef70fa45cf1 SHA256 cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec -DIST subversion-1.7.6.tar.bz2 6006767 RMD160 bbf9fb7eeb719745bbc67b9456164ab33b213088 SHA1 5b76a9f49e2c4bf064041a7d6b1bfcc3aa4ed068 SHA256 d1a4f13c5c992a1527a2aeac262c6f54e073963ce1d13abfabb2a90980fa7d05 -EBUILD subversion-1.7.5.ebuild 14432 RMD160 0aba3116f4c2b0d259bc31e40be9cf8c65b82420 SHA1 5f970a78640639708e5935df27b914a6d245e767 SHA256 8c91345fe99b3cc6fee98d840452db1883c7d85b8aa1b47e46a837d83988dd09 -EBUILD subversion-1.7.6.ebuild 14541 RMD160 af95708b68b7180f0025a8b46d09559297ad1785 SHA1 096ec7de32c97b5ba484621efdb54c1ee7cdab20 SHA256 f7b11914afd2fe2b8b5d13383059043b5bf383bd24968c771adc83fa73e63b32 -MISC metadata.xml 681 RMD160 b8bf10a068c94531f0529910fc02ea7194aa486f SHA1 ddb9a385533de0e77b605e3a556f8137014293cf SHA256 ac762b366aaea3d4cfad15a1ce05b28062260e0479ade0e6088893a986146a73 +DIST subversion-1.7.6.tar.bz2 6006767 SHA256 d1a4f13c5c992a1527a2aeac262c6f54e073963ce1d13abfabb2a90980fa7d05 +DIST subversion-1.7.7.tar.bz2 6023686 SHA256 fc85a9341d1dc275b279e470776014b02328a028e48a7ac7868ac07d4a40a321 SHA512 0ce0a22e05c76132d9a1650cee3d7fdf6eb7606eb7197ee604e48129e6e3ba7ebc910d71c756ef2aced7100c8cd9a7d1dc3da8744315be0a8c506fdafa8ada19 WHIRLPOOL d0c82ab9abd8e95cbd5a5cf0d082a5b1eda7451bfaa5754d33a10279d94548f8c1457b3089c4bbb3347569b96be293e04371c05965ab2019aa38084831bc111d diff --git a/dev-vcs/subversion/subversion-1.7.5.ebuild b/dev-vcs/subversion/subversion-1.7.7.ebuild similarity index 95% rename from dev-vcs/subversion/subversion-1.7.5.ebuild rename to dev-vcs/subversion/subversion-1.7.7.ebuild index 29adeff54..b35adee1b 100644 --- a/dev-vcs/subversion/subversion-1.7.5.ebuild +++ b/dev-vcs/subversion/subversion-1.7.7.ebuild @@ -12,10 +12,10 @@ inherit autotools bash-completion-r1 db-use depend.apache elisp-common eutils fl DESCRIPTION="Advanced version control system" HOMEPAGE="http://subversion.apache.org/" -SRC_URI="http://www.apache.org/dist/${PN}/${MY_P}.tar.bz2" +SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" -LICENSE="Subversion" +LICENSE="Subversion GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf" @@ -28,7 +28,7 @@ CDEPEND=">=dev-db/sqlite-3.4 berkdb? ( >=sys-libs/db-4.0.14 ) ctypes-python? ( =dev-lang/python-2* ) gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring ) - kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 ) + kde? ( sys-apps/dbus x11-libs/qt-core:4 x11-libs/qt-dbus:4 x11-libs/qt-gui:4 >=kde-base/kdelibs-4:4 ) perl? ( dev-lang/perl ) python? ( =dev-lang/python-2* ) ruby? ( >=dev-lang/ruby-1.8.2:1.8 ) @@ -105,7 +105,8 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-1.5.4-interix.patch \ "${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \ "${FILESDIR}"/${PN}-1.6.3-hpux-dso.patch \ - "${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch + "${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch \ + "${FILESDIR}"/${PN}-1.7.6-kwallet.patch fperms +x build/transform_libtool_scripts.sh @@ -149,11 +150,20 @@ src_configure() { # loader crashes on the LD_PRELOADs... myconf+=" --disable-local-library-preloading" ;; + *-solaris*) + # need -lintl to link + use nls && append-libs intl + ;; esac #workaround for bug 387057 has_version =dev-vcs/subversion-1.6* && myconf+=" --disable-disallowing-of-undefined-references" + #version 1.7.7 again tries to link against the older installed version and fails, when trying to + #compile for x86 on amd64, so workaround this issue again + #check newer versions, if this is still/again needed + myconf+=" --disable-disallowing-of-undefined-references" + #force ruby-1.8 for bug 399105 ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby18 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc18 \ econf --libdir="${EPREFIX}/usr/$(get_libdir)" \ @@ -175,8 +185,7 @@ src_configure() { --enable-local-library-preloading \ --disable-mod-activation \ --disable-neon-version-check \ - --disable-static \ - --with-sqlite="${EPREFIX}/usr" + --disable-static } src_compile() { @@ -328,13 +337,12 @@ EOF rm -fr tools/{buildbot,dev,diff,po} insinto /usr/share/${PN} + python_convert_shebangs -r 2 tools doins -r tools fi if use doc; then dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed" - - dodoc notes/* fi find "${ED}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f