diff options
author | Thomas Sachau <tommy@gentoo.org> | 2012-08-21 20:05:14 +0000 |
---|---|---|
committer | Thomas Sachau <tommy@gentoo.org> | 2012-08-21 20:05:14 +0000 |
commit | ca02a93d8c34e9394bb9b55027940ae0260356b2 (patch) | |
tree | 09a75a87b712a56b47b18247d5e4fcf9bce2445e /dev-vcs | |
parent | fix underlinking issues wrt #432192 (diff) | |
download | historical-ca02a93d8c34e9394bb9b55027940ae0260356b2.tar.gz historical-ca02a93d8c34e9394bb9b55027940ae0260356b2.tar.bz2 historical-ca02a93d8c34e9394bb9b55027940ae0260356b2.zip |
Version bump, fixes bug 421575, add GPL-2 to the license var, fixes bug 425940, convert shebang for tools, fixes bug 415507
Package-Manager: portage-2.2.0_alpha116-r1/cvs/Linux x86_64
Diffstat (limited to 'dev-vcs')
-rw-r--r-- | dev-vcs/subversion/ChangeLog | 10 | ||||
-rw-r--r-- | dev-vcs/subversion/Manifest | 15 | ||||
-rw-r--r-- | dev-vcs/subversion/files/subversion-1.7.6-revert-mod_dontdothat-move.patch | 48 | ||||
-rw-r--r-- | dev-vcs/subversion/subversion-1.7.6.ebuild | 453 |
4 files changed, 519 insertions, 7 deletions
diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog index b2f8388a8b47..7ff70f000746 100644 --- a/dev-vcs/subversion/ChangeLog +++ b/dev-vcs/subversion/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-vcs/subversion # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.79 2012/08/20 20:31:05 tommy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.80 2012/08/21 20:05:14 tommy Exp $ + +*subversion-1.7.6 (21 Aug 2012) + + 21 Aug 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> + +subversion-1.7.6.ebuild, + +files/subversion-1.7.6-revert-mod_dontdothat-move.patch: + Version bump, fixes bug 421575, add GPL-2 to the license var, fixes bug + 425940, convert shebang for tools, fixes bug 415507 20 Aug 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> subversion-1.6.17-r7.ebuild: diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest index 3db4a71256da..4141f04a602f 100644 --- a/dev-vcs/subversion/Manifest +++ b/dev-vcs/subversion/Manifest @@ -9,6 +9,7 @@ AUX subversion-1.6.0-disable_linking_against_unneeded_libraries.patch 1769 SHA25 AUX subversion-1.6.2-local_library_preloading.patch 6412 SHA256 50b83dd31eaf5ed577b7656dcd06e314d3acd31814089f4e3eba014a1efa442d SHA512 df37e02c4c1354d854be252368f4eef4b6fcf1b28b8fc81788a41619bae77a470962950eabb7eca0e9fd7d84bfd15c319d9140acacbaf4bd7ebed41b4a5962c4 WHIRLPOOL 5d8fbfd1bbc6b642696d0cfef0bf2bfe60a874f707f7cf1dac1adee38a1a898bd2ebc66210ab6faf6b32dc8521ade79b88a592c229c19f18f06d59cbb5133d1b AUX subversion-1.6.3-hpux-dso.patch 627 SHA256 0fa69598635ea9630e95e3e8b693cd5f1b853784900e34d58ffe9e03d8c65b36 SHA512 4ca24738d527c8f845e0d255950f0121a445ec1357bea03e2c3cd0c1ca077f8aefd6769eb4dc4bc3787c593c9542f3a64ad283ae5154201a7fcf2392e7ea076b WHIRLPOOL d90944d8cb30db9e8f88606f5054cc54af0a2f496125f6462237b964b2f4faefdde94b26c9a80e9273d19fffbce71cbf89dba961300c3a764de4c21782499533 AUX subversion-1.6.3-kwallet_window.patch 10012 SHA256 5304f39189bed6f83a8342593f23819cf2e12c2288c9daba23dcd78913fd79de SHA512 e21fc601ee23ca75ebf089627e425696e39015fc9ceb55defc85d758e3a9ee191c11a7af8b78857b32c821730313b75b237b674d1eec31e51292b82f4fe10352 WHIRLPOOL 74fcd09ff7f4e6831ef1708970794f7b16e711fe0d264c4d5748afae7ed071b301ef72021076d14260d9032be873930d59ca87c0b92cbb6174d3a0cab1c071f5 +AUX subversion-1.7.6-revert-mod_dontdothat-move.patch 6001 SHA256 c01a12f8fd96c6470caabce97c7a3ef651b4fbe8dd8656bc8854fc3f65e4f7dd SHA512 927be300babe1692f4ca942e8e9fc3e4211aa3890c22adf6a70804c7293761335015da98040ed3acdee3f151b7f92a8d15014589b718711165ebf638f35b56a3 WHIRLPOOL 65d01a348c11dcfe6f23d6f0761f47ee328774b0dc954c56194fed12fe6945d4c408be55d852cba5f541aff4efc118abc07d2cfd1a45c4a6b77d7528b4da1d45 AUX subversion-fix-parallel-build-support-for-perl-bindings.patch 515 SHA256 c7a9fe0f095de7e49e219af5cabdff28751ee39aa42e712c4b8b3bc0ed64d50c SHA512 c24cf217e3d5c8e31b28c38d63e994ef131b410a7a6ab00b31772a0863f216d9d3482810928ab2cf7025baf632a415435653fd3fd2fd3780013b70a53ccf5cad WHIRLPOOL e7bb2c833d2393f82f769007d5df35e97ed8766cea5f9f5c64e41ed6369950a6aa8c73e44e9803656ec2ac21706e69cc3cf05f45a5dd1abe85fdb2cb9d0894bf AUX svnserve.confd 322 SHA256 45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97 SHA512 c84d96dad0deb40a04963654c5d0874697f2b270751b3ec41bec64847d61d9e88e336e2ee5da438a527b9d8b8b24d7ddbeacdd4bd4ce02db3629fc0972e0c289 WHIRLPOOL c91f8454f4a6d7fc9823bfbded1432993da14574693cfb4ffd6902fce136b2a14dc23616b523cf89e06493f96317ed0520a586af022d2cb1bea025ec99e53ed8 AUX svnserve.initd 818 SHA256 4f9d38d5b32d4436dcb302f7e3c7284e67d6339b25b0f057a306b978f4a06142 SHA512 aa5493c364a761bef8728187bdbf9ed89f341121be502d3dabfc377c43b973d71eba38145c7e2679a0d457000396af164e5ca8f6f7d23c8a5fb61134f55297d7 WHIRLPOOL 5b0114b76ee2d8c6e8925a6d294826b5d08afcf4c98145cceed9c59459740e40a8cac58493d5838d58004e44f32ef77dc8bdba2475fba4742e47c28b6c4ba8ca @@ -20,20 +21,22 @@ DIST subversion-1.7.1.tar.bz2 5973480 SHA256 d34bde626fac1aa553f5c9aeedf961999a7 DIST subversion-1.7.2.tar.bz2 5944987 SHA256 7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517 SHA512 87bbc21af68ec98e15142511ababc7b28e427450803c47c4a191e0f1de9f2ebf6e94e4063bf91df23ae30b6aecac28d64fa18793027f6d928e19f10ba91d2785 WHIRLPOOL 9d34f171eea8af2481bbc3516c6e0ff97238385cd86d75edb5fc8e602ddb5da3c14b45c29ac57a32ba3800a70dfc689e27c423a9d470134b02eed846ce530e6a DIST subversion-1.7.4.tar.bz2 5978020 SHA256 c4c736f5d94a93b5862d1d2452353146c8aeaae33ccec67649bba91f91ad506f SHA512 fd99a089bb2673f61686199446f6df0795b45be101a7e823ec481597ff5c17c11843c9e36deb5e178712a96291b146efaa3111eb59097146f5fae38d20de77ba WHIRLPOOL aa80f7bf327dd869dbd87dbce3a6a12fb462c687f01155c98f91058c33c2b5a74d5e0ae3a6f4c72d305a20cd2f0d0922213565be3400282e4fb1124977efcdfb DIST subversion-1.7.5.tar.bz2 6002955 SHA256 cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec SHA512 8447e0b9c4b0647480e55b0d8c09cf2940bf3d3ecda6cae28717423086a8334d36ce62ef066f8c1d918e85395287fed0a3e38d6c128a6d48559bac2cd95e85d4 WHIRLPOOL 5fba33c8a7171d2c6b0aaf1416934c598a5ee46e20b00bb4b0d832d6e08d6a0f85ade4752ece29b1fb51539317790f4f3a7bd381382ed1d0fa79179441dd4613 +DIST subversion-1.7.6.tar.bz2 6006767 SHA256 d1a4f13c5c992a1527a2aeac262c6f54e073963ce1d13abfabb2a90980fa7d05 SHA512 bced624139b3a284918edce59419a9933080ecfd861e8eaf3a7abc56c72c1e9b50d8ff3fc6185783d5b537c5be87c1e328ad42288bc063103b456c3d376c42ce WHIRLPOOL 7425ad97d27cb127a6e45845ccc419d5f9bc61101c6d675565f08af96bb8f27ea06ecd1116f214f23e8465529aa17aee53c33319b618ac12e4e912e707bce2a8 EBUILD subversion-1.6.17-r7.ebuild 16378 SHA256 be56ed7e650e8cb529f8056fa7722bdab5137a8f7f1cbef419fbcc633430ccd8 SHA512 c4edda843f685ac18b5b8dbacc9160b27f397b34ec7619a4493558945d15248c0e2a0bf04dc66855889d48f5205dfca9d0909d045f0b3b9a8c6c9c58040e6c68 WHIRLPOOL d581a5211295a13131b2a4ac5ffb2a9b0702cdf0e78d9c1d25877b6a1e588d537d4ca32dd441cba040887c74b5d0cd607b4cb5325fdfedd9b1b90ad428c34760 EBUILD subversion-1.7.0.ebuild 14792 SHA256 216c5220a885a446b1b5e31581bda6731d38537953e43fd99cfc80bd01959f8a SHA512 c14c13e9693bc30fad4227402c472a6514bd8a39773bf5f85890be7b5848012ff43ebb5dfa22a66b722b7ae35528673eadaaf7a8706198b1dadff1d24a4b6bd2 WHIRLPOOL 0c2296ab75a63ddee15c20725fed5dea7f02d43f7e3c2d2634a61fc48ffe87a9dbde6bf5a721ffb1e0f4f8671f1d6502ad96c687472ee1b452bab4b1d7e36510 EBUILD subversion-1.7.1.ebuild 14825 SHA256 e76693d51738bfca2e8a39d3b8e53a4d50115e72f55a747856a01b16681bdd66 SHA512 9887c14e80ba28ecba60092dbb3a3085e178b9c54c943b9f6fe21911a1610171585864c620e75d22111bee7a9bc52160ea925cb30e47a5abe5a9a51ef9eb68ca WHIRLPOOL 3d3654441ce3977cd971ec2da09888f90167791923d91c4170a1656953de7fa4b42f9ad5acca9c5db50f8e1799663fbaf23265211e7f887dffcac4bde8d0e5d5 EBUILD subversion-1.7.2.ebuild 14913 SHA256 8162c5df5d310a74a29429fa984272e868d0f57c7c1cf292c5801ab1d1f8003a SHA512 29fb78e37fee60fd00a09aef1e35bd60d51fd38a728598e7cc72595f1a7cb1543bb37882758ee0b427df3cc2f831358838868a03a6db4b0accc52f685183e554 WHIRLPOOL 86a6f088300fc36bd673ee309d8535a4caf0847d8660c4e67c5ff7282704425aff1cd38664f3d0e7d28e8e858dcdc3204141ea04445460c765cd9b87eaca8c94 EBUILD subversion-1.7.4.ebuild 15600 SHA256 158ec0cb4a85f7a345afe5341a7ee016c5f1205b19b9bf7ab7b869e2b826d8a0 SHA512 ec4ba26cdb29b3bc4b7aae43ee4809c78b28d83d2296cc147d4973647316efc90e26191d36d9c59d928766342dc1d823eac92ca8a2cc5c9e4da1a8d1625e1d5c WHIRLPOOL bbcdf40252573d22f6f159353adc1c6035a21174f0080f7501d051c0c2bda5de048588c7ac88e2cbec2a3f7e9e075680c69a105c957635de15a2f0d6cfa1b064 EBUILD subversion-1.7.5.ebuild 15600 SHA256 dbbe674c0ff760e2f434b7e440bf9f1f0c762fdadf0d7953415f9667f34ba03a SHA512 6188ead1aa86e7b18d4219c471da2992ef573825f93a4b5b87d66dda553a0aaf22366dc117c1c64a673501d0f3891282877e4c701d029a402b0b345f6c0d44fa WHIRLPOOL 1d6a32c92f57b1e20a8f01de78bd14416fb6ea5053d9646e856a6d5d9ba5fc0abd064cafa3d8c751498f0a0f7977665ffea65e66655e0a5bc9148658afa5e6df -MISC ChangeLog 85170 SHA256 79a3458df9e1bb0dec4a6adeff870caf1194950bc023d51ac641175dcec803e6 SHA512 9e6cb369f1e6d41e5a4e26fc8915d445e6080edc8064d4cfccd65e4d11b6badfeeaad8b4492621804125063372b60f3018c306a3861d6fe0994495e7daeec39b WHIRLPOOL ddb282cb4bcf8c3541c4016f62850a2755101a206367df04e2bf05f0aec02d30cd3799b97c8d908a74f021cb8f6eec3df2f54ed83fe81411b1d4201fb02231ab +EBUILD subversion-1.7.6.ebuild 15693 SHA256 6d63af48f47d2f5cb648378e3b02c57b377c894e3957fb883dbbb054decbbd75 SHA512 59dc59181554cce305cf371a5b8d0bd0ef749620d939937ef2d6cd037c746cf65a83b6925c3a22d228460b114f48a0c5029caad55658f0631405c6ebe9d3fd1c WHIRLPOOL c171ac333f955f3d9f254e6cf457e383fc0d579d8493935a31779f7df79b85a3c45b7b261f157d870ebf46d090dce037991f1200682e20bcfaacac1b13d83369 +MISC ChangeLog 85479 SHA256 26fd70a761a138a6675b7236bef37348c17b92b90d725a40b1420d46d9002da5 SHA512 600aa979f4be8e095a24c125f15c86dcf0f2a9581d3f6d0eec780c214b461a18e0b4c20ee013d2b2e6dbcf573e69220dae571c0d25da6a5cfd718e7b4a23d493 WHIRLPOOL d22d95da7e71647ec9292da2cc7ccd55c9a81a70801519127a46636fd3e5b53b8378661a9dbcd174ec131bb4975e065d5bc8478ec3088f088afb00d31b4dc5bd MISC metadata.xml 628 SHA256 b3715692f57550cecbca66df385d0cc48ef3d6707b4832b88add2f689c35969d SHA512 2c1f375df0efee06e088db3c7c19b96e23b615053aaaa98bc45b5d4945a39a3c21a868c80b938be88ff840824b2e8aebe9379633f106d2cfead4b3fd74cff927 WHIRLPOOL 1387297f9b5b7feb6e90cbda59b0cd61519d0395ec94fb315d2ec97adb66c37a9aa59736d968920eab7229342105846805458b8789dc84ef9ecbd40e452c02c8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iJwEAQECAAYFAlAynpQACgkQG7kqcTWJkGfCqAP+NOD/TJJq/jupbOTBfydxtQP2 -lHaisFId7H14PgVkUVAtVOGk+FQqdSvIufN6rMN5iGNGVRB5CwHcg7I5khsk2R5S -XUcQAnFf7Vup5XJ6n9HkADsSZQ9Y0Lqe+XfbSHHiF3i1RTY4hStNQ5N12wc6Z0bJ -0Ng6pJ6CCQCSLuuXjsw= -=cHmS +iJwEAQECAAYFAlAz6gYACgkQG7kqcTWJkGdaIQP/SDNZ+AQsTmHYOYapUmGPTUUO +5v0exPY7dhd+f8sgSTuNoSmVChJK51oXilge16r937x6PdZHhFAXqBJbciMH1OKc +JGt/kjU0dETZLuEmp8b3s5jvdKl4lwg+F2ccUrg160b1TXP5gfWSOeg1e4F+8/zC +QCReFaF0E5rk3M57LP8= +=i3NV -----END PGP SIGNATURE----- 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 000000000000..24b2834ab748 --- /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.6.ebuild b/dev-vcs/subversion/subversion-1.7.6.ebuild new file mode 100644 index 000000000000..1725fb645d18 --- /dev/null +++ b/dev-vcs/subversion/subversion-1.7.6.ebuild @@ -0,0 +1,453 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.6.ebuild,v 1.1 2012/08/21 20:05:14 tommy Exp $ + +EAPI="3" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*" +WANT_AUTOMAKE="none" +MY_P="${P/_/-}" + +inherit autotools bash-completion-r1 db-use depend.apache elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module python eutils + +DESCRIPTION="Advanced version control system" +HOMEPAGE="http://subversion.apache.org/" +SRC_URI="http://www.apache.org/dist/${PN}/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="Subversion GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~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" +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 + >=dev-libs/apr-1.3:1 + >=dev-libs/apr-util-1.3:1 + dev-libs/expat + sys-libs/zlib + 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: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 ) + sasl? ( dev-libs/cyrus-sasl ) + webdav-neon? ( >=net-libs/neon-0.28 ) + webdav-serf? ( >=net-libs/serf-0.3.0 )" +RDEPEND="${CDEPEND} + apache2? ( www-servers/apache[apache2_modules_dav] ) + java? ( >=virtual/jre-1.5 ) + kde? ( kde-base/kwalletd ) + nls? ( virtual/libintl ) + perl? ( dev-perl/URI )" +DEPEND="${CDEPEND} + !!<sys-apps/sandbox-1.6 + ctypes-python? ( dev-python/ctypesgen ) + doc? ( app-doc/doxygen ) + gnome-keyring? ( virtual/pkgconfig ) + java? ( >=virtual/jdk-1.5 ) + kde? ( virtual/pkgconfig ) + nls? ( sys-devel/gettext ) + webdav-neon? ( virtual/pkgconfig )" + +want_apache + +pkg_setup() { + if use berkdb; then + local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \ + | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \ + | sed 's:.*b::')" + einfo + if [[ -z "${SVN_BDB_VERSION}" ]]; then + if [[ -n "${apu_bdb_version}" ]]; then + SVN_BDB_VERSION="${apu_bdb_version}" + einfo "Matching db version to apr-util" + else + SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")" + einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB." + fi + fi + einfo "Using: Berkeley DB ${SVN_BDB_VERSION}" + einfo + + if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then + eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying" + eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}." + eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"." + eerror "Aborting to avoid possible run-time crashes." + die "Berkeley DB version mismatch" + fi + fi + + depend.apache_pkg_setup + + java-pkg-opt-2_pkg_setup + + if use ctypes-python || use python; then + python_pkg_setup + fi + + if ! use webdav-neon && ! use webdav-serf; then + ewarn "WebDAV support is disabled. You need WebDAV to" + ewarn "access repositories through the HTTP protocol." + ewarn "Consider enabling one of the following USE-flags:" + ewarn " webdav-neon webdav-serf" + echo -ne "\a" + fi + + if use debug; then + append-cppflags -DSVN_DEBUG -DAP_DEBUG + fi + + # Allow for custom repository locations. + SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}" +} + +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}"/${P}-revert-mod_dontdothat-move.patch + + fperms +x build/transform_libtool_scripts.sh + + sed -i \ + -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \ + -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac + + 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 + + sed -e "s/libsvn_swig_py-1\.la/libsvn_swig_py-\$(PYTHON_VERSION)-1.la/" -i build-outputs.mk || die "sed failed" +} + +src_configure() { + local myconf + + if use python || use perl || use ruby; then + myconf+=" --with-swig" + else + myconf+=" --without-swig" + fi + + if use java; then + myconf+=" --without-junit" + fi + + if use kde || use nls; then + myconf+=" --enable-nls" + else + myconf+=" --disable-nls" + fi + + case ${CHOST} in + *-aix*) + # avoid recording immediate path to sharedlibs into executables + append-ldflags -Wl,-bnoipath + ;; + *-interix*) + # loader crashes on the LD_PRELOADs... + myconf+=" --disable-local-library-preloading" + ;; + esac + + #workaround for bug 387057 + has_version =dev-vcs/subversion-1.6* && 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)" \ + $(use_with apache2 apxs "${APXS}") \ + $(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \ + $(use_with ctypes-python ctypesgen "${EPREFIX}/usr") \ + $(use_enable dso runtime-module-search) \ + $(use_with gnome-keyring) \ + $(use_enable java javahl) \ + $(use_with java jdk "${JAVA_HOME}") \ + $(use_with kde kwallet) \ + $(use_with sasl) \ + $(use_with webdav-neon neon) \ + $(use_with webdav-serf serf "${EPREFIX}/usr") \ + ${myconf} \ + --with-apr="${EPREFIX}/usr/bin/apr-1-config" \ + --with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \ + --disable-experimental-libtool \ + --without-jikes \ + --enable-local-library-preloading \ + --disable-mod-activation \ + --disable-neon-version-check \ + --disable-static +# --with-sqlite="${EPREFIX}/usr" +} + +src_compile() { + emake local-all || die "Building of core of Subversion failed" + + if use ctypes-python; then + python_copy_sources subversion/bindings/ctypes-python + rm -fr subversion/bindings/ctypes-python + ctypes_python_bindings_building() { + rm -f subversion/bindings/ctypes-python + ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python + emake ctypes-python + } + python_execute_function \ + --action-message 'Building of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \ + --failure-message 'Building of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \ + ctypes_python_bindings_building + fi + + if use python; then + python_copy_sources subversion/bindings/swig/python + rm -fr subversion/bindings/swig/python + swig_python_bindings_building() { + rm -f subversion/bindings/swig/python + ln -s python-${PYTHON_ABI} subversion/bindings/swig/python + emake \ + PYTHON_INCLUDES="-I${EPREFIX}$(python_get_includedir)" \ + PYTHON_VERSION="$(python_get_version)" \ + swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \ + swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \ + swig-py + } + python_execute_function \ + --action-message 'Building of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \ + --failure-message 'Building of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \ + swig_python_bindings_building + fi + + if use perl; then + emake swig-pl || die "Building of Subversion SWIG Perl bindings failed" + fi + + if use ruby; then + emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed" + fi + + if use java; then + emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed" + fi + + if use extras; then + emake tools || die "Building of tools failed" + fi + + if use doc; then + doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed" + + if use java; then + emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed" + fi + fi +} + +src_install() { + emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed" + + if use ctypes-python; then + ctypes_python_bindings_installation() { + rm -f subversion/bindings/ctypes-python + ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python + emake DESTDIR="${D}" install-ctypes-python + } + python_execute_function \ + --action-message 'Installation of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \ + --failure-message 'Installation of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \ + ctypes_python_bindings_installation + fi + + if use python; then + swig_python_bindings_installation() { + rm -f subversion/bindings/swig/python + ln -s python-${PYTHON_ABI} subversion/bindings/swig/python + emake \ + DESTDIR="${D}" \ + PYTHON_VERSION="$(python_get_version)" \ + swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \ + swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \ + install-swig-py + } + python_execute_function \ + --action-message 'Installation of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \ + --failure-message 'Installation of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \ + swig_python_bindings_installation + fi + + if use ctypes-python || use python; then + python_clean_installation_image -q + fi + + if use perl; then + emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed" + fixlocalpod + find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr + fi + + if use ruby; then + emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed" + fi + + if use java; then + emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed" + java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname) + java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar + rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar + fi + + # Install Apache module configuration. + if use apache2; then + keepdir "${APACHE_MODULES_CONFDIR}" + insinto "${APACHE_MODULES_CONFDIR}" + doins "${FILESDIR}/47_mod_dav_svn.conf" + fi + + # Install Bash Completion, bug 43179. + newbashcomp tools/client-side/bash_completion subversion + rm -f tools/client-side/bash_completion + + # Install hot backup script, bug 54304. + newbin tools/backup/hot-backup.py svn-hot-backup + rm -fr tools/backup + + # Install svnserve init-script and xinet.d snippet, bug 43245. + newinitd "${FILESDIR}"/svnserve.initd2 svnserve + newconfd "${FILESDIR}"/svnserve.confd svnserve + insinto /etc/xinetd.d + newins "${FILESDIR}"/svnserve.xinetd svnserve + + #adjust default user and group with disabled apache2 USE flag, bug 381385 + use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \ + -e "s\GROUP:-apache\GROUP:-svnusers\g" \ + -i "${ED}"etc/init.d/svnserve || die + use apache2 || sed -e "0,/apache/s//svn/" \ + -e "s:apache:svnusers:" \ + -i "${ED}"etc/xinetd.d/svnserve || die + + # Install documentation. + dodoc CHANGES COMMITTERS README + dodoc tools/xslt/svnindex.{css,xsl} + rm -fr tools/xslt + + # Install extra files. + if use extras; then + cat << EOF > 80subversion-extras +PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" +ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin" +EOF + doenvd 80subversion-extras + + emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed" + + find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr + rm -fr tools/client-side/svnmucc + rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}* + 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/* + + if use java; then + java-pkg_dojavadoc doc/javadoc + fi + fi + + find "${ED}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f + + cd "${ED}"usr/share/locale + for i in * ; do + [[ $i == *$LINGUAS* ]] || { rm -r $i || die ; } + done +} + +pkg_preinst() { + # Compare versions of Berkeley DB, bug 122877. + if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then + OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")" + if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then + CHANGED_BDB_VERSION="1" + fi + fi +} + +pkg_postinst() { + use perl && perl-module_pkg_postinst + + if use ctypes-python; then + python_mod_optimize csvn + fi + + if use python; then + python_mod_optimize libsvn svn + fi + + if [[ -n "${CHANGED_BDB_VERSION}" ]]; then + ewarn "You upgraded from an older version of Berkeley DB and may experience" + ewarn "problems with your repository. Run the following commands as root to fix it:" + ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos" + ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" + fi + + ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches." +} + +pkg_postrm() { + use perl && perl-module_pkg_postrm + + if use ctypes-python; then + python_mod_cleanup csvn + fi + + if use python; then + python_mod_cleanup libsvn svn + fi +} + +pkg_config() { + # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC} + # already has EPREFIX in it + 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. + "${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos" + + einfo "Setting repository permissions..." + SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")" + SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")" + if use apache2; then + [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache" + [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache" + else + [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn" + [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers" + fi + chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf" + chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos" + echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet." + echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\"" + echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet." + echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\"" + echo "to finish the configuration." + fi +} |