aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-05-24 17:31:55 -0700
committerGregory M. Tuner <gmt@be-evil.net>2014-05-24 17:31:55 -0700
commit6992464d0d5bb4669431e1947b2199282705b0ad (patch)
treedeaa68edd5360f7b44e2f82c7d86a09aa0bf1573 /dev-vcs
parentnet-libs/curl: sync with what I submitted in my bug report (diff)
downloadgmt-6992464d0d5bb4669431e1947b2199282705b0ad.tar.gz
gmt-6992464d0d5bb4669431e1947b2199282705b0ad.tar.bz2
gmt-6992464d0d5bb4669431e1947b2199282705b0ad.zip
dev-vcs/subversion: revbump/merge
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'dev-vcs')
-rw-r--r--dev-vcs/subversion/Manifest5
-rw-r--r--dev-vcs/subversion/files/subversion-1.8.9-po_fixes.patch22
-rw-r--r--dev-vcs/subversion/subversion-1.8.9-r1.ebuild (renamed from dev-vcs/subversion/subversion-1.8.8-r1.ebuild)3
3 files changed, 27 insertions, 3 deletions
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 9cc029d..011bec2 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -11,12 +11,13 @@ AUX subversion-1.7.6-revert-mod_dontdothat-move.patch 6001 SHA256 c01a12f8fd96c6
AUX subversion-1.8.0-hpux-dso.patch 615 SHA256 1ef3e8ae4d881ae9eec6c6e40ddff2e326357e39069c53b84e51b138f05d409a SHA512 02286f248caccc7ed2b834d8b648b9229fbbaabb69535f2d63b64f6e8711e96420f368917ada5d46f8882c085d68be5acf1ddadf6b7033c9fab70ade1348b2b1 WHIRLPOOL d9050799234d2af014d054ab4a9e13e3f6cd24981e1a4ae6f3313216cc744450e6bfe5aa0bb95ef777e7253b2c1f2609cb678a32a0d3e9ada77b20569b6f5a6c
AUX subversion-1.8.1-revert_bdb6check.patch 3160 SHA256 4b42624c83c87a19c9e1f60fb08b1875e2de696bc6b92835e1404d689d078954 SHA512 9845582e974bad914608f9fa24fe8bb980ce525e94ddac0a9238953e3902879c492aff9388f11727e400c7ccf6a1aa9f2030d58e7b268e44363b53c312a39ec3 WHIRLPOOL 168f53408a1d9ab6f60dd1b5413b2187da832bec960a52d68757edf3ffd187e44672f15b08ac26fb6f966b91ea888da7525020d6d1a6148736f15e713efd3f62
AUX subversion-1.8.5-swig-python-no-gnome-keyring.patch 39439 SHA256 0e0e8364ef4ba9835968a68329020f0ae1047c9d06c440a4bca21fa0f5effe19 SHA512 ecb8a11ae3fe8904d2381b85f841eedaf4d1f303baf079aab9a83a70c4b34212c7399f86276fb3e5b34557b2dde911f7abb246fe14cbc0a6b8c5fa15357d01a0 WHIRLPOOL e95ffc62e915814e359e9f603c8c2688395d45ef7a04aab107df46ed001c6741c0a74b8c02091af8eb84b294bd74b73f1adbb202965827d6647926e2292d3e50
+AUX subversion-1.8.9-po_fixes.patch 865 SHA256 8c11210cc649172b9a229081d7d9e169eebd1dde648774882974bcd68101565d SHA512 71922f67b8d7d8b2c1e5ccb4af240ccd748e42a8c04c7a138f7678431afb97c90517c22aa43dddee72b0025dcdb8751c90075806d5003e888bc8592475271eae WHIRLPOOL 1880d0c00c486512c6c0c81f90428d6693104388d3905290ad1498d7f11656e95bee8368b91ed53f7867dff26e585d48f619d2eaf91e4a81132caee4a6a98d1d
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
AUX svnserve.initd2 828 SHA256 8f123253c3bfb9bbe87210a9e1facc7f52df371747dbc188396740a5cf4fa713 SHA512 48729e3befc9fb9f26bbb58f3e3694cecec491df65eb7251af85bec1aa16f6d1b406f2ef072c93c9136e261d8ce64aa658bf41f812c1a555c7014521c2ff775f WHIRLPOOL bbff4d5010a0f6ceb0e9e2f76984c9935f610b18163e7e5c426059a48f84451e5cbeae86582d6dd22d9a59dc47f71b253b19cce9ed6761a29013877a32cb5d81
AUX svnserve.xinetd 332 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2 SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae WHIRLPOOL 0c5ed79630859706f18b56fbb910b4b2dc6b480cdf72a929f7d33232f23ee1eb7110b98c4a8e06cd06c620b9f4ff081bfae23edd1f6a65fade2ac5081dbf3962
-DIST subversion-1.8.8.tar.bz2 6821200 SHA256 1569931cd85ae27052895554bc14125e0795d7a17d3e4a7c2aceb7289be71db3 SHA512 9cb3fc05a432336f7df5c81864dcc0b4c4154e61207b636f2e6715e132d436962bb6def70e5b7c45bfea58ead5e328f8db3abd98176c9400c31483262e72819d WHIRLPOOL 2b2880ff00d3cb6f76ca8954a03522510ff8b32e31090b61ccb037d108b1457b5b17b9063cd817c611fe6772953b937331f1a81f9f1481a240353beb3c51ac0b
-EBUILD subversion-1.8.8-r1.ebuild 14916 SHA256 19bfafe1226176c006744b978380517e87b69bde7ea0e74648ea999dbf603679 SHA512 20751582e33aa9169468612ce88bcb62ff7f4f8780bf90ce5fac81214095ac2b06cff8019c4d08c28697562184df9b4247d839b39e1886f475074f3c173f5dba WHIRLPOOL 7025e800eefeb83c2f7431fb2101b113f74c769c9f999530d3da0562f0be7c259371da14cbad8cf6501b7f45af7477fa3a9a05b33728eb44f945bd619c5cc82e
+DIST subversion-1.8.9.tar.bz2 6828921 SHA256 45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 SHA512 61f0181605cdaf2c87f89f022073dca00f667515ac1702adec4f83af0aeb807a4eb2c65d8186414db4c5a19a3ccc01fc5fdf03c8bfb5f0fa578a45944af0becc WHIRLPOOL 1a850d7c1cc91eb9fddcd15cc9aeb744e28cbf124affc0363af3df3e69765fb97be5d0a6001bdabcead2bd4972d6444238e09a123084907ac38f535605b55fdf
+EBUILD subversion-1.8.9-r1.ebuild 14954 SHA256 8642c3d6717ee5459b0cf15543f5b92ef400829dc989552471fdbac6c699271f SHA512 a5705d9d4d890ea1f51ef048ed19ac9978b9a137fc6fd267a3a1c24d81476db4e86c8d5d6adef04806ea545ab7fb319554bb5920592fa5d00e65df3b9f1bea64 WHIRLPOOL 341d7faad70dea41cba98d9313765fe58615b1bdf7d7820f24e405b98157c077112036d19f4c380cea583867be680eeb6a64e8303c86aa1ae05f842482517312
MISC ChangeLog 95806 SHA256 6875a3ba969686ddfba8302ffe20a1ca21a041afeeb66f43653f5e70974f2604 SHA512 0aca6703a9c9302100f826eb102e056728be23760bcc269d6e2387c9aa95c2bd96eed772e939b9640b3e465c6355aba5d4681e97a51f003321d0e2022499a77f WHIRLPOOL a4bb7f6fea25f165dba15dd31290e840cee085c33484fb00a7470f1d7cb0347a42fa88a8d538027b9b80bfed343c469e2422274cf6a4298bdd0041c44c998b37
MISC metadata.xml 706 SHA256 17a4bceb3be5f371f153b3f9f7c1cd8d92e10e647eae2ac40af174f135bc7997 SHA512 b30564d6eb44e8c7cbe05dd3a1d52700e70ac5babfc6e0b0d770773322530f38a51a12927c411d42f0932fc161541c90cc97a2d7389b8e402840008229614894 WHIRLPOOL 8c197251aa3f242806b3297c6648807be96e927129230468da04ca44db34dfe25279b3ab9c55cff8b1b794e648374bbbe0eaecfab1db997b714735a4788e9a8f
diff --git a/dev-vcs/subversion/files/subversion-1.8.9-po_fixes.patch b/dev-vcs/subversion/files/subversion-1.8.9-po_fixes.patch
new file mode 100644
index 0000000..aa5a0d4
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.8.9-po_fixes.patch
@@ -0,0 +1,22 @@
+--- subversion-1.8.9/subversion/po/zh_CN.po
++++ subversion-1.8.9/subversion/po/zh_CN.po
+@@ -62,7 +62,7 @@
+ "PO-Revision-Date: 2013-07-03 16:57+0800\n"
+ "Last-Translator: Subversion Developers <dev@subversion.apache.org>\n"
+ "Language-Team: Simplified Chinese <dev@subversion.apache.org>\n"
+-"Language: \n"
++"Language: zh_CN\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+--- subversion-1.8.9/subversion/po/zh_TW.po
++++ subversion-1.8.9/subversion/po/zh_TW.po
+@@ -28,7 +28,7 @@
+ "PO-Revision-Date: 2004-09-12 22:05+0800\n"
+ "Last-Translator: Subversion Developers <dev@subversion.tigris.org>\n"
+ "Language-Team: Traditional Chinese <dev@subversion.tigris.org>\n"
+-"Language: \n"
++"Language: zh_TW\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
diff --git a/dev-vcs/subversion/subversion-1.8.8-r1.ebuild b/dev-vcs/subversion/subversion-1.8.9-r1.ebuild
index be737fd..b104b6d 100644
--- a/dev-vcs/subversion/subversion-1.8.8-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.9-r1.ebuild
@@ -116,7 +116,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \
"${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch \
"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch \
- "${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch
+ "${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch \
+ "${FILESDIR}"/${P}-po_fixes.patch
epatch_user
fperms +x build/transform_libtool_scripts.sh