diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest index 01e57a1ba..709f4473c 100644 --- a/dev-vcs/subversion-java/Manifest +++ b/dev-vcs/subversion-java/Manifest @@ -2,11 +2,12 @@ AUX 70svn-gentoo.el 443 RMD160 300189eea80dfefa0f2a8479f67d255b39fd2adb SHA1 245 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.4.tar.bz2 5978020 RMD160 769bf868f728d606f68c9951320c2529abc3dd95 SHA1 57a3cd351c1dbedddd020e7a1952df6cd2674527 SHA256 c4c736f5d94a93b5862d1d2452353146c8aeaae33ccec67649bba91f91ad506f DIST subversion-1.7.5.tar.bz2 6002955 RMD160 e16682869311056d777016f35f63ebcff272ec9a SHA1 05c079762690d5ac1ccd2549742e7ef70fa45cf1 SHA256 cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec -EBUILD subversion-java-1.7.4.ebuild 3655 RMD160 df2f4f6a239aeeb453a2c3584116c9b66be53648 SHA1 bd3900ad9b82fe13f1e75f9ae5ff956a65a18409 SHA256 4699a2b6c073e876cc2c28de35415784ab24eaff00186dd9a243a964afe89fa7 +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 3696 RMD160 81bc2b30cc42f68bf54a359b0975468ec7fcbed5 SHA1 04fd5472464eeb82c08e8eb83486574e074d8d25 SHA256 026a76693a1929b09892ae9dcc9dc62b73e3b7668b13cf864a74664e874eccc4 MISC metadata.xml 286 RMD160 2431b313f7dbef6ca78fdd87c1b4de2077634c01 SHA1 39ab12a0f999d65946182288e157f5222598e6f1 SHA256 f67628961bf775bf88adcc6abf072eb4126a0f85e48d848054f3a7bc0ec951bb diff --git a/dev-vcs/subversion-java/files/subversion-1.7.6-revert-mod_dontdothat-move.patch b/dev-vcs/subversion-java/files/subversion-1.7.6-revert-mod_dontdothat-move.patch new file mode 100644 index 000000000..24b2834ab --- /dev/null +++ b/dev-vcs/subversion-java/files/subversion-1.7.6-revert-mod_dontdothat-move.patch @@ -0,0 +1,48 @@ +--- build-outputs.mk 2012-08-21 20:38:31.000000000 +0200 ++++ build-outputs.mk.new 2012-08-21 20:45:08.000000000 +0200 +@@ -825,7 +825,7 @@ + # Section 6: Install-Group build targets + ######################################## + +-apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la ++apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la + + bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la + +@@ -877,16 +877,17 @@ + + test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) + +-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) ++tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) + + + ######################################## + # Section 7: Install-Group install targets + ######################################## + +-install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la ++install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la + cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la + cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la ++ cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la + + install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la + $(MKDIR) $(DESTDIR)$(bdb_libdir) +@@ -1036,7 +1037,7 @@ + $(MKDIR) $(DESTDIR)$(swig_rb_libdir) + cd subversion/bindings/swig/ruby/libsvn_swig_ruby ; $(INSTALL_SWIG_RB_LIB) libsvn_swig_ruby-1.la $(DESTDIR)$(swig_rb_libdir)/libsvn_swig_ruby-1.la + +-install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la ++install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) + $(MKDIR) $(DESTDIR)$(toolsdir) + cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT) + cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT) +@@ -1046,7 +1047,6 @@ + cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT) + cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT) + cd tools/dev/svnraisetreeconflict ; $(INSTALL_TOOLS) svnraisetreeconflict$(EXEEXT) $(DESTDIR)$(toolsdir)/svnraisetreeconflict$(EXEEXT) +- cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la + + + ######################################## diff --git a/dev-vcs/subversion-java/subversion-java-1.7.4.ebuild b/dev-vcs/subversion-java/subversion-java-1.7.6.ebuild similarity index 95% rename from dev-vcs/subversion-java/subversion-java-1.7.4.ebuild rename to dev-vcs/subversion-java/subversion-java-1.7.6.ebuild index fd526a946..c1c1dfb66 100644 --- a/dev-vcs/subversion-java/subversion-java-1.7.4.ebuild +++ b/dev-vcs/subversion-java/subversion-java-1.7.6.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="http://subversion.apache.org/" SRC_URI="http://subversion.tigris.org/downloads/${MY_SVN_P}.tar.bz2" S="${WORKDIR}/${MY_SVN_P/_/-}" -LICENSE="Subversion" +LICENSE="Subversion GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" @@ -43,7 +43,8 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}"/${MY_SVN_PN}-1.5.4-interix.patch \ "${FILESDIR}"/${MY_SVN_PN}-1.5.6-aix-dso.patch \ - "${FILESDIR}"/${MY_SVN_PN}-1.6.3-hpux-dso.patch + "${FILESDIR}"/${MY_SVN_PN}-1.6.3-hpux-dso.patch \ + "${FILESDIR}"/${MY_SVN_PN}-${PV}-revert-mod_dontdothat-move.patch fperms +x build/transform_libtool_scripts.sh @@ -109,8 +110,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 7489116e4..5b99147f7 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -2,12 +2,14 @@ AUX 47_mod_dav_svn.conf 422 RMD160 658703e00882a0bce007709372cf40a407fee915 SHA1 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.4.tar.bz2 5978020 RMD160 769bf868f728d606f68c9951320c2529abc3dd95 SHA1 57a3cd351c1dbedddd020e7a1952df6cd2674527 SHA256 c4c736f5d94a93b5862d1d2452353146c8aeaae33ccec67649bba91f91ad506f DIST subversion-1.7.5.tar.bz2 6002955 RMD160 e16682869311056d777016f35f63ebcff272ec9a SHA1 05c079762690d5ac1ccd2549742e7ef70fa45cf1 SHA256 cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec -EBUILD subversion-1.7.4.ebuild 14682 RMD160 d3b3e2c4cc6280c0a551236551574b4a7adc92a9 SHA1 52a12485b7117fa216a61d10aaea3da7680955c2 SHA256 22c996b102776c491e2aac5faf5e12f4aada7b0d732266a8dde850c18b18f55f +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 diff --git a/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch b/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch new file mode 100644 index 000000000..e568b88a3 --- /dev/null +++ b/dev-vcs/subversion/files/subversion-1.7.6-kwallet.patch @@ -0,0 +1,44 @@ +--- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp 2012/03/21 18:22:15 1303489 ++++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp 2012/06/03 18:54:26 1345740 +@@ -60,6 +60,9 @@ + /* KWallet simple provider, puts passwords in KWallet */ + /*-----------------------------------------------------------------------*/ + ++static int q_argc = 1; ++static char q_argv0[] = "svn"; // Build non-const char * from string constant ++static char *q_argv[] = { q_argv0 }; + + static const char * + get_application_name(apr_hash_t *parameters, +@@ -212,12 +215,11 @@ + QCoreApplication *app; + if (! qApp) + { +- int argc = 1; +- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); ++ int argc = q_argc; ++ app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(1, +- (char *[1]) {(char *) "svn"}, ++ KCmdLineArgs::init(q_argc, q_argv, + get_application_name(parameters, pool), + "subversion", + ki18n(get_application_name(parameters, pool)), +@@ -289,12 +291,11 @@ + QCoreApplication *app; + if (! qApp) + { +- int argc = 1; +- app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"}); ++ int argc = q_argc; ++ app = new QCoreApplication(argc, q_argv); + } + +- KCmdLineArgs::init(1, +- (char *[1]) {(char *) "svn"}, ++ KCmdLineArgs::init(q_argc, q_argv, + get_application_name(parameters, pool), + "subversion", + ki18n(get_application_name(parameters, pool)), diff --git a/dev-vcs/subversion/files/subversion-1.7.6-revert-mod_dontdothat-move.patch b/dev-vcs/subversion/files/subversion-1.7.6-revert-mod_dontdothat-move.patch new file mode 100644 index 000000000..24b2834ab --- /dev/null +++ b/dev-vcs/subversion/files/subversion-1.7.6-revert-mod_dontdothat-move.patch @@ -0,0 +1,48 @@ +--- build-outputs.mk 2012-08-21 20:38:31.000000000 +0200 ++++ build-outputs.mk.new 2012-08-21 20:45:08.000000000 +0200 +@@ -825,7 +825,7 @@ + # Section 6: Install-Group build targets + ######################################## + +-apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la ++apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la + + bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la + +@@ -877,16 +877,17 @@ + + test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT) + +-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) ++tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) + + + ######################################## + # Section 7: Install-Group install targets + ######################################## + +-install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la ++install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la + cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la + cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la ++ cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la + + install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la + $(MKDIR) $(DESTDIR)$(bdb_libdir) +@@ -1036,7 +1037,7 @@ + $(MKDIR) $(DESTDIR)$(swig_rb_libdir) + cd subversion/bindings/swig/ruby/libsvn_swig_ruby ; $(INSTALL_SWIG_RB_LIB) libsvn_swig_ruby-1.la $(DESTDIR)$(swig_rb_libdir)/libsvn_swig_ruby-1.la + +-install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la ++install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT) + $(MKDIR) $(DESTDIR)$(toolsdir) + cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT) + cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT) +@@ -1046,7 +1047,6 @@ + cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT) + cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT) + cd tools/dev/svnraisetreeconflict ; $(INSTALL_TOOLS) svnraisetreeconflict$(EXEEXT) $(DESTDIR)$(toolsdir)/svnraisetreeconflict$(EXEEXT) +- cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la + + + ######################################## diff --git a/dev-vcs/subversion/subversion-1.7.4.ebuild b/dev-vcs/subversion/subversion-1.7.6.ebuild similarity index 96% rename from dev-vcs/subversion/subversion-1.7.4.ebuild rename to dev-vcs/subversion/subversion-1.7.6.ebuild index ed2559cb5..b102a0043 100644 --- a/dev-vcs/subversion/subversion-1.7.4.ebuild +++ b/dev-vcs/subversion/subversion-1.7.6.ebuild @@ -15,9 +15,9 @@ HOMEPAGE="http://subversion.apache.org/" SRC_URI="http://www.apache.org/dist/${PN}/${MY_P}.tar.bz2" S="${WORKDIR}/${MY_P}" -LICENSE="Subversion" +LICENSE="Subversion GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~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" +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" CDEPEND=">=dev-db/sqlite-3.4 @@ -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 ) @@ -44,10 +44,10 @@ DEPEND="${CDEPEND} !!