Sync with portage [Wed Aug 22 10:29:12 MSK 2012].

2012-08-22 10:29:12 +04:00 · 2012-08-22 10:29:12 +04:00 · b3c60bcfdc
commit b3c60bcfdc
parent 4d31e03163
485 changed files with 6876 additions and 1781 deletions
--- a/app-editors/dhex/ChangeLog
+++ b/app-editors/dhex/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-editors/dhex
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/dhex/ChangeLog,v 1.9 2012/08/10 13:06:12 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/dhex/ChangeLog,v 1.10 2012/08/22 00:20:32 blueness Exp $
+
+  22 Aug 2012; Anthony G. Basile <blueness@gentoo.org> dhex-0.67.ebuild:
+  Keyword ~arm, bug #431922

  10 Aug 2012; Johannes Huber <johu@gentoo.org> dhex-0.67.ebuild:
  Stable for x86, wrt bug #428852
--- a/app-editors/dhex/Manifest
+++ b/app-editors/dhex/Manifest
@ -7,17 +7,13 @@ DIST dhex_0.66.tar.gz 56060 SHA256 bf0e44743b4cfb44861859b486edbf6f35430178730af
 DIST dhex_0.67.tar.gz 56687 SHA256 89f9c7e039ac7199cea1bdeffca200b40bba454817dc9a2fc8ccb2f21a910e71 SHA512 cc5013edcdabf6febcb8c7e79339da2b2ad3ae2783d023754d6cc1f9fa3ef3c37807f21b6182ec5db7e9280f934f29ef84b1526d440a1ca2eb2b6c951e0eb14b WHIRLPOOL 5b7bfa136ba0ea767bcfe379e64e7f1692ed64f17cf9f3a1276e1d40623a8d406dff1016a234c2cf54e8ec917b2d3ec1cdceb6336678b6f94db5b27a22d321df
 EBUILD dhex-0.65.ebuild 786 SHA256 b85c8e85acf339e61e8bd3130dea5c0b558ce9a37b9c66b3837c263dbc73e578 SHA512 8bfcd69bf069f0ef247e81d1a4fb11ec774597ee4dac03c52df0fa46b4fde9a9f4d58aaf57f1ce7458ed57ee70eb07edee0004ef377ea2858f2e8c6584a3e302 WHIRLPOOL e6147a34a11d55cf15f8607ee0b1df2df46fac5a24d520b79011578b67770e0775279c423813055036dd34ccf6bf24d4cf26753a5b069b6dc75edc63c84c457e
 EBUILD dhex-0.66.ebuild 761 SHA256 78e3dc185c6452c0d728193bc4c61311c9be0337ff290dc4b8920f7abb9da8e6 SHA512 f2296e2839c9541368b8e33d4f939b6bc6da3f45469a314fbbd560b0a618ec2709c14d0bdf84d908cb8fb285e8cb84b830d3061e0cbb7e2bbda0bc1582498a79 WHIRLPOOL 348144812cc2e6c6ec5deeda7bcdb703dd0bd0d17ec3d608b2774d1fcd8341bbb3c553e9680a7d9c1c44f0b3c1d859eb923db18313a088f2788d6c0c40462e2d
-EBUILD dhex-0.67.ebuild 754 SHA256 5175112b261c9ca014ed9e502c10c00a99b700fde481c0e75cfa08977c465b3a SHA512 3d4a37b47cff361be62d1d5c5cd7f48a65a0167f4ff1ebc3d5dd1b6efbdcf167d5de261fd2e4f1235418f7c9d45f77a86c19c8ab784b709df22c65c95b125531 WHIRLPOOL 49a393ac111b93b85d28072a1422b863393121c1373f0d038123f87f3b6b37051588d34c6aaee6792452b5a9f54d4b1c3492e557df8824e4ddba6f6ae694a949
-MISC ChangeLog 1296 SHA256 d785b928942d7f86ee8452a3b8b1db975d63131d723dda2588eb0e81ea5ab81a SHA512 bf3d565d44add42099a390d5b1931bde58c40057a6e4613f22be84bc7bf6bc15ffb49af49546439cfa468ec934abeaf522d9da60277a8d9797a3c2f075124479 WHIRLPOOL 3d270a41d147d857244fc007aec659d6ac73375fe8fda3db6be1e051306f844182129b9d0e789085cea2629ea7631382e30e01c09519ba4a22eabda12841f899
+EBUILD dhex-0.67.ebuild 763 SHA256 ad288aab786afde12fc98d2be30137d438c0427806c4e56cd6468ba1a9e9b76e SHA512 b66747afcfcc731a7144ac045849805023ceb05626541fa3154248785a3ab0f2559f1b8a5b42c84acdcb4c9db0afbcf5514fe1891a840dbae52f8b3193e5c916 WHIRLPOOL cd66ef75ed2381dae2a552193a0cb8b4c8568fb751f1dc844518b517adeb3934c72cd8ee753c5fd0262a18669ddd225e2c8996e1e2b91340de6646ef1496f9af
+MISC ChangeLog 1403 SHA256 d8b103355a6e46911772920691bb1e69413a88e3ca0ded01d507f4935a94b020 SHA512 09a96832d1adc64c575fe8cea79d40cece079d3e90fcd308cde3301d4f573c0bb891626fe486a471263b1beff4776046c21598f572b8c855cc7a8ab455ca8962 WHIRLPOOL 967c2452857fe0dd4e6fa0824a76da0f6f1c0fc9d57f82b848d1f4001ec6693d77e031a6fc4b5505a7570f635f0512848e02a65ace75a3aabb50d8bf03ff83c5
 MISC metadata.xml 206 SHA256 65af0b215aead23b8b8599a0198e437c27ff219780e2629f3e825fe51941507b SHA512 87d849284fb952234bcd11db43c26c6951fd546f83242f90ed362bd3f6723668b1229d9e563254fb323319cd9716dc9676adfdc72d91ea726f01ebf6f50346fd WHIRLPOOL b4dbf6cdf87f0fd23f7afd2a5af669192dc6aacd68d7c7901662495c78b601092e326d3c51d7c5b70dfb30f883047f8f36be18aba06676c0eecfa564fdfaf016
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQEcBAEBCAAGBQJQJQdHAAoJEO+t9ga+3I3aEWwIAJxjhRfvgw2FtqApnLap4gGs
-QGS/2TH5A54YuMAU4zqeKsxrMeq+txq/r2RY/yewGlLv1FwpN2p/AEQaz5rbijfC
-JayEDUWhxDqyTUNm1WJLV5HLd64s4f388944x0NYP4fVwh8sxoOi9bTa32nbj7Ho
-I7i9i/Jm2K1ipku6q9awBSTHo9PRutNgSkVr7AP4R2a2OCUnOFrtUxBf3hD49M+A
-7KPMN1Q1teSiLNF1nlcZ8ZETR9bI1SScBFd2Xs7tvb/apKk7gy81IIDJrbXcy3ry
-zDBPQOHp2tVEcec8Jw4Ffg8AkJngbsIo2umUykYst9sKMRL1HQ7EdVa7en9rxnE=
-=g4T6
+iEYEAREIAAYFAlA0JcgACgkQl5yvQNBFVTUk3ACfZ6QogPak56j943VdXQIMspkc
+9xQAn2Mzgnoyk4OLWC4i6C9RhXvZcVnS
+=Tdcf
 -----END PGP SIGNATURE-----
--- a/app-editors/dhex/dhex-0.67.ebuild
+++ b/app-editors/dhex/dhex-0.67.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/dhex/dhex-0.67.ebuild,v 1.3 2012/08/10 13:06:12 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/dhex/dhex-0.67.ebuild,v 1.4 2012/08/22 00:20:32 blueness Exp $

 EAPI=4

@ -14,7 +14,7 @@ SRC_URI="http://www.dettus.net/${PN}/${MY_P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""

 DEPEND="sys-libs/ncurses"
--- a/app-editors/emacs-vcs/ChangeLog
+++ b/app-editors/emacs-vcs/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs-vcs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.109 2012/08/15 18:55:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.110 2012/08/21 19:20:42 ulm Exp $
+
+  21 Aug 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.2.9999.ebuild:
+  Upstream changed hard link for emacs binary to symbolic link. Remove the
+  symlink and rename the binary. Bug 432194.

 *emacs-vcs-24.2.9999 (15 Aug 2012)

--- a/app-editors/emacs-vcs/Manifest
+++ b/app-editors/emacs-vcs/Manifest
@ -2,23 +2,23 @@
 Hash: SHA256

 AUX emacs-24.0.92-ns-appdirs.patch 1538 SHA256 588b276284c7a56494fdba935a975c66edb668e5431bf25f1396696950c8f804 SHA512 141d6f2a0df176eafd476b1b064586ac1d32d2b920fd3e65a7bdd9ad6335d3c148761238da07329795477c7aebab2db3b685c3466ddbe6c0d297654949bb8364 WHIRLPOOL daf3baf1d88c2399435b340c178888a126ae4ed1e9ffa87575b14977f215f3cb07b109e0c1fe13ccdd5cf9b1d63b7ebd1237586fef7393c0bc279cf9a6196459
-EBUILD emacs-vcs-24.2.9999.ebuild 11212 SHA256 38a3687e82c14155c94e3e739316a849281e02b153f66248d1dd3b0eaba7d246 SHA512 77637b5d6af0c91610f3783e3f792d9b486f45eafefbb242e084d8729d5794d828b1cbb97e996c801cf225b3d8e161c73112c26a58c6c9fc2af92b9abb10f06d WHIRLPOOL 5da90b6ad8bbbbcf18d13de47675f7c511873c9adcb9d321018736849decf3d14de2847a44db0330a685d9159a7410aa224a4e7ee7f141f8a08e6155211aad8b
-MISC ChangeLog 68510 SHA256 a7312fc1295d7f15b189721ccb6ff6fb2757060476aeb2d4e45d7ff584b64cc6 SHA512 58fe87b654459d83f0cc1c7395b7ac09e9733b1efae9993960fea651ec9e437791531835a65c194e0c65d7ca7a120c490465cc55e0bbc76db3f006191fa59458 WHIRLPOOL ea458a2271b717a3a2ff508dc06cb373af77a18cbe9b98a355e25a691a9e8a31cc6b31180af505a6594d0ca4e9375d6ebb48f2cdcbe643e4e0bab12b07f64ecd
+EBUILD emacs-vcs-24.2.9999.ebuild 11181 SHA256 3b9a61b78b2057640ae271757915cfe021e103dae6a0219839d54f50b07e17e4 SHA512 d1f44de533c637cd1404135436ad0d3b7c71c0b0f45f8c88502e0a6db5cd18939e630e774ee25ab75bd7a8e300a20d610ba2828d8d6e7654450f0075dd8ad8c6 WHIRLPOOL 3333918b6c48dc429b3ac81672fc67d210f8d09d14201bd5d5f5684b06ad4f66a6371c197140ffe73080b4c7a7107c3fcbb47b3dc9b508dfc759cd472c1bd016
+MISC ChangeLog 68706 SHA256 9b4f874d353cb8c6cb2eb1e218dec0a4bf98e9dff03ae2f3259ff2bd788d5d9a SHA512 4745ba990f85b90a41ff4ee49c7399d3367f034b80f2eb9d237fc07945d2ed5dd371feee71510e12ec33a25a4042f0a716df622dd751909f60f0b99ab16f4f2a WHIRLPOOL 7d3cee2d91319e2858d22ac750243dc52cfe213c4fc3abdcafc2ef7e4e62a18c583029d93709c3d78481bf054de6bce9121066b23ca73fba976188c414cd32a4
 MISC metadata.xml 2333 SHA256 6a4ab4b0709e8f61773994140d420a9c75b6c8a3eef7b02727bf4c18d91abe74 SHA512 2ea80909c30fe404ae0ca7059ae444fa9b4bdb168d6c7b2a08d566980e4374d95f21d56d2fba40ac5182705fbbd650362194aa091b3c9fadeebaf82fe92fdfd6 WHIRLPOOL 8987cb0f15d50817f0ab89bc82e1c85e1225797bfe77b13db3a917f2875be9d314054520b6d78b1552bcd1afe7f4446423eafdece71bb638dc26cb9fc41011f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBCAAGBQJQK/JVAAoJEDxpGckxwJCBiwYP/2/HBIVnq8mrd6wZjKy5qtYI
-LE+eyF2sHb3vEzuk7U03X/zRcGXD7J64PP8XucQ47JcEjnFQNcWxGRfQFiOPlzlC
-R0SNxv3wGRMrB6p721fkIqR4U9ca+NiVgQ4tK7fVNrup+Qb4xQxW69yL0fV5YCBf
-PgJod5s9tZ5SFsbUeVwo5jzHFxrFtYu52PqTD27aKcV1TKJSh4pKvxh7+ZWWJTAz
-G+RDu/GJoGyTp/y86bt1/C2B1s9ayWxmsWGS25AAVHgMTzPm04RwY1NzZsyw8ubF
-52Y6HTrTIDMYe9HZuBhKMS9hII7+9Flr2Kg0VssXY9/TztXiBOQfWXRmu3nCDcBG
-6cym/OY5OfpEaGW1q/NAi8jYi0d4i6IjhzBIp96t3+twlotUqjQz+oJ9nyBrbtwm
-Q1yWc35tX7NMvaySbXX4p+TSLX2e21KorJstj+KOFpEN4hpgTMHyMbwfc2LpZT1d
-mEVoPsnHz0FAb3s3JOuJkwFw6WynZjm3nC6IUJNhbXFW4YxDYZqKTLDWi8yJ4fDx
-D3DrtsVbXGMMBe4MmpMKVXTisIBs7q0rwTLO/r7y26Fwvc8fXZRpwIgcZqQr4fWX
-YA7cy4iTtiMiEzuEGi8IyPAfx34PWV0A+ZhYMl2q0HBPOzID/lQ6no9IMWFNDXA6
-bIiRAw+swls56y/TgfGt
-=2+Nq
+iQIcBAEBCAAGBQJQM+FQAAoJEDxpGckxwJCBf9oP/2pWyF3uZRYkBT+56ZciKiB8
+u+Pyt4l830i3Kr8gKeHlQeOKhQuJpKS9KnW5e7TI67dLGP3IyNQ5VmjZKX7W9pAw
+CWIQ1yMWsqH9mYa1SxekB+1t8Ndp2wP9l2cd5doDkjBUBUYdzo4iXGRSS4XVZJg7
+Af7hXiSfaauijnqvlVaWvXzEsJrtVU8uY8hVqB3izjMIOH7aruN3i6OEq7Z8mtzN
+hh58CwNEal5HB0UQsJz0tNNBX3Fwfc0wn2c5J7dgj78bClwVLn1WqrIs11EW9yiv
+slL3/KIfJ1Up5N2rezDNEa7eCNuLTdHULicLxaxLIBwzWpNN8ShbAVN2aN62QiTG
+j5z2fghFLZV1o4g0ZklGtdd7O4GzvdcCCBMdmmzroFaKxVen46TsHtDH1YzGQr97
+WxIHIMDhq3MY7QXp6Z6Bnaw3nlDNK8ptnCbKnz80yPLKKYbqikgnCgpkTBNoRr4o
+fm6Bq32tVEwgdZf8C1wYu5qW6l0OB3KAfs22f4C/jlGqhu9Dfddeig95+J9YwUNB
+zidu8Aj0/A1K33LTiJigwRJDgDVUrHABLgJLxDX7aVVA1pHKPueTZwZRbDA7REAS
+Mei0tE/kDrq3xPQOqHKeOtepa+POFGMHSWGf0cdrIcKWKvWZDOhEUcad+hBZyAj
+qe64229FsstpWEglBVaG
+=LxZy
 -----END PGP SIGNATURE-----
--- a/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
+++ b/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.1 2012/08/15 18:55:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.2.9999.ebuild,v 1.2 2012/08/21 19:20:42 ulm Exp $

 EAPI=4

@ -240,10 +240,10 @@ src_compile() {
 src_install () {
 	emake install DESTDIR="${D}"

-	rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
-		|| die "removing duplicate emacs executable failed"
-	mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
-		|| die "moving Emacs executable failed"
+	rm "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} \
+		|| die "Removing link to emacs executable failed"
+	mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
+		|| die "Moving emacs executable failed"

 	# move man pages to the correct place
 	local m
--- a/app-editors/shed/ChangeLog
+++ b/app-editors/shed/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-editors/shed
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/shed/ChangeLog,v 1.24 2012/08/18 03:43:33 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/shed/ChangeLog,v 1.25 2012/08/22 00:19:16 blueness Exp $
+
+  22 Aug 2012; Anthony G. Basile <blueness@gentoo.org> shed-1.15.ebuild:
+  Keyword ~arm, bug #431922

  18 Aug 2012; Christoph Junghans <ottxor@gentoo.org>
  +files/shed-1.15-interix.patch, shed-1.15.ebuild:
--- a/app-editors/shed/Manifest
+++ b/app-editors/shed/Manifest
@ -7,17 +7,13 @@ DIST shed-1.13.tar.gz 78699 SHA256 d0a1aa6c30b907945608d478949a00ac2ef1b3f1783db
 DIST shed-1.15.tar.gz 87777 SHA256 5bde9f146704ba552293b658a2e8e05acb0a14a1348925b19a296663539917c7 SHA512 fe401303e686fb11975b71de0f84d0cdb84dc5a48e1094356d012f95d8c956ed05bd6b39bf65af924212e83c1db45bbfe556342489150bb0e10fb4c832fb6c78 WHIRLPOOL 8588f739370309e54ac04e0a686e24adf3c236011ee57ca79846c63fae7038a934992ae0ab918eb4acab2ec1577d5c3aceaaded861620c2b75fbb2b1ee333058
 EBUILD shed-1.12.ebuild 501 SHA256 9ebcf499bf3e83b820f0e3853df897765f1643e5e3539500cc6727715b63e48d SHA512 cb1869dc6bef2693b4a850e718a3cdc65459e8cd83ba3c5562e96c58911d79fadf405e9b2ebb33e457b106e6de6b63746a87bd67086989339eb4129996518dbc WHIRLPOOL fa572637317f22400d405266dfdfaa6a67aff54c9dedcd3c0ee070f182b1a7f896ded24fd3660ec7e7a1072c7accf43675b33652d50186ea4e44bca5c4cc5de2
 EBUILD shed-1.13.ebuild 502 SHA256 b3b4f19551c245b90d1c44528b8346d61a67c435167db19354901205685c9de6 SHA512 47619c2911c0a1f56fe7eda4cf041ae9953238ff80fc3071a182152791a4ceadc9cfb3e34bb289df597944598897e21d05600b8edcd1fa06e8bbde302672905a WHIRLPOOL b741fe6bbb8ceee6c11417ad7697387e21e190d8c30e6066eb24c8696f93414919b30418b50ecf390d0ce3f91f00cba4d0853c289fc7ea28e15c16b82a6af154
-EBUILD shed-1.15.ebuild 628 SHA256 24feffbf068b4d31a60ee15afdcef9cf61843c354166cfb3496ae87a34fa6747 SHA512 f0c16d18b4bc6672c3c119db2d4db07b99f4c8becb4fb60a2a839597971784011ec647c24f5b09a526fb072cc69f2d5143934bb96ccac9381eac1d630c263503 WHIRLPOOL d5c3b5cead6901ab7340d290e0fcd7ac6c900f8ca3236c92c7195a0c62e79ac54bef2e0da10891a7025084b17a1147a12ec9703d0f4004544c0867a11dbc1a5c
-MISC ChangeLog 2580 SHA256 3fa3b2cc654c1619d5f977d8febbf184014ca5506c62c6cbf38a1215edc676c1 SHA512 1373bc8676af554b85c41ed6a709412f54ca545179b1053afd7908fef56fbc6071b7ab20586d77e3b94077660b5e7d943d2b9df4b73591a2650e31d82c376c99 WHIRLPOOL a586e62b7b921fd80d33df5e60053ed9f572b78a1c2fd099d64cf2ce0446bad6b1a42d06bccf27b0f2b095fce4e7bbcc2cd380883701ab01b7e0f74154e9c7fe
+EBUILD shed-1.15.ebuild 635 SHA256 855f79f9ae916d3e67b5417334440ef4507ec2b2ee5d6cf2bfda7304bbc207a5 SHA512 d16f94baaa9b2e5a2b0b03885b45cc9e11a45cd0d9cb87d939eb08104b076b8179866179cee20c6c93a186b88c4cde5bdb7d9520866c23a29f004f13bcaa7d9e WHIRLPOOL 4aa63795500609aa706e6ed67710b35dc5469d1aa7032adbf5c2dc2a3fb38ab20caa6e78986253554e4ebd4635f8539f54e1508c7d1193a69c2d10b346858889
+MISC ChangeLog 2684 SHA256 9545d7a84eadf1a49b8e3f687aee2ef01aa97f081bc3602321fcf56d9747fe9f SHA512 1252c25e278b35fc94b5804a198f9098686eea259a9852e4dd861549ebd32f4347d95f3bccaa16ca9835b59546686aef11a2bf67092a270ce8c414037cf4bb3e WHIRLPOOL 9c246e9830adb4880a6c6de28481359d62af0d708f89d2e20860f109c300273f700d54e00cdc4bc3275ab7db3da2de99cc5e1ad57f832035c2ad6fc4e2da5c43
 MISC metadata.xml 207 SHA256 131271f902267c3eb067a7b0316b1e2598d5cc32a4528edb37d50ea2f4b262e0 SHA512 5a94c029f35e9fe05a2ce6678db9a67aa9c0f78ed03b48e267b53db983c8bdc8f8cf2d5001e3c4074ddbe04526547f38576981f660d165c1a7908fa5eeaa20c6 WHIRLPOOL 8928372826be281072bdd0c064b1da6f8f10c220972343090083285052fd64608239840ec7ba9a313c7c5cf3309619fdd023a6fa49fbaf97311b5b6333e93b5a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQEcBAEBCAAGBQJQLw9uAAoJEOeBhlrCAAWGQ8MIAIsWDPiqqoGCUkGhCmJpolkC
-Php5kx9nzLym/inTu22plNBJmenPVyY1UT7zkibmOPadCNYzjCSP/Lh85WETVeLU
-zBPxYlEA5WgpfKifjBKPJoBY1rRrOs6uGZ4XMfogLwar9ZqnuAKx7rmpGweQAEsK
-XQYmNCMup6qhaV0k8GckqxgctfSJi9MjDdWJ4gojdpyiPg557y8zToqNT7ClfKfo
-4PfI8aCwqMUwkyfqPIdPvgVK82ndlWi6HCtFb/5RJ3vHJceizC0pgZDITymGUDq4
-6Br3GI5fPQk1TIz1XMzYRzNd7QFkehGKVeiEd3WFx5azcRIUAndpgGz+7FWyptM=
-=wtEj
+iEYEAREIAAYFAlA0JXsACgkQl5yvQNBFVTVDOQCaA+8wr6T3zpwCO/fr0qilXFJa
+S6YAn0eZH0hBfkx5CtBwQ/hxSQS2kj2l
+=1nEp
 -----END PGP SIGNATURE-----
--- a/app-editors/shed/shed-1.15.ebuild
+++ b/app-editors/shed/shed-1.15.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/shed/shed-1.15.ebuild,v 1.2 2012/08/18 03:43:33 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/shed/shed-1.15.ebuild,v 1.3 2012/08/22 00:19:16 blueness Exp $

 EAPI="4"

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""

 RDEPEND="sys-libs/ncurses"
--- a/app-emulation/spice-vdagent/ChangeLog
+++ b/app-emulation/spice-vdagent/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-emulation/spice-vdagent
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/ChangeLog,v 1.7 2012/08/19 00:07:14 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/ChangeLog,v 1.8 2012/08/21 21:25:52 cardoe Exp $
+
+  21 Aug 2012; Doug Goldstein <cardoe@gentoo.org> spice-vdagent-0.10.1.ebuild:
+  Add missing depends. bug #431964

  19 Aug 2012; Johannes Huber <johu@gentoo.org> spice-vdagent-0.10.1.ebuild:
  Add ~x86 wrt bug #431854.
--- a/app-emulation/spice-vdagent/Manifest
+++ b/app-emulation/spice-vdagent/Manifest
@ -1,24 +1,10 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX spice-vdagent.confd 169 SHA256 089e0bc85f7d3bc6bbcbbb02aaf0c47a2053fe1867dba9d78a195eb775467dc2 SHA512 bdd1d2bea8a268fde44dfc708be699de9ae37803ed7b79a84e998f175d809f37bcf0623fb222fdb5505d3b3b549af0734a8962b48bec635a1089369eb043af42 WHIRLPOOL 82b32cae521811d71f9c991e0cf66784f503126fe9a9333e0466c5217959ddb9dbd51d18bede298da69c673105e762b46a944052c2563862b66ad02197c5a79c
 AUX spice-vdagent.confd-2 314 SHA256 50dc90de28c68dc95000b88c9e00d01dc9d3fc338c93dc9540e0b01d40b90ae6 SHA512 ef3e02c65dd83ed0d4b1eaad9c6000a9d5d53fbbf2c19fe9604583f85478c92276b3b80554bd1573af6866e242c484f02da5c3500c0b4c430d3af0de755eed38 WHIRLPOOL f19f18e5f63471c3d34a79a66cef76405a5ee6ef66845e61367f31ba1399c71e620d071f98dd0b249572adf4caa9195303fca8ac8cd6450cf263fed203a817c8
 AUX spice-vdagent.initd 1322 SHA256 1415b76c8917930cd9acbbfb40cdf513314ec399aa7139ad478786111749a66e SHA512 0d48707dd3ca19a5c44a451b6a03475dd9a6ba5c2f3272ed822a56d29fafd2f816a6fcf43ca0d61df77365e52c240770c11405fcd9829845c03d62f309be25c2 WHIRLPOOL a1bdf466c8da94938d7eb0cf046135f7d8fa9aa48a62b2dff2121219c8f4f7559d07bd607b99af5a63c65012ea3adceeb09f978c303d95f7c14214288455b252
 AUX spice-vdagent.initd-2 1612 SHA256 4e6e844ec6dbcb7a6616ccc9bdf331497a8deb0cd38da7dc2c8bf735c48d5034 SHA512 94762d98281376ed515f07491a38567b753cefc1e5e95b41423463be18aae8fe4f48dcd0fcef7dc1e5ff165d654d27b10b34e789532e5e0ecbe6917428dc945f WHIRLPOOL ae522aa149b42ecdd28ee2e1123115d08799656fefcf104dc7ecba3fe382adcc887c4f5426223e8483af16e5c11ffe101bd4c1bb8fc3c21806fe3dc8142f4b21
 DIST spice-vdagent-0.10.1.tar.bz2 107250 SHA256 cea0db6f2def79a96876d0921f2a6234875797c68a8143d24cf9af8cc01361db
 DIST spice-vdagent-0.8.1.tar.bz2 98437 SHA256 99ec232805a6201da78d409e6f874ff0aa6bb25e7ffe623aa77752539ae7d7ff SHA512 45c2b94dc66dd2061b57cfe90d7b900fd095fa067c6bca560ecc300979953e8c37b63e8cbdb4683275a1cc084512aa97e1125bbb17e39a6966387e4f1be2c178 WHIRLPOOL 1cfeabc97f4c1fd9e42a9ad849916f04d9f4f640a586158c3d8b2ab3b9449f6e1cf8acba196a9e684a1499404747971fa82ad922bd50e87c257526d67468a85f
-EBUILD spice-vdagent-0.10.1.ebuild 1166 SHA256 5bfedf87ac64c2d06019a3bcf00c95c2de6234c2ad5fe67ef6120a203950b7be SHA512 e8df82d4671800a14a9e66187c8d2f72771c9ab835f112aad255ccb2b6aeff232f5df1bd79e634077536f1bff8f400e03e3ec2f582ba736153b55782be20a4be WHIRLPOOL 24e0c7c3594a124fca7e9f614cc0d0e1b20fb6bf57f990a3a37a02f5133b9af626d4fd3806e9dd515558e2c2adc93a2ae51df138754c3c75c89cae9c8a05bda8
+EBUILD spice-vdagent-0.10.1.ebuild 1220 SHA256 1cc7a24b5842597e6af57e2608ee634ea8083d98eb7f1dc049db2bcb164dd23a SHA512 c41e249d392f9c31345a95a78480dda1658841a686c6a68b372b6da42bc271072c9b17d93bd26eddc580ef3e09365f27ea1ad162d665ce74264765c08289c7b0 WHIRLPOOL 98216f1258170feb5e29cb969cfdf5f09109c9cf0f48aff2fbfc818ff30f6e7914228c1d352f620cfaaf73ae943c0e9f550f8f587cd8d21a5c18cb81843e17f8
 EBUILD spice-vdagent-0.8.1-r1.ebuild 1276 SHA256 83c6f76d6811606a69f877e7480c05a4a849c9a51c748dda986b845fabff283e SHA512 7b1632a2ae3e9caf6abcb2c4cbb9fae5bdef251d405ad59730636369971eb3eb4e4f7d41fcac473f75cd9e842f49ac71f4335ead924f257a036e333910677adc WHIRLPOOL 66efeca9ee1474741304744e9e2edf7e2894fb32218dc3de5b0141c08dc5e5df68407cfa8fa7ab6fa387da2d9672d91ad5cb2f62c179abe387692a968aef7db7
-MISC ChangeLog 1824 SHA256 d6259506a92c2106d15d16b59fa455c486052603ada2857ae98401f00d5e33bb SHA512 49c830e0839f5da2457007e8133cb7d338c4c8c6c9b29f6c3dcbec19ae23068185c14bc5c5ee6c746d2f5efc7d33c0cba17a7e15aa026ccdc0e089ee27301937 WHIRLPOOL 440265d3660968c9ea366c8f74f9d16b32fd1881d39abc3018a5bd5a129a843fb4cd5a3b4b593b43c197648db79515840eeeb734db0a7c3a33fe4747b1011772
+MISC ChangeLog 1941 SHA256 e006d43d2e6afc897df642cc4ec8a41bcaedb77e6f51f9608b54ffc3b86db479 SHA512 239f4df0bfbe25fd0239bc7876e8769353c4842145b3dd8c6bca135d2031a93a7f71c700013eafb0fd3560e8e93f6f24c5a55a1739c048d237ef4fdd11ff6f10 WHIRLPOOL 842ea8e648b767889b282358580b3c01063cfc132075f74f83e83995eb22b72d49c4a8276abf5d3ffc85c34c8cd10c929f2138bcb3b0a4062950dd59bb7a3d1d
 MISC metadata.xml 446 SHA256 20918dcf1516bbd1840cfc825dc2b402643bd6c39f0a6423f6839884e07e03a5 SHA512 d06340e19f72b91c4ff4cc6bc71557a4ea040a41b8b6a3c5bcbb2d36284d9420a5296d19a90687e258e3f83ba62663c460d6785de47ea03804a3c77cb21bb93a WHIRLPOOL e5058f9fe5cb3340b98707ee79aba0a27c98a2cce1120ae008dfd7e35a725bd43d71345730c7c1dd9f2969c051f1def5de0c8c09d4679874149965a5de85fdc3
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQMC4+AAoJEO+t9ga+3I3aAyYH/RDgciMiyCclEjqSBV5boETt
-iTd+yM+m0vkCEin24ahvqFIx6NixcBM+x1MKwMlUX/1qDILYouErN50j3RXMy8bW
-TWVFdpCK0ebIb7IakTQDK5F9BzfFGFusb5PMsXQS7pymIkWku20x0Zj6qNq7Jo1O
-4OjqQ0kfmbAtNUVtDUtWsk95t5XGBDsdTCr/IOIBRxojYHLz2WOReEYFGaRDFLE0
-Z0xP72CsY4jRMUBdlSea85fF6IomB/kRd05IEY5kJRPoWag73Runxf+aPTnqgIcI
-iFYy40Il1V/TIMEgfkdQ4zT233f+psHMyBJBRuDCv/oJIWAErPt7+f23jmOrhdo=
-=mIqW
-----END PGP SIGNATURE-----
--- a/app-emulation/spice-vdagent/spice-vdagent-0.10.1.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.10.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/spice-vdagent-0.10.1.ebuild,v 1.2 2012/08/19 00:07:14 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/spice-vdagent/spice-vdagent-0.10.1.ebuild,v 1.3 2012/08/21 21:25:52 cardoe Exp $

 EAPI=4

@ -18,6 +18,8 @@ IUSE="+consolekit"
 RDEPEND="x11-libs/libXfixes
 	x11-libs/libXrandr
 	x11-libs/libX11
+	x11-libs/libXinerama
+	>=x11-libs/libpciaccess-0.10
 	>=app-emulation/spice-protocol-0.10.1
 	consolekit? ( sys-auth/consolekit sys-apps/dbus )"
 DEPEND="virtual/pkgconfig
--- a/app-emulation/virtualbox/ChangeLog
+++ b/app-emulation/virtualbox/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/virtualbox
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.119 2012/08/21 15:55:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/ChangeLog,v 1.120 2012/08/22 00:31:50 blueness Exp $
+
+  22 Aug 2012; Anthony G. Basile <blueness@gentoo.org>
+  virtualbox-4.1.20.ebuild, virtualbox-9999.ebuild:
+  Pax mark VBoxSVC, bug #403453

  21 Aug 2012; Lars Wendler <polynomial-c@gentoo.org> virtualbox-4.1.20.ebuild:
  Attempt to fix bug #432210 by adjusting dependency of libvncserver to >=0.9.9
--- a/app-emulation/virtualbox/Manifest
+++ b/app-emulation/virtualbox/Manifest
@ -24,24 +24,14 @@ DIST VirtualBox-4.1.18.tar.bz2 73688436 SHA256 e650e4fdc23581b9edc0e5d5705cc596c
 DIST VirtualBox-4.1.20.tar.bz2 73391720 SHA256 b132dbc5c6e9ed77aba737ec35b488ac152aa362c3ad49d466897bc410324aeb SHA512 ee14844b00e202fb23168d5c583d7dacca2de0506028ede7dd51fe33a2a1b5b7154e706445c85d930e0d7365ee32878d08644d6830d1b591ad5334fef5453c6e WHIRLPOOL 8a33f3553554eae6a4cbb5e80b376e507d9da97cf10e49363a2888fa849d238bf84492aa4941e7c930ec17c9b1c5dc5f1ad4643ef9258d74a44f8b81f84a00c2
 EBUILD virtualbox-4.1.12.ebuild 12225 SHA256 d9b53428c0bf20153bac46233d1ce831f322e178a4b51501474a2ad369d83e3d SHA512 6f5182da063065ab16280b1c85de63970070bf3a55c70d8f8335d365acf6ac9d1675fef0dbad5a961457463607fdf50773de587933762127b1117aa7f11ec025 WHIRLPOOL ee465fb263e5f2b31761b61d8241d40c0b80da0d454ef22ec7afffd6d8eddf9c2b5ea2a79e5272448cf44826415027b71af726128395a39162ca451c9c716cab
 EBUILD virtualbox-4.1.18.ebuild 12272 SHA256 adac9d717b2d9a252a35a31d7b4ab79b582410d63537caa99084ad41c8d7f24f SHA512 5ddd30bd4141b0f51b87494dcba5f7e4381a69665472178666c923d0051587de43a2db49a8c430d60b8d16f1b06102a8574cf44c220999f304a5ab794dc80618 WHIRLPOOL 7f6e49f815ffd1eac97e8210b2c089e06c1863d26a81427bfa0824811e998e612c3b67be6fb8e3e14f635fe7bf753362a18b24fd3ef1c7a0a41018f7c1446cfd
-EBUILD virtualbox-4.1.20.ebuild 12274 SHA256 c3d9521e39f4a9f28ed8d44729aeef33dbb5e9431a01e0ee6a749bafb2980415 SHA512 06aba744b22a6ec53dc9d9d5ff074dd0f9f80a71012cfeb2dcba7e01972c54fb7758e2b77dc73a89dfb1aa64c8cfd9498f1723425e6ff037fa639f3840e7b798 WHIRLPOOL 880afd1b1bf893a910e4c1442a9a472c40edbf55d526470bfb292c199b07dec6037b7336adf3777c41128f4ef3c5db1780f8e9f8fd4ffc35ae990a2ad6928a2e
-EBUILD virtualbox-9999.ebuild 5131 SHA256 fbbf430d655e4d58cf667a92aca03ca129163ca96a8b44defa86ab59481f004c SHA512 c737f49cfa6060ed9684764fbb57bca7fd8a4f420c623eff6e99b6d5abf8213784178a8a62a86a533789a5fc680c40fb820fc69d33db9028bf031104b438087c WHIRLPOOL 4492eeb296ced928519a8bd893a74b398d047015665c252a1b755b66f916344945ee5f8ec9b50108578119b965c65892a5cfc1c46f97b41f1e1360db68baa649
-MISC ChangeLog 14575 SHA256 65bee14f50858138c1b8c32a76a383e036bd7d31fdefb256e0b8c1b632dba585 SHA512 6d44765111c78851aa7b9cbd3811f01befa17af904210d8f7e12a86c7bd42dc49a7677270a38b05711f9b4885c9cae5e3e73e29bfe93aff3b9dbe5c1288458a5 WHIRLPOOL e3005a069129c1774532c96f672e99d1545c020d64d6e61d29e9ad4785028685a462d2dd2e0f0a60f232a19fdcb0b96b94ea2d7e96870221555967ef47a7aacd
+EBUILD virtualbox-4.1.20.ebuild 12274 SHA256 2a852ca7c98d7cc9c600cbb51678b63ecf618f074f0b27bc4a9a5070736b98f6 SHA512 2c09b0b4d4a17165fee144c022fb19eb61701a0dff72b5e63743b9bf607f193ba16492f0f626adb7399a96296c866d3d612647348b60d64783082a6f48fbd703 WHIRLPOOL 96445073a927b3ef61e205afc89cef68d995a24d1687d45dadc31d91485a64daf212404880d49435edb0998662995fa13f905f8f2f1ec123d8a8ac683c6d41c8
+EBUILD virtualbox-9999.ebuild 5136 SHA256 4fc270899442b81a205e36531b05414708f4b1d709d5c836a9ec92646761dd9e SHA512 2c8944dc88949e8b7c7b5a6b4ddd20c4a5586c14336341c53ae72c45d67bf4c89e104010f8c8c2c2adcbcd9866b10df088cd82259fc00a5a43fcf8201b3f5fdd WHIRLPOOL a9f4934cd1ea406dfd702abb87c56c51435bf770fc1e937f3221b0f51b9b954393aa44b6f8d7e1afea251c695a5276147d2ab65ffb52b6ae1d6fda9fad27ae2f
+MISC ChangeLog 14711 SHA256 4fdbe47dd19e8889cc42de610a7f586156ab2ccae87bbfef6a7015282ea7d9b9 SHA512 bd66000da33821b1d50f69c08a417ad50338ff4679388568fd2b4c771218056615f939cbfd08af7d5022a8803ac1c01f8fc0edf4b6191170a265510f22253212 WHIRLPOOL c7dab9836e8969a4acd3e85d96f735dff0b48da9d93d7d992ed206e08da6c9c0c44b5da4243e134b3667afa4a67568cdac4dbc32ee5ba6b6f97237d10b47ef3a
 MISC metadata.xml 766 SHA256 54cc5df43fbe674f4f04674566dfec523c0c912f8c94db26f4215727ab6850e5 SHA512 60fca14fc1e69c4385145e5390f202c57fe270537db31e5e7ca86ea77a1a6b30053dcdecb09dfa8386abd4e3776137028832fa188cda2d78ee42bed3189f2499 WHIRLPOOL ce722dc1c7248f0230bd298f4079945dba4271c6209c2d0c2cd9269748422b21bd69ae284354085120c6f6309d28c16dac4e35eb19cae64b2d49da3bb574c9ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBCAAGBQJQM69yAAoJEPiazRVxLXTFJBkQAJmmsNdntHigP9x9UJU3sA+R
-CgsRGcdE185lMydpwND+6blhWaHxhSndkqnxX2R5OOzALdKth8FeDzRVLhdg6z0c
-3k/23g0qde40Y3mng6eymdQCayeuHl6rJnIihN/O3Iulno0gjPCkeR3KxQwgsNrU
-zfFcj+A5IFiEn9b4NKWiHCgRXA6BCLhzPBDjjmEczj0EGqZb8UB8GIl70DfZrVhR
-gViiNyiRSvNuZe0jbOrk/J8MCbtCN9ndkmKAhwh9KmAgMheufUwdgxlVPqi/j5/p
-y+brp7Zn9SgfaD4+SvqSphwemvw5qN2LN4/75Nc/i92TCz7Mlu3kety0taa57L/J
-8frLPyRYQef/5/L/NFbJGtlhKg//w8DDAOSl1vZXtisZdXF1590GJ1EP6a+dXk6j
-LA5Cf2EnpKMnaVjYZxAZP3jYBg9g7TseKdsWONfksHeKoh2vUN9yQTJidno1OG4c
-or4WO5sI+JQqSR/eW3/cOhS4WTYadKxHB1YBpbssXJ7musE8Cv/46btDSumsKVN5
-DP9ZMEwUhMoo7eDjnb0VSoNmEheOnKOzLrFmUkcac2l5g3BFZeP8ZXPyagmXjh98
-ntj2yMltTPh4KoJ2V7Y/tVpki8kGPY2AV4V2lEWMCp9xVnJ1rcckcjPPa102gWiy
-Y4uZQB6ELLyN/jbCOUd1
-=BgRH
+iEUEAREIAAYFAlA0KG0ACgkQl5yvQNBFVTUlqwCgoqWDXuv08FX0sU+ktiy+5VNK
+AbYAmLWJwbw6tx7lghF4Y3gnUyvr3wQ=
+=M3G1
 -----END PGP SIGNATURE-----
--- a/app-emulation/virtualbox/virtualbox-4.1.20.ebuild
+++ b/app-emulation/virtualbox/virtualbox-4.1.20.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.20.ebuild,v 1.2 2012/08/21 15:55:24 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-4.1.20.ebuild,v 1.3 2012/08/22 00:31:50 blueness Exp $

 EAPI=4

@ -273,7 +273,7 @@ src_install() {
 	fperms 4750 /usr/$(get_libdir)/${PN}/VBoxNetDHCP

 	if ! use headless ; then
-		for each in VBox{SDL,Headless} ; do
+		for each in VBox{SDL,SVC,Headless} ; do
 			doins $each || die
 			fowners root:vboxusers /usr/$(get_libdir)/${PN}/${each}
 			fperms 4750 /usr/$(get_libdir)/${PN}/${each}
--- a/app-emulation/virtualbox/virtualbox-9999.ebuild
+++ b/app-emulation/virtualbox/virtualbox-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.30 2012/05/31 23:49:02 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox/virtualbox-9999.ebuild,v 1.31 2012/08/22 00:31:50 blueness Exp $

 EAPI=2

@ -147,7 +147,7 @@ src_install() {
 	fi

 	if ! use headless; then
-			for each in VBox{SDL,Headless} ; do
+			for each in VBox{SDL,SVC,Headless} ; do
 				doins $each
 				fowners root:vboxusers /usr/lib/${PN}/${each}
 				fperms 4750 /usr/lib/${PN}/${each}
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.64 2012/08/20 21:01:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.65 2012/08/21 19:06:56 dilfridge Exp $
+
+  21 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org> calligra-2.5.0.ebuild,
+  calligra-9999.ebuild, metadata.xml:
+  Add support for the 3Dconnexion spacenav input device, bug 432132

  20 Aug 2012; Andreas K. Huettel <dilfridge@gentoo.org>
  calligra-2.4.3-r1.ebuild, calligra-2.4.49.9999.ebuild, calligra-2.5.0.ebuild,
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@ -7,24 +7,24 @@ DIST calligra-2.4.3.tar.bz2 119351575 SHA256 8a7dbefdd957217ca4280c1865b319f4fa6
 DIST calligra-2.5.0.tar.bz2 119191980 SHA256 41b80d33970b9110c0f26fda11c9c5c87d41036c333e34d6c7fce70f4f6cde60 SHA512 965852ed8230e6742d94e7170351bc658cae8f015c368bc329e4ca7f80ed27d5a9749daee438ec42ec9123865eb88596928b31eef8edf12fff9e5de25ab3d5c0 WHIRLPOOL 7cb7cba2544f2b4476946060e70c654420387a36675621a988c8398a278eedd6b1e9278897cf280203b92645cf544e3223d72cd2b528033c307ba867ac21d85c
 EBUILD calligra-2.4.3-r1.ebuild 6159 SHA256 bde60dff89b5879b129bd05cc9efb4d2ac6420493a6375700ad82830d02408c7 SHA512 77b63f062f165997b26e3ab4dd0f1d826c36d7629efa58acb2862a52b86105c08c47411d80a368de8553fdc473ee920a3940f3fd125fa77a0fc65b1999feee86 WHIRLPOOL 193a44b8d1fb745d4e62fc2cf6f5b78498b64d0ec6159f1e3009e773858e9df9b4518f1fd997d0d2553877c879ec5aed1e5aa47bb4e46b135f8aa793840cafcf
 EBUILD calligra-2.4.49.9999.ebuild 6101 SHA256 4b7688c4c43a4766c05e84c9dc583babfa7c86aa82126858ebb923ea360461be SHA512 0031e3897c67a8c91d995371eec0a31b246ef304c8823b721cc3b18fa0a0c4e0a5bf0b5239e23fc4e1d63f79fcff244a193acd2c9310a554f25be327164a7d3e WHIRLPOOL 1daa7f4ea13480e6e156a3d7e92a86e56a694283f1f9d259b3e727820cef72810828eb0eb61a914810b16b35f847b57086fe63f04d02333d95be73d2caccf6b0
-EBUILD calligra-2.5.0.ebuild 6322 SHA256 08e58781bd5370c6132f80c44d8647e167416205683e4157afe5a01234c93f1a SHA512 4c26f67e21259c2f859f0c26a7ac12331e676777655429ca2e454fd1e24f5aaf05ac5c2f8c21937b1dc9849089721372b586624cce81c6a676a7749049c6a53b WHIRLPOOL 6a6ff91e04f42073d865a484e4f8a14d1987059bc233548d327c70458ccc6c8739d7211040e9da4522c775d3a42af16b4951c6600148efe61fb57418aecf46a5
-EBUILD calligra-9999.ebuild 6322 SHA256 d0f29a1165183a793a77b27cfbf7d90e0cc5beb8a0b743ce4b2d7b391277c011 SHA512 25fc46600712bd448110bf184bc2fc15cea1210fbfe07a43d8e27e89ecbcf25db9b012955ffececb56c391b547e6f96d342ae3e1c319f8cecc134583d61155ac WHIRLPOOL d25f655d0c6a743c3b8cc1e67b4fb1780e181c18ed0176dc1cb61cbc80f754a73bb535706beb8f2b4f40140fe87199d1253e53018639f9f329066e4d96665c79
-MISC ChangeLog 11308 SHA256 4d5d47b4256fe3ddbba655fc3a124576e7051a1c56ef60b8a4dc8b29ec67c25d SHA512 6f8a8804ad24945dc433dde7df85d59cfc92d00689087c4329157138a7558ae7c0aac782a7bf5dbea17211c12e760aab619ae72f93039dcf44bb8f22aa295054 WHIRLPOOL 0ba355d6bfd047a6132bd5361eaa7930f9fde0afed7ac2c9a1222e7750d85865c085150c0d87cad60a8d0f14a89cf7601d0a4277d5a513a6c80442496c358c63
-MISC metadata.xml 1600 SHA256 c33b660eff45a7075f2271b50dff8df9e7d1e6725ad814c4376bbc6c93290864 SHA512 c34c966e5a3232d1fe97dc720869e6d9f9ea8fe51759fa6a86218d2756f3f81e0f96a66f8568d4413beac1b3d536ad691128358560be2fd83cf42b369283d78a WHIRLPOOL 568657d6e0adea15be505af8f9ef4be744e77ce842b03b89fec699237a75eaf4a3c233cddda352279e6da672372e2ae5d19f7d3a730cb6e4812ecc7127a1c775
+EBUILD calligra-2.5.0.ebuild 6433 SHA256 b0fce5699c803144f608f7cce7e1f472eb1b180018b482080e777f324859df60 SHA512 cd2de6b135a89a84abe5462e41d67a48439ec404ec91232c02fe58375877f09c2331f3bf70103ccad759085929aab39a2061ea244160598633363f4ec593db47 WHIRLPOOL 0028e2b70246843d707ee47640bd82d1a3165ebf7f4ceac8f9f071a2d34a8f1c1458095a5264b397bddbb47442a5b1b7adf1409527ce481349816ce9571f6f1b
+EBUILD calligra-9999.ebuild 6422 SHA256 0509a7497409513f303f3a0ccd61a2c2255985d96d1d5b984cece543837b742a SHA512 0b909b67b95928892dadfcfbf48ebe9177d23cc58e50ff64fa209f14d8d03fdaaed52044e77d13ae04c3baa376287b0cee6967f40e464a4a15e3b5a9b3fdd6e3 WHIRLPOOL 973e356e159ad856475292997db13a5bf82c3ee2a782094b894ed2e286581216ab2561fff7df8fe9674ec4dfc4b252a43a3c820c5baa15acdce6f5a2475e8f4c
+MISC ChangeLog 11495 SHA256 39fa07a82ba256795f0d54aaa4535ed7a8c5e38b280d54ae634f1963290e2ff1 SHA512 1513e795e69c1f60669e5fda9a6944ef4098df6e984cd03b2dc7359e5c741d99730feb3027325ad80db233b5d9d07e628c5f90c6712be61e26d325259c3df36b WHIRLPOOL 7dc1bbf44e6f535a029669089cd9693a644f2ebd0a7f41570441316d5cbc3104bffe02df8000a79ba0b1de2d6733a7bcc228c516fc17d8e1f758639cd53c2e15
+MISC metadata.xml 1721 SHA256 eeaac9b2f4dd1aed008ca51f681413ecfcc8ff4e3ff8d129f10ef9e83c450edd SHA512 517120ba7849b8aae187f06d5f58e9712d5de028504e138aa887ea9235db3feac9691dc53d26d0683b41dbd098138e2c8455206befa588eab1b09f5da148ca50 WHIRLPOOL 28954c32af667c514d460d7b078fabc62d1f9409b679b9ea05b3310c2a1af133e5eaffd0aaf728e463d94fdb2efeab73b7760c8fec4a5b36b86292c380f22dc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQIcBAEBCAAGBQJQMqYqAAoJEEb+UGWnxTyHjagQAKS0sFGCuTPH6GUs2jxFwVJT
-gFphkevOoGns9+xhn6+FJLCQc55q3G3d7rc4UBH+Z+1Q3Nl+KuedDfTJEP4in3fg
-hdBO4Z+redgq5Z8bGHsqtMrEt4fhm7+LTfH7HsJPLNOZrCzSpQurbldRv+wa2pF+
-UZryss5TvLGKOeqtKxQwL9jUS84bql1Jji9Enji49FgrMnKtoxDhqskuA0Roc0Vq
-UOqpfLRFJj+U8TD07WBCjvdmkP0Y2iAGP80PoY2AU2F2hcylWrMn1F3blLjZZDFp
-C9kWxKwuQnzz3G+6d2OiIdviM5FXLu9JkF6rId3vkGMpWQ+JUboa2M+R686/hCu/
-BMtfiXuXVKMgVKu/GAfxWaoWEF8ur+ES9UVUo/eznn0Jyv86Vi0/S0tojM4USXgB
-lij2otyZM00/2nsuJIiL23MZA02eRpamSqoitjAvOV5iWa7wT1yUh4rnpINbWQn6
-mQt1i3n3RnO4Q+4JZQvToZIKpg/f3coHQ4n6AHPhnL4/IDLN6f+OT8eBgzrfzL9z
-ZJtdFvr6Jr1iH/gf3C1hn6G0WLwrnTRsmdObiNU0NKAq4zNHA0IHkkikOUs6iaSG
-yM9TlRc/p03TMEL89Ztsc/fIdp0zHhoLRLrSZvSbu/8cpXZVAOg/QfSYeW3Kns+W
-d+yGgpjCNEGWlSGvHf4U
-=RBr0
+iQIcBAEBCAAGBQJQM9zAAAoJEEb+UGWnxTyHDvwP/2v0sqsGZPBnPTota4QO3bV8
+awfuIaD712mfdl5hf49HLZdjFekl6xPVDHoMkTL16pBelPOx9U0xA8VW45ToKaC4
+AWtQ/rBWaZo9dQBjhjh/Skp38zDgS82ETXFT4u0uVnGFFIwZ2B8/eYk1PPq9hmRE
+suDDL5AHTuysJNBcXI1VmfI+A2Va/yNfFtbQ7l7V31mR3KzigwRXb2PMHGxxiy9i
+aKsyZkvmFdAMXpbeZO1Cj6PlahZbFdi5tXRLoAAvbda3VAcvXwqv/qMw6+C0KRSo
+aNwcnzd81Fi3Ceid+SV24gDvMWtJu4wEdomuOkQNCfwX6EJ9UgWHramTqsgYTbBQ
+icvxdVL3oTr6LhWuLm6otntvUbmsLXziIYvYw1GJhVKSX+Ru2kq/obAesLUu06e5
+PLUMvPqyM6ybV4QyGH/CJZ89bZM7/dLNLbehuV4SjLY1bhctthyt7QcjQrIyjMZl
+HzHyXGcn9uRB1AVXH8dSkaLcUeMLYjCpdW2boP/gDFnwkS4Dyj9kI/1ul+Niagc2
+ySPGrRc1HYv8JaNe/mkVFmQBZOGJonQ2mvYSxBhj6baHFx4l5Rl0prlBABYeIPzm
+eAuYyEDKpEgRVj2Ygqqkm3jVY6+rzuKdPL08dXvC3ITaFNnFZnDkFjHGUnxDzLdP
+tpFEMnlS/q7ClPxfPzY+
+=ylQG
 -----END PGP SIGNATURE-----
--- a/app-office/calligra/calligra-2.5.0.ebuild
+++ b/app-office/calligra/calligra-2.5.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.0.ebuild,v 1.3 2012/08/20 21:01:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.5.0.ebuild,v 1.4 2012/08/21 19:06:56 dilfridge Exp $

 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@ -43,7 +43,7 @@ SLOT="4"

 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
+pdf postgres +semantic-desktop spacenav +ssl sybase test tiff +threads +truetype
 word-perfect xbase +xml +xslt"

 # please do not sort here, order is same as in CMakeLists.txt
@ -113,6 +113,7 @@ RDEPEND="
 		dev-libs/libpqxx
 	)
 	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
+	spacenav? ( dev-libs/libspnav  )
 	ssl? ( dev-libs/openssl )
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff )
@ -150,9 +151,9 @@ src_configure() {
 		"-DGHNS=ON"
 		"-DWITH_X11=ON"
 		"-DWITH_Qt4=ON"
-		"-DBUILD_libmsooxml=ON"
-		"-DWITH_Iconv=ON"
-		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
+		"-DBUILD_libmsooxml=ON"      # only internal code, no deps
+		"-DWITH_Iconv=ON"            # available on all supported arches and many more
+		"-DQT3SUPPORT=ON"            # kde4-base.eclass pulls this in anyway
 	)

 	# default disablers
@ -164,7 +165,6 @@ src_configure() {
 		"-DWITH_TINY=OFF"
 		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
 		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
 	)

 	# regular options
@ -198,6 +198,7 @@ src_configure() {
 		$(cmake-utils_use_with postgres PostgreSQL)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use semantic-desktop NEPOMUK)
+		$(cmake-utils_use_with spacenav Spnav)
 		$(cmake-utils_use_with ssl OpenSSL)
 		$(cmake-utils_use_with sybase FreeTDS)
 		$(cmake-utils_use_with tiff TIFF)
--- a/app-office/calligra/calligra-9999.ebuild
+++ b/app-office/calligra/calligra-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.27 2012/08/20 21:01:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-9999.ebuild,v 1.28 2012/08/21 19:06:56 dilfridge Exp $

 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@ -43,7 +43,7 @@ SLOT="4"

 IUSE="attica +crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
 gsl +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +okular opengtl openexr
-+pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
+pdf postgres +semantic-desktop spacenav +ssl sybase test tiff +threads +truetype
 word-perfect xbase +xml +xslt"

 # please do not sort here, order is same as in CMakeLists.txt
@ -113,6 +113,7 @@ RDEPEND="
 		dev-libs/libpqxx
 	)
 	semantic-desktop? ( dev-libs/soprano $(add_kdebase_dep kdelibs semantic-desktop) )
+	spacenav? ( dev-libs/libspnav  )
 	ssl? ( dev-libs/openssl )
 	sybase? ( dev-db/freetds )
 	tiff? ( media-libs/tiff )
@ -150,8 +151,8 @@ src_configure() {
 		"-DGHNS=ON"
 		"-DWITH_X11=ON"
 		"-DWITH_Qt4=ON"
-		"-DBUILD_libmsooxml=ON"
-		"-DWITH_Iconv=ON"
+		"-DBUILD_libmsooxml=ON"      # only internal code, no deps
+		"-DWITH_Iconv=ON"            # available on all supported arches and many more
 		"-DQT3SUPPORT=ON" # kde4-base.eclass pulls this in anyway
 	)

@ -164,7 +165,6 @@ src_configure() {
 		"-DWITH_TINY=OFF"
 		"-DWITH_CreateResources=OFF" # NOT PACKAGED: http://create.freedesktop.org/
 		"-DWITH_DCMTK=OFF"           # NOT PACKAGED: http://www.dcmtk.org/dcmtk.php.en
-		"-DWITH_Spnav=OFF"           # NOT PACKAGED: http://spacenav.sourceforge.net/
 	)

 	# regular options
@ -198,6 +198,7 @@ src_configure() {
 		$(cmake-utils_use_with postgres PostgreSQL)
 		$(cmake-utils_use_with semantic-desktop Soprano)
 		$(cmake-utils_use semantic-desktop NEPOMUK)
+		$(cmake-utils_use_with spacenav Spnav)
 		$(cmake-utils_use_with ssl OpenSSL)
 		$(cmake-utils_use_with sybase FreeTDS)
 		$(cmake-utils_use_with tiff TIFF)
--- a/app-office/calligra/metadata.xml
+++ b/app-office/calligra/metadata.xml
@ -19,6 +19,7 @@
 		<flag name="okular">Enable bindings for <pkg>kde-base/okular</pkg></flag>
 		<flag name="openctl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
 		<flag name="opengtl">Enable support for transformation algorithms via <pkg>media-libs/opengtl</pkg></flag>
+		<flag name="spacenav">Enable support for the 3Dconnexion spacenav input device via <pkg>dev-libs/libspnav</pkg></flag>
 		<flag name="word-perfect">Enable support for various WordPerfect file formats</flag>
 		<flag name="xbase">Enable support for xbase compatible database formats</flag>
 		<flag name="xslt">Enable xslt and exslt support format support</flag>
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for app-office/lyx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.269 2012/07/03 13:11:10 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.270 2012/08/22 00:05:10 ago Exp $
+
+  22 Aug 2012; Agostino Sarubbo <ago@gentoo.org> lyx-2.0.4.ebuild:
+  Stable for amd64, wrt bug #431186

  03 Jul 2012; Alexis Ballier <aballier@gentoo.org> -lyx-2.0.2.ebuild:
  remove old
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@ -8,6 +8,6 @@ DIST lyx-2.0.4.tar.xz 10280308 SHA256 68317ba1c19fb372823421f967acd349033341acf5
 EBUILD lyx-1.6.10.ebuild 4124 SHA256 98df1f9c29d7caca1604ba633a1284dd48d74d554cbf1c6380b4ec41bac3da5a SHA512 837ef83ae72ba8a6f4550a02320cf7019643af8321d3962103f028ac1c70f651ae0e0e8dc8fb4aadf261cd2a03eac1682b60896f9a755397eeb568799f226883 WHIRLPOOL fe49c93f3f78e847f0be92ca0d4c4833ec5e6df57632762fccc20772d6ad35e81620fd3c379d85d095267b629b2369c4a3a7f05d55ccc0fdd5fa6f90bfd5538c
 EBUILD lyx-2.0.1.ebuild 4678 SHA256 1435fd3f2146e525a80919a600a698dbcdc6122364b48a00c6fb07c701daec28 SHA512 c6c4b92f21619a7d361a8039fd8c1fdf1c700ebe8c9d5300034e724e55af81646117f4816d48c42040d11ffe2ddcc2fbdcfa28820d02e7b90e48c923d05311b0 WHIRLPOOL 9b7fbcb53be20d49dfad03852a30d9ba49930bd360ed6a742310589baafd3e4259128251bb9a757b87114d79e5dccad04b842f486f95accac508c739f3f1b336
 EBUILD lyx-2.0.3.ebuild 4560 SHA256 d18cc8cbdf39e9a20effbf4226176e0ee6beca9514cb9c63d77e4fd53d7f370d SHA512 99ea4ffd4125e02d21a2a0d5b3dd9c4e64c5c19843b6f99c07567e60a9b7ebf551684184046318c0738c2ea52ae888f6290d2c94fcf58ad4b861ef52b14ab964 WHIRLPOOL 8479a2b14a49cb5a34da8d60d3ae11b2f41204576d2f2bd8cb7d6470c824850a70e9047fe7d6a6fd5aee58af9f243a76a40c292627ed53a347a80389818a14ef
-EBUILD lyx-2.0.4.ebuild 4549 SHA256 a9ff59e2090a35f5bb05f58fe79e87847d23fb4b97a8f5848ba295f49e417b22 SHA512 72ac81018d34fbee7ff4313d82755447a46e8d91980ca43a092a10bbb0fc2f45ece7592334498ed014b73c3c462866bb81ad0ba20016831b0b90a2305d029bfe WHIRLPOOL a717a42b0ef4003add40ea8e9ebbe013edd37d54f09707d4ffeaec5f48adb8a31a3060422aa38d03f0de745c7fe716f6f6adf62ba4ff3df04bb75c18b930fd20
-MISC ChangeLog 36643 SHA256 0104c448e60f78dcbf32df34cb3597990c45dc5ff010742c1a368e8e28d5c787 SHA512 db6ffc994c72c2ab710fcba9456a061bbd2e6f857e1fcbc498a637f8eff662f4450d95121c705cf4f0b802d21f30f4ff89b88c33b117aaac7f7deb6c2ff43a38 WHIRLPOOL 9876d8e49fe8904ae10ed035fe261e8d7e8cb9d0047206fef798c3f34906eee740ebb65f24b6707d7d41bb263ef7dbfa56b3a39b333505040ddb6c0acdcfe8ed
+EBUILD lyx-2.0.4.ebuild 4543 SHA256 8dfc15c7c1a0d26a091f78bc5e5413896a3a280fd03bbde07d120dc31d5ba445 SHA512 90336d2e4ae475b276226870b3b483988c05c10e132fbd69d31e00a0c578a090c8233488e9083b9e427eeb276da51a1ebce390768760b2b838dca403434690ac WHIRLPOOL d46eab1c16d3cef657b0d209ff059fa079a2035fe07dcc2e592f745fc4113f6b44d64bdb660f0378d18be73a8010e2f90c19029d8102597ae1d16c001a4276b2
+MISC ChangeLog 36742 SHA256 9dd02c4d782e867704b26149b7d6821d115c6c4aee63cdfefee490bcd52401ce SHA512 1675247c527d3aa3af7c158fc263ca5f83a010c30c29b43d3f67ba99dd93f640cee9fc1e891aec75f64e1930ba3db79021365ce085f6652d75e223f4a108952d WHIRLPOOL a3b3293052a5a55870a8642762974ebe791f23e92b3705d40a2f405b2fa187a330492252e35ba38e06c781cea78f4ece8f7b64e8b2d42645682dfd8ed83f7b8e
 MISC metadata.xml 1572 SHA256 330d0d86b06c6ce15cea6cfdd3bd070bddc82309346902481883575fd211ec14 SHA512 2098b388d76dc4a4f7110a44a99e6d928602fa73f902ef4dc2eeca5c25195db49fd0bd81bd4946209984027814d9aa451a2e0b7109998605fa73a3c4021bc49c WHIRLPOOL 7b1b245a443b71764601f6bf62aa040f00d403dcb877435ca5ff7d9e02116024403f01d2158615546d9fa6fe630cb4ad8e219c39e495c76df87283d4d6618096
--- a/app-office/lyx/lyx-2.0.4.ebuild
+++ b/app-office/lyx/lyx-2.0.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.4.ebuild,v 1.1 2012/07/03 13:06:54 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.4.ebuild,v 1.2 2012/08/22 00:05:10 ago Exp $

 EAPI=3

@ -20,7 +20,7 @@ SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${P}.tar.xz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
 IUSE="cups debug nls +latex xetex luatex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant"

 LANGS="ar ca cs de da el en es eu fi fr gl he hu ia id it ja nb nn pl pt ro ru sk sr sv tr uk zh_CN zh_TW"
--- a/dev-haskell/terminfo/ChangeLog
+++ b/dev-haskell/terminfo/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-haskell/terminfo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/ChangeLog,v 1.22 2012/08/09 16:12:06 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/ChangeLog,v 1.23 2012/08/21 21:46:54 xmw Exp $
+
+  21 Aug 2012; Michael Weber <xmw@gentoo.org> terminfo-0.3.2.3.ebuild:
+  ppc stable (bug 418703)

  09 Aug 2012; Andreas Schuerch <nativemad@gentoo.org> terminfo-0.3.2.3.ebuild:
  x86 stable, see bug 418703
--- a/dev-haskell/terminfo/Manifest
+++ b/dev-haskell/terminfo/Manifest
@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256

 DIST terminfo-0.3.1.1.tar.gz 42858 SHA256 6aef85f980951d0e19e6af8a1958fc19b802e87ffafaf2e67cfb54d02efdd382 SHA512 bb0596452ce1bc8caf0a995b4bb111432263b454963a78f7488ca670bbf5b76c299d1082916c6958cf73cd3b7b55b6614fa13b4c8cb5b9b34c6ded9f81e8ff99 WHIRLPOOL b3e8f55394774cd2f6a7b9c748aa7e8130e84d56a4c91331e4182321fd6133ac59d904ee9bcb43b87876812521d7dc3a98664b99042f66abf3eb1da2d1984499
 DIST terminfo-0.3.1.3.tar.gz 42968 SHA256 10303a46f71973352eed26f1f076447eacba8b23b9ca9ce73b73992b22656503 SHA512 cd2d88a1d31986b39719568041fb2b55f331e29c67c3b0dd4326a4af54f721fc37ff87c4df9139d52d006db9c44adc1cb606408a5421b31b703c01b07bc8c2f8 WHIRLPOOL 7d772338c9fd91ed01b9d1186d767eba6e60f1361f3c9c9f6aef7cb368d4ce5b5934953df74ac36089d7b7c8955fdc2cc476422e76666c4b0b41292ed5d9c6fb
 DIST terminfo-0.3.2.3.tar.gz 41953 SHA256 ae38ebe2e4e2f55291a40c0b5818095c79d4a990feb070c72d8542d24edfc21b SHA512 725a1d520fd01fe6ed62f17834a3d53b879cd7ae1ce90fed6af16e25f8862c99b766415f5631777a3b19ee2474ae69c02da814b1fae2b1ff9072fcfb921eafd1 WHIRLPOOL 4545ca83de99f0f122dce6d6e325e21e4940c5c8847f63c2b0d530f7034cb1a8015f393e2715affedc03d76ee49f5f724cae45e9876d6e200659d5ab2622baa4
 EBUILD terminfo-0.3.1.1.ebuild 654 SHA256 8cf047680b1b805ae8d815be9d4541c39d99d906d876a5c8c5d874b6b608a404 SHA512 54fe3d4e033c615600474d02712e75cb84a2ef108c695a2289647976331e12a5d2de831cfd1af01f7bd7e0dbaa7cfda963d5b78f403b694a3db4156bffe03be0 WHIRLPOOL 3aa979f593f0fa93e5c08e008bc49205587dbabd4c7f650e563b55ffa663b70842b1c613f34293e3c093c9bd1483d2f5e6ccffe92db57d312fabec9e9ef0a8d2
 EBUILD terminfo-0.3.1.3.ebuild 734 SHA256 ae939f052eddbcdd9482d773f99f139b288de699295173ba3607422e351d699c SHA512 8ca263c6df8305da2b29562dd1fcd214e15ea953de2081b732736f89f95b9ff442d0955d0e8801f84ddd14417b5c7b3b4b66b4dcb6bd3a932f81c1b66c462a8d WHIRLPOOL fc84f55264eb151ddea77d8dd8f6be12d9e302ee28ffd9f3ba4b108bc0af972a698458ca9c8947e782ebef27c8d8b0242ab3a70f06f3a5b14a384c16a5b0edb2
-EBUILD terminfo-0.3.2.3.ebuild 745 SHA256 b39fdcda3095500d8fbf0dad9cc7bcfe766461534ab58df006b07f1ad594c3b7 SHA512 81f02f7b5654b5257a2347711969687527d3ac854cb91608f4bfab873c9b1343b235fbe78384fd9ae1cbf83e03c72a3bbf353f2c6fa0150c24038f2c3d2b6b63 WHIRLPOOL 2a38b4fa3609b507310a60e60062301721b0cfa7aa8a2f6d37cd8a805c4a1fe4d7f3f34d439953572b16dcf605941699a233542806ddd9214e28872a01dcb2b3
-MISC ChangeLog 2768 SHA256 69ef1fa6e64daf7776c0e66028b893cfcb439b8c7dd95d20fad242402403a3d4 SHA512 5fb3bd2da2565e9f4fbb3088474a808c4743540fd0bbb89d914c86e967efd1ade4722ebf7786d3231bb32ea595e0712cc0ea2a378df3bd62130750dd7fb4eab1 WHIRLPOOL 35c6f561113076ea88f6c10e6b39c048d076496a9adb77bfdfd602f248f9a4f353b4eaef1f9229330169110183da4df189a8ae31749b6d745df64170f5bfd12c
+EBUILD terminfo-0.3.2.3.ebuild 738 SHA256 497e76f8bb07af34838c86b77ea99f3ea020593f917c9f89791c416b47b9d573 SHA512 759bcd85081ab087d4bbcc9858553ef21e44624324c4b57912331df49d79a833b8f93436252c8a8ba8dd7be8856537139e91d6cf225052b15af1116f1c51668d WHIRLPOOL 6101ab03a56888878625a0316c403e52a7304ec16924ebeb652ba4960b4acd1d9edf376f012723d8e9e8ee229e5761158a56f1c6292d93647d634432d11ebae3
+MISC ChangeLog 2860 SHA256 0d33180e646de69102a1d762bf1740c65e8109e0f2d43badc59826ef461039e5 SHA512 826c59a9a03cdf9d4f1fa693c015867436aaf66ece776abe28bed67a5fb14b5db46d4bfa2d72a16d3f7a95486731d58187c47aa9b52c4caae2e9eda2b39ac63c WHIRLPOOL 514194ad5d977db760e973e8a6813b1637904da89e0f4f97e4b6a67232606f94e2f482813bcaebc2fac674f08cbfd61178eea3961f4be4925239e1169f14d28e
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEARECAAYFAlAj4FkACgkQakKUmsHeVLI5hwCgh7HYXCUGNjrMlz42OoEsPhd6
-rz0AnihfIwSSug6XVRnb5Ns3nv1sc6Aw
-=RNFT
+iF4EAREIAAYFAlA0AdkACgkQknrdDGLu8JCabQD/f6uDZd4MeX6P+s9I9r6KRFg5
+US2iICeNqKyyzTyxUuMA/32vPmdaE5L0sptI20JINMeJ8ltjUnpx44o3SK0PUcPx
+=nemc
 -----END PGP SIGNATURE-----
--- a/dev-haskell/terminfo/terminfo-0.3.2.3.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.3.2.3.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/terminfo-0.3.2.3.ebuild,v 1.5 2012/08/09 16:12:06 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/terminfo-0.3.2.3.ebuild,v 1.6 2012/08/21 21:46:54 xmw Exp $

 # ebuild generated by hackport 0.2.14

@ -15,7 +15,7 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"

 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
 IUSE=""

 RDEPEND=">=dev-lang/ghc-6.10.4
--- a/dev-lang/niecza-bin/ChangeLog
+++ b/dev-lang/niecza-bin/ChangeLog
@ -0,0 +1,9 @@
+# ChangeLog for dev-lang/niecza-bin
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza-bin/ChangeLog,v 1.1 2012/08/22 03:28:07 patrick Exp $
+
+*niecza-bin-20 (22 Aug 2012)
+
+  22 Aug 2012; Patrick Lauer <patrick@gentoo.org> +metadata.xml,
+  +niecza-bin-20.ebuild:
+  Initial import, ebuilds by me
--- a/dev-lang/niecza-bin/Manifest
+++ b/dev-lang/niecza-bin/Manifest
@ -0,0 +1,4 @@
+DIST niecza-20.zip 1878083 SHA256 2ca2542c563130c5d4b45d5bd251601472695457568fc63cab6b6cbe3969c0e7 SHA512 2d587029a1037fca3901c0c1caadd6f6e5d9951d6804c54ef0262b69a7429c13458bd4e6eeb83a823ecb02afe93a3e9d0364065f1ca37412c674533a290363a6 WHIRLPOOL 580a62dbfdec49546c19b567b477727f3ff41a355b5d8cf50afa0418feda7768012049bf86737e97eb489b7871432835169b007a7ec7f65d3ed1ef487a7d0c09
+EBUILD niecza-bin-20.ebuild 849 SHA256 dd3ef40e92bfdd2119839b2a095156473dfbfbf587d81d87cd83985590e45e6a SHA512 2cea4a36c6c9d97cee16c6ff05b9f57b8dce80e9d05e6a4f736546614e45db07285066b48141ad6138b2757854c1c0262d9ab3a53e13b80ad85e2360b95d8709 WHIRLPOOL 8d04fcbd026c32a0a7a5c9e2e99de9c064f3c5ea3897623cf5222430e59451390327de78692bc102389b2646000ba1423054236748b5b7235a98402ed2a3522f
+MISC ChangeLog 364 SHA256 0b605ad27559d2e6e3fc715def73e3d669915dfc278b0f2ab6817fbc84e80410 SHA512 677d8b0de5cb8f03cd9ff5c161d71f7d35612b7be46c4c31ed3e7d6c150d74e30dbfc005bc2a1e1e9c67f9f7cc559fba71c36bf38b52731607e642a913809c89 WHIRLPOOL ed8293973543c191b2ebe25964bd51725a5397756cc31764de49490df66e1aa7e5a10d8138d81a3aeec3453ce74f853993c9ed34774a6672bd0b04364adc4351
+MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
--- a/dev-lang/niecza-bin/metadata.xml
+++ b/dev-lang/niecza-bin/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-lang/niecza-bin/niecza-bin-20.ebuild
+++ b/dev-lang/niecza-bin/niecza-bin-20.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza-bin/niecza-bin-20.ebuild,v 1.1 2012/08/22 03:28:07 patrick Exp $
+
+EAPI=4
+
+inherit eutils multilib
+
+DESCRIPTION="A Perl 6 compiler targetting the CLR with an experimental focus on optimizations."
+HOMEPAGE="https://github.com/sorear/niecza"
+
+MY_PN="niecza"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="https://github.com/downloads/sorear/${MY_PN}/${MY_P}.zip"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/mono"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	mkdir ${D}/opt/niecza-bin -p
+	cp -r ${WORKDIR}/* ${D}/opt/niecza-bin || die "Failed to copy"
+	einfo "The binary is installed to /opt/niecza-bin/run/Niecza.exe"
+}
--- a/dev-lang/niecza/ChangeLog
+++ b/dev-lang/niecza/ChangeLog
@ -0,0 +1,17 @@
+# ChangeLog for dev-lang/niecza
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza/ChangeLog,v 1.3 2012/08/22 03:50:29 patrick Exp $
+
+*niecza-9999 (22 Aug 2012)
+
+  22 Aug 2012; Patrick Lauer <patrick@gentoo.org> +niecza-9999.ebuild:
+  Add live ebuild
+
+  22 Aug 2012; Patrick Lauer <patrick@gentoo.org> niecza-19.ebuild:
+  Make repoman happy
+
+*niecza-19 (22 Aug 2012)
+
+  22 Aug 2012; Patrick Lauer <patrick@gentoo.org> +files/fix-bootstrap.patch,
+  +metadata.xml, +niecza-19.ebuild:
+  Initial import, ebuilds by me
--- a/dev-lang/niecza/Manifest
+++ b/dev-lang/niecza/Manifest
@ -0,0 +1,6 @@
+AUX fix-bootstrap.patch 456 SHA256 6645fe985d3f3a65db8b427575e9ceaa293ce553f4daa56f9aa2a395c2d7325e SHA512 2859e4a897e45942aaa0bddcc105ba700ea61e00744b6f065eda73e5f8a218ab5a7116cc2644e86816091d903c99ea04e6d805b4deb6cb8d00d422e4225d7961 WHIRLPOOL 3b12e379ae5427c2ce497251dedf38370e3e99e72bfc8f0ae99d46518506d4df4e05fedfc11bd126d3203a5ed453a409fb88ef9f1b23e85f127197bc3614bf1b
+DIST niecza-19.zip 728618 SHA256 b320a72e77531515bafb2c1e1588572f39f24e9c38305eb4cbe60569e87845e9 SHA512 3be02a89f9698724fd4a5d8aad0dd2946a5cb4ace9bf519d0ddb52d159596beeeb162884a8b98b4fcdf8b322149ae222b3dd11caeb369218d73afe3194ab186c WHIRLPOOL 5e627ce9d885ed059bda2a898518bce551d82ca7801f5239b010316d5ce2aaf7c70ca063c73b204f06b72825158650a30653092ba86156e25021ad4bc67569b5
+EBUILD niecza-19.ebuild 1505 SHA256 4884b57223738c4180c4050c93afb0ddf488adae59b20a06b4e5ea8540464eb5 SHA512 4a51f04f623b153d8bfd4f976849701cca52c9b9742c032f2b6491e0f74eaa1221023e1ee06fa778079fe2d02f19cf3ba5731087ae2c6c8f2a310cbe8a46535f WHIRLPOOL 2027fe7aa75c575cb42ec0c74400649e8c2355e771bf65f457b756f33c2c942b281558379092b03dd28abd9a07365c5ec0fd6be61801025e7bdad79fe6e32221
+EBUILD niecza-9999.ebuild 1400 SHA256 8912ea54d2fa9a6c86cc103bec17513c9cfd1ca9e423e21e4c80d66721eea1c2 SHA512 674600690dc0a675c9fba3fc6490e0caf9921553b284f6e4a6454ab54002f14145566421d16631ec8bf61ba06c53bfd1e5742e14273bcc657fc1f8fe2d977c2d WHIRLPOOL af31dcdfec13edc74caa3925a585e6504a4be33e4a215bd4e89901aa03b8f75c2e019331e73bc8ce5605df7b4220c2104af8479ad5531ef6656624e7029afc1d
+MISC ChangeLog 584 SHA256 fac65f968dcb3e7325c479a6d2b18110b0779f0f56eab9aa3ed2a4144a5c090e SHA512 2b87d3fc9049efd4eed3ecafc3a35bf98e967f8d394160f442721dd42310eb9a7712086f1b397a3ea70105ff7385a6d9c8622c392cfdf5beb9f9618f78bcca8f WHIRLPOOL 28b47f315c3419308a782f31584f4abeaaab702efaccdea9e801850051008d1a376cc4cf176ed27c789cbd13cf5e7c1eac07c8bc8a1ecfea4cf3d3fa3b50c656
+MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
--- a/dev-lang/niecza/files/fix-bootstrap.patch
+++ b/dev-lang/niecza/files/fix-bootstrap.patch
@ -0,0 +1,13 @@
+--- Makefile    2012-06-25 22:30:16.000000000 +0800
+++ Makefile.new        2012-08-22 10:55:22.879717085 +0800
+@@ -37,10 +37,6 @@
+	$(RUN_CLR) run/Kernel.dll -gen-app Niecza boot/obj
+ 
+ .fetch-stamp: FETCH_URL
+-	-rm -rf boot/
+-	mkdir boot
+-	wget --no-check-certificate -Oboot/niecza.zip $$(cat FETCH_URL)
+-	cd boot && unzip niecza.zip
+	NIECZA_KEEP_IL=1 $(RUN_CLR) boot/run/Niecza.exe -C $(libunits)
+	$(CP) boot/run/Kernel.dll boot/obj/
+	touch .fetch-stamp
--- a/dev-lang/niecza/metadata.xml
+++ b/dev-lang/niecza/metadata.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
--- a/dev-lang/niecza/niecza-19.ebuild
+++ b/dev-lang/niecza/niecza-19.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza/niecza-19.ebuild,v 1.2 2012/08/22 03:34:07 patrick Exp $
+
+EAPI=4
+
+inherit eutils multilib
+
+GITHUB_CRAP="sorear-niecza-3743eb0"
+
+DESCRIPTION="A Perl 6 compiler targetting the CLR with an experimental focus on optimizations."
+HOMEPAGE="https://github.com/sorear/niecza"
+#SRC_URI="https://github.com/downloads/sorear/${PN}/${P}.zip"
+SRC_URI="https://github.com/sorear/niecza/zipball/v19 -> niecza-19.zip"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/mono"
+DEPEND="${RDEPEND}
+	|| ( dev-lang/niecza-bin dev-lang/niecza )"
+
+S=${WORKDIR}/${GITHUB_CRAP}
+
+src_prepare() {
+	epatch "${FILESDIR}"/fix-bootstrap.patch || die "Failed to fix"
+	cd "${S}"
+	# bootstrap only works from git dirs? sigh :)
+	sed -i -e 's:@git describe --tags:echo "v19":' Makefile
+	# silly workaround for stuff trying to write everywhere: copy the installed niecza here (sigh)
+	# since we have different installation paths for the bin version we need to check here
+	mkdir boot -p
+	if has_version dev-lang/niecza; then
+		cp -r /opt/niecza/* boot/
+	else
+		cp -r /opt/niecza-bin/* boot/
+	fi
+}
+
+src_configure() { :; }
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	mkdir -p "${D}"/opt/niecza
+	for i in docs lib obj run README.pod; do
+		cp -r "${S}"/$i "${D}"/opt/niecza/ || die "Failed to install"
+	done
+}
--- a/dev-lang/niecza/niecza-9999.ebuild
+++ b/dev-lang/niecza/niecza-9999.ebuild
@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/niecza/niecza-9999.ebuild,v 1.1 2012/08/22 03:50:29 patrick Exp $
+
+EAPI=4
+
+inherit eutils git-2
+
+GITHUB_CRAP="sorear-niecza-3743eb0"
+
+DESCRIPTION="A Perl 6 compiler targetting the CLR with an experimental focus on optimizations."
+HOMEPAGE="https://github.com/sorear/niecza"
+EGIT_REPO_URI="https://github.com/sorear/niecza.git"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-lang/mono"
+DEPEND="${RDEPEND}
+	|| ( dev-lang/niecza-bin dev-lang/niecza )"
+
+S=${WORKDIR}/${GITHUB_CRAP}
+
+src_prepare() {
+	epatch "${FILESDIR}"/fix-bootstrap.patch || die "Failed to fix"
+	cd "${S}"
+	# bootstrap only works from git dirs? sigh :)
+	sed -i -e 's:@git describe --tags:echo "v19":' Makefile
+	# silly workaround for stuff trying to write everywhere: copy the installed niecza here (sigh)
+	# since we have different installation paths for the bin version we need to check here
+	mkdir boot -p
+	if has_version dev-lang/niecza; then
+		cp -r /opt/niecza/* boot/
+	else
+		cp -r /opt/niecza-bin/* boot/
+	fi
+}
+
+src_configure() { :; }
+
+src_compile() {
+	emake -j1 || die
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	mkdir -p "${D}"/opt/niecza
+	for i in docs lib obj run README.pod; do
+		cp -r "${S}"/$i "${D}"/opt/niecza/ || die "Failed to install"
+	done
+}
--- a/dev-lang/nqc/ChangeLog
+++ b/dev-lang/nqc/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/nqc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.20 2012/07/04 19:46:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/ChangeLog,v 1.21 2012/08/21 18:33:20 hasufell Exp $
+
+  21 Aug 2012; Julian Ospald <hasufell@gentoo.org> nqc-3.1_p6.ebuild,
+  +files/nqc-3.1_p6-flags.patch:
+  respect flags wrt #432200

  04 Jul 2012; Justin Lecher <jlec@gentoo.org> nqc-3.1_p6.ebuild,
  +files/nqc-3.1_p6-gcc-4.7.patch:
--- a/dev-lang/nqc/Manifest
+++ b/dev-lang/nqc/Manifest
@ -1,10 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX nqc-2.5.1-gcc34-fix.patch 425 SHA256 4bc45e56d2170a7839f20c1ee95cc09b3fc18413a8e09eb9be6b932c5ca8cc4e SHA512 50594eda4e1cb49d554618e8498fa69b6834ebed2e74545a5b12541eca6387db18bc6ed729abcb80a525b7b8591f28b6fbcc1daaf2e711602c587ac2f95491af WHIRLPOOL 7034a5c40f6b8731c4a0b818d8166630ced3bf39d70d3faa4fd2cfc32ace61d5c8f071ff70446c196eab122215727747a7bc2fd871cdfbac94121387338b31f5
 AUX nqc-3.1_p4-amd64.patch 558 SHA256 6deef54a5055f021e0a12fcceb3d549a2d14c3d0afbd616aa2c410e7d26b48c4 SHA512 0626ac5e5df34fc3fff4d586a469e3599c3e009dac846638c6b74b48202b4990dd290f957168a12290be5d5a46212dbf55da2b4cbc88cfc9497c7d5d2a4bf738 WHIRLPOOL 3ed8cd473d073f793fba7fc78fb737e4dfc1815c95cb8b74316ccd854a37e1668360da3c2c5ce9a746cc86057da669b1fada1baff105c7e2fe6671306b5b3a50
 AUX nqc-3.1_p4-usb.patch 924 SHA256 95e46c483aed06df20dad0a6e817953733425fe9b3b94d0f60d0c2253e41f8c6 SHA512 f17d3fec5e4689dc3de85f597d36739ea52149204a40f54bdb5f8204480573ddf47c64b8c33f8551b63fff3fd52522ab8c5c05c78bf9505fbec2f0048f112df6 WHIRLPOOL a02d6ca22482f4333313cc808a01d8951fd3a01181ef7d82625b9a7ae64eacb1cbbef0a02f3aaf60d8053b5df25247af4b43a592d52b14b63cb26986c26807da
+AUX nqc-3.1_p6-flags.patch 1950 SHA256 11db79ae3b20b2307300d2ae6793196805cc8e09d5492d4da90dc5c9815028f7 SHA512 e6cf6a01aca794e8d70e92b2df1d4e02dadb5e518892a15737e7bd54b3973693d09a277b2739c9943249d438de346c30e4eadf2378b17d645a6c506eb8c09ddf WHIRLPOOL 2489964c46abd84913a03f9bb93a6ce440fc8e7261442895fd0b2dd70020206f93b51d9e0c1b80409ab57840f90fcd1a1f82b7e58e0a358bec38ee0270bffecf
 AUX nqc-3.1_p6-gcc-4.7.patch 412 SHA256 072ef0b0f53bfb1b2bdca8d0b81d7eb57b76629b1e3e6a75e853ba514909fd42 SHA512 dedf30422b5e5170ca0c55947e184ef7b612e8a4474f020f8d244ba9e1b497ce0ea5682f4022570b737320099dccd2e0da2584a38c0c482bf14dc08e4d5ad8e3 WHIRLPOOL c207f9b389a1c82900841bb87ddc06d7fbb15cc7e6056f376150b8ce228e12bbb689d68c2674087549f1553609918970d99ea9e7e132aab11e0ccb480d441a04
 DIST nqc-2.5.r1.tgz 215808 SHA256 439eab22f21e8e28c296c17dd2340956a8c4b2a75d868885df49202d0a8795e2 SHA512 0653072ce2b711c3ec8930dfcef774ce6ed56e96c2722cd30fb78a9fc169e42dcc0379a685f4e1a7880674ad15a46cd558af5d7fb84c89206eb3eff87beccc0b WHIRLPOOL 29104b5333ad470557f0a87e970bdbae932ad45101bfa3ec151b306fb673672f5b1ea90a0136bc15f513a4f0436999b47a1e97cb37de28f2fd02e021258ee2e0
 DIST nqc-3.1.r6.tgz 329410 SHA256 bfd5e654f639af7a588cfdef4d22bd5efcfff547b10a56cebebde58ef2bfe766 SHA512 7ec7015861b5f8e063e3a2567f5c6ff7e5c6a65b60fab9bef71411d59b13a588f284ee3a8d06b9325748c209e21f9480b9792bc605148e2a4af64b90f872e2aa WHIRLPOOL 72c2dcb63bbdc1a1d35e0bb17c1c2838f688c69ef48d0958663c99c48855454b99a586603309b238e23eb6adc87edff40800c9ff1f81c12829d61d7e95b0a757
 EBUILD nqc-2.5.1.ebuild 1234 SHA256 e8dfc0be1a07e00d67874d5fba98f83c322dd7933ad61f8ba28b735894b2947c SHA512 9717eacf453073724ec4921638b761e556af31d7c95cd817c69f74f4f115020de4e5c6c87f01593541b527ea1582b8946ce35db9a850a8accf780be33148c26b WHIRLPOOL 8f5911c9ce0b3236193606b7efc92b5d64db8e8995fe0e615a6be9e4d72fd8ae36f671f9d7e58da034216898ec82671d5f6c40bb979f3d3144357579ebc7f113
-EBUILD nqc-3.1_p6.ebuild 1531 SHA256 8776b38a693018d187d43cdaf3ade675cd24f14f747f3e3bba972e3e3ddb5e26 SHA512 f07fbbf83072614458ffcd476f904b8d9b9746f03e2762835aee52564f2dac868b2e1dae5282ce852b41d898f48c2d3081f6f760e1c4cd056206af2060858c3b WHIRLPOOL 74986b8cc555e91a343551a45881bef3f06f6049c15e3024f521832367b9563aac543d40e97241ca1bafe650dd6da56b965dbae0f6f8e216b6bd7995164023c4
-MISC ChangeLog 894 SHA256 93cb6be3d89f81f0b3e625bfe7e70095ba0f22df5838146d615b24bdce0a2cc1 SHA512 c505781b93aac6e1d49dd24ca4d3bafa97a5dc7bdef2ff6a421846e1c314ed2c78309dde9bbd34b94b7192a815377c5b4b12d05d9b1f000634c9e57b76954fea WHIRLPOOL 8c83d23775118c934d327bdcd1cfd070f8da4b6ebb820d3efc17849257884b1e294ce0e443a988656e1da2222571a996b9dffeeac11a805b1fb4bcc83dbdfc60
+EBUILD nqc-3.1_p6.ebuild 1390 SHA256 93e18c2a9c9e66d0b923704b7fe8e9f6709f6dbc254a7b4c056b2097fbf17d78 SHA512 d3b45bbdeeee63285b6916eece2cb02a17ed780e4aa799d041143191d788165adb45bad6474232fcdfe0f3eebab8cdcb7fa4ab4be9c0012dcd1ffb9d54a3c821 WHIRLPOOL 973e5e3323a1e17023003a0befd6a895a01c0c0b2c7a7f328d26e69edfe4527d225b32ad8f0918c29813f6decae91abcd4d7b05dafb6a4dfc6c88795adbb05cb
+MISC ChangeLog 1030 SHA256 9126e085bbf71a6e44bbc8bd49c51952433055d34297e81bc1e146c64cc6277c SHA512 cc3dfa54e28d045271c25295d2f27ef83b8b1caf85ccf06593b2332c9cd2afedfbf7c891c0ed3dd75be0a6cda96440e87e50f3c208b1d3c30058dfd591982121 WHIRLPOOL d335253bfb5b2ca0ad5abdc3ff27a20dd02dca4012aaaa0f3b8bef5dcc89691efffefe8c57d44f8e9aa2954432a104b3eecdd47676a29dc9631c40270a54b9e1
 MISC metadata.xml 268 SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb SHA512 8e365ead118785104bc7576a48a106346ef24f5b709349f8ca3d5fb9107a248d0f172e6898fb4ba4b2b7f84e6c8c7960578a2919e1a3692664cb808b16e6b2b2 WHIRLPOOL 255e754b42ff038b07a48321ced9fe6f8acdc99bb85873807b3e902517a1764dabc7152e5ca9ad4d83ab5dc9d3a611f79e6c066121be77aed3cad1b0f3587b73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQM9NIAAoJEFpvPKfnPDWz17IIAJ+KlijV5gcTMTAAYjUxDOis
+PFcksUciTOxpcZOv7B7Egop5y6ICseBtAtcmqKhtvsrL+7bi7sgF19nZtFXq20AL
+fg04jTHQTEwX0JGB/GOCn4i9OQCFxG4/HWLWtcpGwwyaDkoOcQzMRdswYgH9WVv8
+RvjLrrKiPdoevKjw8wBglft+q43qPfk1UE4UB4EFPOtQAg48E9S6ku10wnpR9TqK
+krIgvdQ128m9An+LMqo8IT6fpQ2wvBNNHbChk57cloL2DH1xti9SNvQr6fONa81r
+U/CruPorHv3E0Ht4dIPNzXz7mttFAQ8HFGgLpz91h3EYFKAwgxIZKtXObXAOEuE=
+=78pN
+-----END PGP SIGNATURE-----
--- a/dev-lang/nqc/files/nqc-3.1_p6-flags.patch
+++ b/dev-lang/nqc/files/nqc-3.1_p6-flags.patch
@ -0,0 +1,73 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Aug 21 18:14:15 UTC 2012
+Subject: build system
+
+respect flags
+
+--- Makefile
+++ Makefile
+@@ -67,7 +67,7 @@
+ 
+ # CFLAGS
+ #CFLAGS = -pipe -Iplatform -Ircxlib -Inqc -Icompiler -Wall -Wstrict-prototypes -Wmissing-prototypes
+-CFLAGS += -Iplatform -Ircxlib -Inqc -Icompiler -Wall
+CXXFLAGS += -Iplatform -Ircxlib -Inqc -Icompiler -Wall
+ 
+ USBOBJ = rcxlib/RCX_USBTowerPipe_none.o
+ 
+@@ -87,20 +87,20 @@
+   # Linux
+ # uncomment this next line if you have the USB tower library installed
+ #  USBOBJ = rcxlib/RCX_USBTowerPipe_linux.o
+-  CFLAGS += -I/usr/local/include/LegoUSB -Wno-deprecated
+  CXXFLAGS += -I/usr/include/LegoUSB -Wno-deprecated
+ else
+ ifneq (,$(findstring $(OSTYPE), SunOS))
+   # Solaris
+-  CFLAGS += -DSOLARIS
+  CXXFLAGS += -DSOLARIS
+ else
+ ifneq (,$(strip $(findstring $(OSTYPE), FreeBSD)))
+   # FreeBSD
+   USBOBJ = rcxlib/RCX_USBTowerPipe_fbsd.o
+   DEFAULT_SERIAL_NAME = "/dev/cuad0"
+-  CFLAGS += -Wno-deprecated
+  CXXFLAGS += -Wno-deprecated
+ else
+   # default Unix build without USB support
+-  CFLAGS += -O6
+  CXXFLAGS += -O6
+ endif
+ endif
+ endif
+@@ -113,7 +113,7 @@
+ ifndef DEFAULT_SERIAL_NAME
+   DEFAULT_SERIAL_NAME = "/dev/ttyS0"
+ endif
+-CFLAGS += -DDEFAULT_SERIAL_NAME='$(DEFAULT_SERIAL_NAME)'
+CXXFLAGS += -DDEFAULT_SERIAL_NAME='$(DEFAULT_SERIAL_NAME)'
+ 
+ #
+ # Object files
+@@ -164,10 +164,10 @@
+ 	$(MKDIR) bin
+ 
+ bin/nqc : compiler/parse.cpp $(OBJ)
+-	$(CXX) -o $@ $(OBJ) $(LIBS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
+ 
+ bin/mkdata : mkdata/mkdata.cpp nqc/SRecord.cpp
+-	$(CXX) -o bin/mkdata -Inqc/ -Iplatform/ mkdata/mkdata.cpp nqc/SRecord.cpp
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o bin/mkdata -Inqc/ -Iplatform/ mkdata/mkdata.cpp nqc/SRecord.cpp
+ 
+ #
+ # clean up stuff
+@@ -227,7 +227,7 @@
+ # general rule for compiling
+ #
+ .cpp.o:
+-	$(CXX) -c $(CFLAGS) $< -o $*.o
+	$(CXX) -c $(CXXFLAGS) $< -o $*.o
+ 
+ 
+ #
--- a/dev-lang/nqc/nqc-3.1_p6.ebuild
+++ b/dev-lang/nqc/nqc-3.1_p6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild,v 1.4 2012/07/04 19:46:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/nqc/nqc-3.1_p6.ebuild,v 1.5 2012/08/21 18:33:20 hasufell Exp $

 EAPI=4

@ -20,13 +20,12 @@ RDEPEND="${DEPEND}"

 S="${WORKDIR}"

+pkg_setup() {
+	tc-export CXX
+}
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc-4.7.patch
-	sed \
-		-e 's|$(CXX) -o |$(CXX) $(LDFLAGS) -o |g' \
-		-e 's|/usr/local|/usr|' \
-		-i Makefile \
-		|| die "sed Makefile"
+	epatch "${FILESDIR}"/${P}-{gcc-4.7,flags}.patch
 }

 src_configure() {
@ -35,10 +34,6 @@ src_configure() {
 	fi
 }

-src_compile() {
-	emake CXX=$(tc-getCXX) LDFLAGS="${LDFLAGS}"
-}
-
 src_install() {
 	dobin bin/*
 	newman nqc-man-2.1r1-0.man nqc.1
--- a/dev-lang/opendylan/ChangeLog
+++ b/dev-lang/opendylan/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/opendylan
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/ChangeLog,v 1.3 2012/08/21 08:30:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/ChangeLog,v 1.4 2012/08/22 03:42:00 patrick Exp $
+
+  22 Aug 2012; Patrick Lauer <patrick@gentoo.org> opendylan-9999.ebuild:
+  Remove keywords from live ebuild

  21 Aug 2012; Patrick Lauer <patrick@gentoo.org> opendylan-2011.1-r1.ebuild,
  opendylan-9999.ebuild:
--- a/dev-lang/opendylan/Manifest
+++ b/dev-lang/opendylan/Manifest
@ -1,5 +1,5 @@
 DIST opendylan-2011.1.zip 12228195 SHA256 5031ea08cc99093eb7187a1dcff766090ba47a2ffaed01fc8115167eb2ff8084 SHA512 5262dee4d854ff83ac738e5301844431a73019bc152aba47206fafd6e25c2e377e883a65228f3d4b2827ece19a55365c05876cb8d0f86d621d9274560ff541b5 WHIRLPOOL edb960dc4e12c6b442b5a8eb47fd2cdb717770fb6aa20a6e743cd1b4afb6a4c383de65c4260d685b8ad441de38443d10be72f049687a5a0e9a9795ab516a247a
 EBUILD opendylan-2011.1-r1.ebuild 1541 SHA256 599abbeb3e309e7d88e0d2b69ad30bf78f200477b0aabc4a944b96987de24257 SHA512 0ac904d698f420922038a92aad77df2420bf86a5f414ee808b973c3ff71cd9f2455531307fc3c1989c49929d746146dcaad49b0a2718740385114239958ff43b WHIRLPOOL f4838de619607e29b950077556aa310c8ccdd2fff0d73c76f24e04d3b09abd04b44628a3507223c25cd278bbedb77a8283ce87ebd6d2c1f041df0276f73c8631
-EBUILD opendylan-9999.ebuild 1475 SHA256 adf3d3ce141fb00e023692aad9840a4fdc9f4a04c98a4d1ef498fce2f822284a SHA512 d1916958cfcf91d396657fd755bdcf54b93edb64ca165b1d233542066200c55898c06095ed08944255cbd339418e75a476e4621b957ba8613df0362173bb5de3 WHIRLPOOL 4b59d072d9a88d6ffa5d8fddac72193385ebf20d0650904e58b96adf57d9172a21dcab6c5470b019e76115549e7302adfaea6273bf2ab78d06d033c668f3c23e
-MISC ChangeLog 731 SHA256 cb7639d92c39c0d1b8e9e3f17954d0e417f9d1d9e7ad9d6ca6f60f60c5b61a5b SHA512 d319df42bdac9a9f5cb3ebf624532a1cc88a9c988530e2587d33e6897a187ec35968030a120856863ee55a5555302cc1489982d5a206578177dd0c1c3bbe725c WHIRLPOOL 59b57d926d26b6d330e80ea6d4935910828bfaee2b6523c16ffb33a8bae3c367b4bbf9a087860e21ba730d7bac6c47a5698afd236310b914171adaba95b71123
+EBUILD opendylan-9999.ebuild 1436 SHA256 3eb2bb8212982d9834646a5107ef3c80f35c74bf498f777f305a07bf436be716 SHA512 6bcbddbf758512d7ba9b4121679044283ec6e8b0adcb004cd06a54b0ba8d2e064dc4b73c6ccb4ea07c01dcd7cb6790258c297265b4b6455cffe8cb64684da60f WHIRLPOOL 952f18068c4ea2785154b5737847ed930a57766fff7c4f8613cf34a76948da689d6320687218e56517c69b210c8c64682c9b55288b48b4ffb844979be022fc98
+MISC ChangeLog 840 SHA256 86f2b0ab0ac7c8dc3177f4fa0586b755603f416aff7cc4669e2274288f50bbd5 SHA512 62b6c4303d16ca8e89df833ac5d0337c964394140fd01740192f231be659d903eda917396aaa4c4907d3ec775c8f01d843f27105b179e09e725a615a5c02aba0 WHIRLPOOL 79649e035841b39c918f131d31a620059172e19656d91325b35e2d21dbd59c84c5e2f679051fdc8f881de70fa0acdee35a3464d8aa0c649b16b2da7b67852cb5
 MISC metadata.xml 233 SHA256 65209e280ca6de32a92e1a57301ff69fb3472e55ba07848d6f80405d35e92d47 SHA512 0d30bfb39315a04767e07896409f5d3954f8e954e20fcbac7b92bb9a636c9f61c50b1b2cf55e6c1db9a199a0edc159b5c8cc8f541efb9c4adafa28e3652cff7b WHIRLPOOL 027c5101e1cbc665c9d2ef240f73a874c9f49a9b70175c5947e012df61de484585088a46b6ce9078816e548e6bcc326e7223539cc999159eee2757d0a2eb1480
--- a/dev-lang/opendylan/opendylan-9999.ebuild
+++ b/dev-lang/opendylan/opendylan-9999.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/opendylan-9999.ebuild,v 1.2 2012/08/21 08:30:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/opendylan/opendylan-9999.ebuild,v 1.3 2012/08/22 03:42:00 patrick Exp $
 EAPI=4

 inherit autotools git-2
@ -16,9 +16,6 @@ EGIT_REPO_URI="https://github.com/dylan-lang/opendylan.git"
 LICENSE="Opendylan"
 SLOT="0"

-# not tested on x86
-KEYWORDS="~amd64"
-
 IUSE=""

 DEPEND="dev-libs/boehm-gc[threads]
--- a/dev-lang/v8/ChangeLog
+++ b/dev-lang/v8/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for dev-lang/v8
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.222 2012/08/17 15:54:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/ChangeLog,v 1.223 2012/08/21 23:23:00 floppym Exp $
+
+*v8-3.12.19.4 (21 Aug 2012)
+
+  21 Aug 2012; Mike Gilbert <floppym@gentoo.org> +v8-3.12.19.4.ebuild,
+  -v8-3.12.19.1.ebuild:
+  Version bump for dev channel release.

 *v8-3.12.19.3 (17 Aug 2012)

--- a/dev-lang/v8/Manifest
+++ b/dev-lang/v8/Manifest
@ -6,20 +6,20 @@ AUX v8-3.10.8.10-freebsd9.patch 421 SHA256 2cd4acf369ae32d549fbddfe5605379e1563a
 DIST v8-3.11.10.17.tar.bz2 10115761 SHA256 9b15a405097f4ba8c3b0f2ef8bc8d6604e5cfa146d1fe96f8bd5b8a65c536941 SHA512 eea861f77ca324885aa42a6c49cc0a6731f2f6d10b505f5f881912a391e8d988a29f194d21a8aefbd942ea3f2d4dbc7330ea10d34450fde9c6fd05ee81731bbb WHIRLPOOL f3747e91982003f460d24e227f76b772c98f5037c216eccadcd78690b42ca17788bb7bffca77291ad1da5e0332b9f8320ac3d3675dd5fb12278dad5d5466e85e
 DIST v8-3.11.10.18.tar.bz2 10115489 SHA256 daf26727982f258721ea686e9f54317b58c07e765a10ddcc493e75a56963bad0 SHA512 a387ee09f1df5d2d7d457c45b7714acfaef331c6d9c7959bc26c838de8e79658a7b50c6293327e4f185543b4f54cadcd08ba87bbe34d1cbf5830671732dd3e14 WHIRLPOOL e610920ea4465b135df1f561536cb7071677890945d8160b1cb03c5f490eda7846040bf494b08bbfda76f7b9841aa171904860d4e145056f29601ef3ee41f76f
 DIST v8-3.12.16.tar.bz2 10179067 SHA256 ae78a0b5d0d5254c928ceb49ad15dd42fda7bf7f94a48f0cd8abfdbf7830e536 SHA512 e717281226da94669b340244ee0fcf899cdbe05215f093f177cae9c8b2e2b183ad7a98035d1894b6c5b07dccace6d9ca406ba3d818913a972673b11d99afb77e WHIRLPOOL 17313ed6599bc56ec12b5fb6f39f260225fedb016b3e4a5aea9abeace3d4bf42e4b69ba5186a5920ae4d0a5f859caa34d39dbd084f71ab72e1c885b824e0c96b
-DIST v8-3.12.19.1.tar.bz2 10183101 SHA256 9a631fca8905f6a438a7394711ecef34cfda40f5f59634840efea34079d33b4e SHA512 ee8d150a124c9a76c2bfc4af8979ebf6ee92a67334190fe6b14ebfbb6b2f13b404ed64f8d103d1decc820252b8e999e77a9f3989e762f399f8e9aa6537979da5 WHIRLPOOL 8db519a824c05daa252a80757bbde5c911759e26f1e778e1189e1e4173e004b78290288dc53dad1952a118182b48755ac3c8f16f841bf17453bb85ce878d80e7
 DIST v8-3.12.19.3.tar.bz2 10182696 SHA256 7269cd3f37beaecf672a433d5c91915d5f96559de626de1262479c982ee196e4 SHA512 8cc77e4d4ff488674463b23a49c15c4281f1d3fba80ea3391f797fd2f4e202f79e5386ad721de72e50c92dd6a7114de43d0df4b0ae789ad4d9e558973eec9b30 WHIRLPOOL 3bf8fa6975e8038eec26ba946c7aace3c7e9db181749cb548885b8eea5a8e7ad81455c259ac1995809ef37b0ffdf2cc90becfce092ea92dbccf345f7118c9aad
+DIST v8-3.12.19.4.tar.bz2 10181859 SHA256 13522f20c82c2d97f01eadfd3c883bcb02f1ae419f845abd3ff1211e0d490f9b SHA512 be082425ce7841c115895b8ff67b076b0adc8d6e8ddd4504b746652097cc4f2de4f75684c1c3f961c18fe43c912c398f63960416a01d37ad7f6f414a0bd793f1 WHIRLPOOL 2f38ed9831651e56408248782702e76f90c6f877145993bce2b1921953e834505797b8b208f56d1b85636916fe8cf3f62917de5ccb2a774008de0cb926bb5dce
 EBUILD v8-3.11.10.17.ebuild 3217 SHA256 95270acf082814db07b2bb7fc14486941c078425525829b0d4c29754bbb63be4 SHA512 c9379efd887b8eff543203cc95b7ebdaeb24106ba7752917f70f1897df097ecd89798941d5906fc1aa56ca2cfea32fadef4fd93c75aa2d0d50c25789229c0136 WHIRLPOOL 396e49ddaeeb864d2119bf23183ae4c639c312e537122f6894e080b54ffe667a11ccc9ed0f4fce63059ed7b01f596dcfff6c9c15ac2b38a966d7fa355ff5474d
 EBUILD v8-3.11.10.18.ebuild 3221 SHA256 f9f59a6a1a542747ec5a75073bb24bd732bf3d079458048400bfc06e390c9151 SHA512 9ec693294bf656af3b9fa98a93f0e7210a9378931359196e8f3f1d9a8114a4f847d52da374e94bac4de1610066d8b689c4bfee1e9727e25840396a611e33c30e WHIRLPOOL ab525b120181c3ea2838a6b56b6490ed9bbb3215d2d68dc0e2205ffcbfa266882f5ae25436306b3bac45fbe679c8ea39778290b06b8f699d87fabed56fd0b3d3
 EBUILD v8-3.12.16.ebuild 3218 SHA256 a4243c0eba479a057075b39a464fba550e4044cc0884739378be675483c9c594 SHA512 d2cffa0f9993848e0f712a04b35e256aec0932cdd7564481463e38a5985bcc42912cd01e353bba5b67ee2951288ad1de2c80be84258797bb078f8475e0223061 WHIRLPOOL 7c8cadf71366cbf36109b22816498c42fc8780fbadf758a498a2ca68546c22a6b55b751187870c60015f475094a622d3d328a8fd1691fec81326b680b982e984
-EBUILD v8-3.12.19.1.ebuild 3220 SHA256 1988688fe85c881833c7e563531c78aac48331fda597a2abc893b6509775db5b SHA512 c3a0cea148dbc7d21957248c5b2f30a447d946453b9d3d4690573700fa918ec06f7dc7999432e1cbaf3a519f5e11fbf0cd488d57d5a70bfc910733093f55285b WHIRLPOOL 79c80b25ff9b6e00da7a3e165fd072900bb48a8c999d37ac8ce03eedd690e74e8bdc8f85c1c52bf0ad281957f03f354b8b55d5e36f53d20e9e6abaa82e1f45ea
 EBUILD v8-3.12.19.3.ebuild 3220 SHA256 d32f71c8256470647622ebee3f1cd79786f398f82ee513f9963564cc949f4f27 SHA512 5e30a023dd89f19912412d3be6aed76da80ded709ea0396b76db38a2ca61d883f848b5eb20e6616cd79bb56748ddd00ce4e4286f06b3f8ddad85ce2b956e03e6 WHIRLPOOL 7109f8d309b94c941fa598d262779ca593672bb4241822bef5a6b61b2b04a7f65a4e3508e25c9c12c50fa83a9e240056611b93b3107d3631fbc37d490aeb43ea
+EBUILD v8-3.12.19.4.ebuild 3220 SHA256 9c2236fe73dcc8fa00fa4a1139428eba313a503332c67a304333a772199fd061 SHA512 477c7f0cfacd0602c8f491a7f5d894d9be3f3b7efb17e5d7f43ab7b599adf3751bc58d15a98eb29bc0f0f24632c8c70cad499cb7862eba07f8658837e00f5dab WHIRLPOOL afcf3973593346409eea1339165c6eb3d0c39a56b0a9aebae90c8bdf0d92e4084e0f14f03b1e98795b09dca938f531c92281fca234c140eee007c2d879d82c73
 EBUILD v8-9999.ebuild 3151 SHA256 683bbd0a7e19fb7fba4c4557d7abf00a1c38af5c4f3125cf790a33a211eb013e SHA512 4a32387bc7d3b2e7a4574e64ae4fd45dc7f36652ebde9f947360aed44d656413c97786d8e9e1910ac6321d9b68d2becb29dcc7cb06ee6caf936978d99f0bdaa3 WHIRLPOOL 48fac3056fbd32568b01115d66065f99f1ba466221bfd183e3b4f06bb390773c36e5a1a8b28d8b69da6f17239472474328e3aa5ba8c35dcf0ffd34cb07c64cc4
-MISC ChangeLog 35354 SHA256 3e202cde3b18acd49545f2def428b8df2ef7c765b98d483ee0efb21aba7f4f0c SHA512 2806a0248db620cea26c5ed9342772c167b0a0bc940ae49a460da5faa09b7aaac867d07da820ce76fe3ed879710ccb47c9445fc1c0fc102308af56c7eb3d6c41 WHIRLPOOL 03c7ee5c88d2b83600913b2b7903a2740c6b74b93e6df719e0ecbc408f032b8dca6e456292d6ca75bdbdf37db0ad31cc16a833c3b65bcae4861d4c12f1746a92
+MISC ChangeLog 35519 SHA256 4f921bef4f60c078d30a2d7b359a58095ec90025a23821c5eda73762bdc372ed SHA512 98824360b271df17555d7c7ddec07c1d69dc3fe4813e16b9cd5ec8ed107f855b24dacf6738c48b48cac1dcce604b05c9dde8309147dca5f40312ce0dd31edd38 WHIRLPOOL 2e9bb7066757c2401ac4da266a986be2701f82cf4fba21adec4da87e8209d6174223eae8e0a8075fd2280ac0d1e35a74088792d6d3f2cb40789641b7bce15289
 MISC metadata.xml 162 SHA256 8a3ecdcf518f45ec4843398f9896c9b4d1c867ff2cf2851cf40b06f756f111e8 SHA512 51796fe7e55b73dbfbe4a6b5fd089f5e8e4d327ff67d4a267692dda38380df5048ea77e8f058c466ae17726af5f099a3240b0500d53e421d95acc583164d3fe9 WHIRLPOOL 279b6ed997fab0d4278c01814bdd067068bceff8d1ce9933087828ce7598513b5a809013c996a3b134da6072c698a87ae151cfb56407fd62ff465b165197f5bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iF4EAREIAAYFAlAuaTQACgkQC77qH+pIQ6TTnwD/Tfmdz9sWge4F5mHZB+yfqr4G
-vBjXStfcNhiSW7EV+N8BAIRghLqJqGSqEwn9f9h6E7VFTXI6tdabPN+QAMClQRFC
-=soRh
+iF4EAREIAAYFAlA0GFoACgkQC77qH+pIQ6SVvAD9H/XGSv/+RwtPvtx4SC6Q9p8U
+UAK9Fj0UxT7dZWcPCPwA/RHW021Jq3SkpJxYwZF3bDVPHxI642rnhf456GrhHgvv
+=S5FB
 -----END PGP SIGNATURE-----
--- a/dev-lang/v8/v8-3.12.19.4.ebuild
+++ b/dev-lang/v8/v8-3.12.19.4.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.12.19.1.ebuild,v 1.1 2012/08/08 01:29:53 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/v8/v8-3.12.19.4.ebuild,v 1.1 2012/08/21 23:23:00 floppym Exp $

 EAPI="4"

--- a/dev-libs/legousbtower/ChangeLog
+++ b/dev-libs/legousbtower/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/legousbtower
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/legousbtower/ChangeLog,v 1.7 2010/12/30 18:44:10 jer Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/legousbtower/ChangeLog,v 1.8 2012/08/21 18:41:48 hasufell Exp $
+
+  21 Aug 2012; Julian Ospald <hasufell@gentoo.org> legousbtower-0.5.4.ebuild:
+  fix udev rules install destination

  30 Dec 2010; Jeroen Roovers <jer@gentoo.org> legousbtower-0.5.4.ebuild:
  Fix quoting. Remove empty DEPEND.
--- a/dev-libs/legousbtower/Manifest
+++ b/dev-libs/legousbtower/Manifest
@ -1,5 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 20-lego.rules 83 SHA256 2897c968ea6e008dc9b829c6f209e776aeb3a96e1add05002f0770421f517691 SHA512 1e708d5c5d1169075c6ba626cfb362e473e4d026c8ced32f888eb6874637bf7d655917b08f15738cb53eb4be78f8c243c795293862d109683e895507f30dfc61 WHIRLPOOL 17bd9ad89629dedf61855c27b180736fd4522fb9bf3d9e354b80fb9f89a3b69c37902b3c9d352bae095c234424f5baa7813e9cc0c31d1a0162204bb5bb24aa53
 DIST legousbtower-0.5.4.tar.gz 22782 SHA256 8f61267ab2036d1936fe70f49b454a23e151021bbcd7d4ed1663810bdee7f8bb SHA512 169cf31d4585bf3b7bd9aded76d202bb14e285f644f8aa10a6f4bf6d99e6f28efc33c65922388cdfa17a1bfc0dbc777edc1fb45484155543a42117eaba6fb7e7 WHIRLPOOL f98e4639828454b5a8c347a6b8b099802af194c0574ab52407e76dc188b780fc15dfef9f6b60f683f1121ba033a3f29f9e2ffdacb9dfa4e0a574f154312ef7d2
-EBUILD legousbtower-0.5.4.ebuild 1152 SHA256 52ebdef0d97ded1be01ca013b3c9aad1e956516fe308c616b676e511689967be SHA512 3471247c8b7962bd6169f7ea6542201d5f550e22e431bf8c35c23076815d0f02b99c1fc71b3013a0467cb2653d7aac2e137a1a83507988908e4da6531de19291 WHIRLPOOL 8f5696c594cf52af98752c8074d6672451cc394416c6e396b5a15709e513474ac2a2bc889d16331f7eabd944c4f7ec51a1017358bd102896af43b51b7bd36045
-MISC ChangeLog 1088 SHA256 81e334affaad4a3a7ef4463278e55cd9e456663f7430b3c66a0bdf12c4a74134 SHA512 d9ce1574f21d7d1f5d6f88bbb6cb7b3f46bbc70f78e6bc35915fe9d1659ac1bf2f8ee9c1ea67838dfb1e0628d0ffcea24ade5f9544dd1445b7f498e477100564 WHIRLPOOL 4f2875447bb87a12f05d7970ad10f0e09d962e9e22c5b442017699bb52d0d7841fe4bec369d0f56930a2902bddb0f6ee71aa32d854dca0314c95b5bb0a421945
+EBUILD legousbtower-0.5.4.ebuild 1157 SHA256 76e019a7ce6feb8cb98c7ac245c090c2ec7fadf44f0c3ef301083b25e04a61f2 SHA512 aeda497f74b220ca501837968b615ee8e87c273e0efb5d030e595831c20448ab59e67b59c60e432a5e1b782dc92c627b2dd878fcc7116adab70a92530eabba62 WHIRLPOOL a5ea722af5fd0e45ca26236348b38c35ba7cd1ba22b10b5d706653913f45515ca00fd3b4b62735c7a3128d6a47aaaf8bd32e086da88d37e5bd0b3867aad29055
+MISC ChangeLog 1209 SHA256 372aedd0c33e0830bd487a863298a52d48866760bf56fedf6420d60fca2facc7 SHA512 e9ea5749709731e3e5be63915d958c23900b94021f7e6df9a17f770c5ade82487e3132f14bb8177de04c47e920212a441987df86f06e1cd442a56c79b8c8c9ce WHIRLPOOL 4a73ca751ba2d9f23ed1e7f8e207a3f4303e971032da690bc10471f0edc3b56c577c95bdf10f971cdd19994cc094dc1f2edd0a01b2143a78221d602cde02f18a
 MISC metadata.xml 268 SHA256 2089ca59285b2836a6ec1d5aef27f83d580e922212301f0b1eadb04400eb45eb SHA512 8e365ead118785104bc7576a48a106346ef24f5b709349f8ca3d5fb9107a248d0f172e6898fb4ba4b2b7f84e6c8c7960578a2919e1a3692664cb808b16e6b2b2 WHIRLPOOL 255e754b42ff038b07a48321ced9fe6f8acdc99bb85873807b3e902517a1764dabc7152e5ca9ad4d83ab5dc9d3a611f79e6c066121be77aed3cad1b0f3587b73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQM9U/AAoJEFpvPKfnPDWzsvkH/RqeUMT5CE/Crhg81r8z6vQs
+2ntadyHc4rq+b/pwF9CAvB2hkb/Z94LOc+2Shost0hyEvgdqxpredbmqontHXHe4
+l/DpB6/Fe+7unzXp0/AfTOAwkmqnjAVbmsQy4j8O6do+x3PbaW7FpKoOvHshtVXI
+S3YM1OTYWldqGPgwfleIYgawWjTS/laEH6JbH7VaTwP+8mUtp7LQ2l0rFk769po1
+3Of8PQnnY9z+qF11rWzGLp5ijzQeDl+JOSjhVaU3liWDTbCQ8iDmfVJ9zDZXTMqo
+Wk/A9SS226wDUm0Gt/fSUqOjYh3mmFMGNBuvjo3fQ7tSOVGez08wmNobaeylC9k=
+=k1bo
+-----END PGP SIGNATURE-----
--- a/dev-libs/legousbtower/legousbtower-0.5.4.ebuild
+++ b/dev-libs/legousbtower/legousbtower-0.5.4.ebuild
@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/legousbtower/legousbtower-0.5.4.ebuild,v 1.5 2010/12/30 18:44:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/legousbtower/legousbtower-0.5.4.ebuild,v 1.6 2012/08/21 18:41:48 hasufell Exp $

 inherit linux-mod

@ -27,7 +27,7 @@ src_install() {
 	else
 		insinto /usr/include/LegoUSB
 		doins include/legousbtower.h
-		insinto /etc/udev/rules.d
+		insinto /lib/udev/rules.d
 		doins "${FILESDIR}"/20-lego.rules
 	fi
 	dodoc README
--- a/dev-ml/cryptokit/ChangeLog
+++ b/dev-ml/cryptokit/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/cryptokit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/cryptokit/ChangeLog,v 1.17 2012/08/18 14:46:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/cryptokit/ChangeLog,v 1.18 2012/08/21 18:35:59 johu Exp $
+
+  21 Aug 2012; Johannes Huber <johu@gentoo.org> cryptokit-1.6.ebuild:
+  Stable for x86, wrt bug #428970

  18 Aug 2012; Anthony G. Basile <blueness@gentoo.org> cryptokit-1.6.ebuild:
  Stable ppc, bug #428970
--- a/dev-ml/cryptokit/Manifest
+++ b/dev-ml/cryptokit/Manifest
@ -4,13 +4,17 @@ Hash: SHA256
 DIST cryptokit-1.5.tar.gz 128907 SHA256 e2483a463ea57eee99c1e9c5aed1c34885255e47f0d4d872bb2bb3a8975eb3e4 SHA512 5a46d2867055dc55822c972e7539a2bf2d488a9afb1daae9b810c21e0f002623b93346c6d7b46dd061ddbc0e6d2b7085886f9e6375abec46bf7a42983bb5af0d WHIRLPOOL 98b65d4a15c0fa8735b30a0da0ae40f9e40c342bcb91597508073370199f44b3ded4a04642118e09f629358ab85661192962a18ad23c86eda72a3c8ee3c87c46
 DIST cryptokit-1.6.tar.gz 133031 SHA256 c58cb6ee1efa996bb227d64b378e80824637f875e914ad38833d610b7f992422 SHA512 9a9e6c11b0f6bbc51737f26813e2f54918a13ddeb70c46075a1336048157d40583a32e797edb17243c5f43e3113a6890a8ea118c84cdef8e95698b14b3844219 WHIRLPOOL 10a93971fac720b4dcfe3944f35be2e5dccae01523a426b1272e91d17caf627bd0c8f25c463d264426afaecf75848b1993f97c4df3ec73d9186d356e6dd7ec96
 EBUILD cryptokit-1.5.ebuild 1348 SHA256 2321660491a68edcc864c3254aee74cb51dbbfd82e0395c2e4d1f7311e581288 SHA512 d0065189a29de89a097713228f06f06fef0678205c43cfeb565e970a89757540044a7cdef39c71fb3bd5d803fdb164d407364f2b892f7397b9f4507fdbae12e5 WHIRLPOOL 80fab721a0fe51ec8e265ddcd1da40a5946bdfe4878397f915374220de205d82962eeea6bda3bcc3be37bc62723fbfdafcde82e96291baedd02b46a08c98811e
-EBUILD cryptokit-1.6.ebuild 1354 SHA256 34992a4c06ae30ae9d3acdf2c38903299bc0f42bc67ecbc89f06f2e8a6e2c93c SHA512 72d4e1cc1b1913448914a097346de07f6b219eedffe5e801cf378d40894a29d950d1bd8eadfc0a458922c8a13b348b167d910270ccbf5d6da77393a37b7dbdee WHIRLPOOL bf121475dd5d49bb09efe493a366f441b9a0d6c5b32888c3db41e40c894243d09e560ad70c40a163d52bea4e294cf22a7cdb4c837bf77cdc7c3e6412b6cf5d90
-MISC ChangeLog 2216 SHA256 7f812039c5b85b2cb72df08019f7edc3197cdf9054cc34d532ccccbd7d3b8d6e SHA512 2f613caadbd388823eb2b0960e330d547bdebb7a9bc4ad7667ad6e047279833303ac94d82df6727b5e372f219901c011522e734abaf8c4027637efc376c366c6 WHIRLPOOL 6e763ecc6b1636a272b683ce7584dae586bdf81488db634777bd583f792a29b687ab74807a7e59ec77f972896b094f4b1ce4991c7a8852e0dc58055aa63cffe4
+EBUILD cryptokit-1.6.ebuild 1349 SHA256 0b082809c7a8b2062578bd092699f622efc0c69f86da22191db1cf960c48ff2c SHA512 087d500478bae77742fbb41fa262db960d1e2c6220a24c30490cf9dcb5ed3f3708b2870cedf172592daf44520e49093c5c4bb8d5f7151b0b11a6026dc1deed7e WHIRLPOOL 295f9224712950ef8ad3f0f6befac84e0f59b875b5ff616a459072a9df9f099112f67c0ae3f3bcecd866fc1c335ccdce042afe4eebed284eda0bc5fa754baf73
+MISC ChangeLog 2317 SHA256 e67b9307269e49d4554d5ee72436ad39b49d8830bcf12050cdd6d2b70e512562 SHA512 3907da50836c4d454f1ddbaf6160cc8eaa58c51b4dd2bc554166114287b9092f5a218675611c7e32189a837b08342784e2320821a843d2792e9d81eccd1fd51f WHIRLPOOL 9c672c56ce151332e57788122be383d243b13c5ac7cf3c8a130f37f7746eadd4146b1f7c7ce5b1f5d9705ca2193f71add4230b8b14325df3aa15d9229829343a
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEAREIAAYFAlAvqt0ACgkQl5yvQNBFVTU4LQCgjrg8DVVJz4kmUFuNkfSAmjkD
-/D8An3qCy60xi20gELBCwlEHW1cBy56s
-=7HK/
+iQEcBAEBCAAGBQJQM9UgAAoJEO+t9ga+3I3akCwIAIOtrkuqze9AQehWIDDuzYOm
+sCm4fBWmUrNMws7HgbQt/C7lml8h0fxfJp02MdieDmUec5FrHEppi9G+QKAVOeJq
+8bn7b6EbdfIHn6lQUvfEhm3LE3nM0yOGm/yrMkDqMOvhsfFnXOQEmg+FKi8HoQVD
+kG4LB4L00+V8fPeFWbwVkg8lCicIl+BXVsROmaUxRUIp07otXU2bP+w66oZZ3vOZ
+tvNl4GDeo9WKkBvxIy/N7xOnnZnGO5uahKE4cU6ufWvWgveHNMAui8Qmuf/ocBjv
+rQuXrYqa+v6D8SQm8mZ4EFEwsqMZUPuhrb06w6eXnKhGnJVHJlZ93F3bvzMIB98=
+=eIn1
 -----END PGP SIGNATURE-----
--- a/dev-ml/cryptokit/cryptokit-1.6.ebuild
+++ b/dev-ml/cryptokit/cryptokit-1.6.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/cryptokit/cryptokit-1.6.ebuild,v 1.3 2012/08/18 14:46:53 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/cryptokit/cryptokit-1.6.ebuild,v 1.4 2012/08/21 18:35:59 johu Exp $

 EAPI="3"

@ -13,7 +13,7 @@ HOMEPAGE="http://forge.ocamlcore.org/projects/cryptokit/"
 SRC_URI="http://forge.ocamlcore.org/frs/download.php/891/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE="zlib"

 DEPEND="zlib? ( >=sys-libs/zlib-1.1 )"
--- a/dev-ml/ocamlsdl/ChangeLog
+++ b/dev-ml/ocamlsdl/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/ocamlsdl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ChangeLog,v 1.19 2012/08/02 15:39:35 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ChangeLog,v 1.20 2012/08/21 19:17:00 johu Exp $
+
+  21 Aug 2012; Johannes Huber <johu@gentoo.org> ocamlsdl-0.9.0.ebuild:
+  Stable for x86, wrt bug #428972

  02 Aug 2012; Anthony G. Basile <blueness@gentoo.org> ocamlsdl-0.9.0.ebuild:
  Stable ppc, bug #428972
--- a/dev-ml/ocamlsdl/Manifest
+++ b/dev-ml/ocamlsdl/Manifest
@ -5,14 +5,18 @@ DIST ocamlsdl-0.8.0.tar.gz 224883 SHA256 d3a223b2fa1bb3762ac82b0401383d688ca73cc
 DIST ocamlsdl-0.9.0.tar.gz 229173 SHA256 c285feb02b846452713134eae5eda716f3574ae8b30959b24717b3547e37947e SHA512 6eabe070731c1450a6f0675c89d7695778e13bbc9e647ceb0c62049e061b813cfaa69808b9044a09cba501862ed335a942dbe74c93c12974d74cdd8b490bcdff WHIRLPOOL bd8e2777e67079fb62e3a01da2d372a2d50da6614f55ca3ed235b342a41d162076df884dc4456ee55cf554d2d3694698b8f7dc7258a25a44aaca835b9112c9ae
 DIST ocamlsdl-0.9.1.tar.gz 226085 SHA256 abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f SHA512 8be444a3a4d1b56919c7a28fb607cbd33446f8cf30de3768a9926f23f86690d98ebb8ce6f2fb28c167ea76ac138b670283c5c93d72ea2565aa49a0dc92de181a WHIRLPOOL f9bf44f6d63626bbae3621100b7ed19ad6eaf392f1e9d2ef39440b17ac279b92a5156bff9cf432e3241fd5ec2419a7f002602405d13d6fb1b0bdbcd0baf233d8
 EBUILD ocamlsdl-0.8.0.ebuild 1361 SHA256 7b10fa70a18ad6d4007f857bc9878ab3dfc7d915cd1f41e991040d8dfc197877 SHA512 812e53eb254293651a4abecb650f2e2f2a579fd0c2b07da7f356024a1a0f2b164f13b9c342f9615d2135d8e786c62c06ca9a3cc4799c6eb283a3546178ea27cb WHIRLPOOL 51965c2600fa955bb6a7cb6a78c85c5bd17537dd6a52fc77d574feffc3f101041910949fa104d699d1ac4272869ef8e908ed4af1f35e9752c76ec36ceeb429ab
-EBUILD ocamlsdl-0.9.0.ebuild 1364 SHA256 7be46868f3abe6c2c3cd5f5ae844ef84971b5c0c4c7b230871533965a8d7191a SHA512 6d59069c81a0f500fd32d5ba113b01dcdc050479921b0246b219afe8be14c8efbdb80860c2701d43ae46ab03b976b73d57da1126b87072a553f8908b724d8a20 WHIRLPOOL a86605ef255e9c3717f075175bba2a38115faae266675e38afbcb405f3aae125dbc9311f3038e893f01ea590a80efc2700a82ffe5130141fb5543126db16cfe5
+EBUILD ocamlsdl-0.9.0.ebuild 1359 SHA256 b18ed6dd234199e5186468c0b5bb42c5dca6e9f4c57a0dda4071091ade3c626b SHA512 ebda5890fe33528c623fafa8ca9be7b877030bc5c8d5e7e9be99eaa24e6750293b081cd6b0d36b38f6720061b3a34e0db2a086e672d69656e14b0fe1badb0e83 WHIRLPOOL cd32c7075ff04b7d11a2cf7c371b6e3b6e64325cb63670c46250247516d392bf6dd0b9d5877f459e1ee9f9e0d7ef8714a2b41d5c9b7d49e96c1d25535361a7c6
 EBUILD ocamlsdl-0.9.1.ebuild 1365 SHA256 895fc3890212a803527e971be3bd631ce929eba3afca6de07792e22d01a16b2f SHA512 7374a47f5fdf6e17451638a2e7962f97f3f8eb729229b6c985afd33102f9ec0f52a9728f52acb9c069c937fd8499a536e104f1194156e55e2f1140c98d553d22 WHIRLPOOL 6db4ffdc7040dad940e7e539cbee06745c1fb9849a23192b897fdd82447152e25b07123c5bc4ea1833d298a30514c8f3809db0fb5b16cfe18250dbfbd616f454
-MISC ChangeLog 2567 SHA256 3d05ff206b6070dad1e91b79d987e9f6796aa9918d88ef4fa92cba02e1f71a59 SHA512 403fca053c5d20c77fd82779c3ca02cd05fc7434b1af3222ab6e03fe6239f9f167f8265c3f57444e0fb93376a8d468decdbd116074c20412add53988849ada70 WHIRLPOOL e398fd61bdc684727ed4b40e9935c6c25b3b5501b596b6dc2137ddf9e6e89781ca259905f8003d931a0c378415d976cb35c64ed6a07a27765ea87019c5f97ed4
+MISC ChangeLog 2669 SHA256 468718c42e28f2bd8058010d940d4b3cb646082799af6435562ed09515e1ddae SHA512 4fff28264096b4e7c816de09abad3b187f48569ba4aec16f7033cea0352eac1c9e556fb4899c655ac44605cec1940035e536d6c330886bfa78b55dcf01e6f588 WHIRLPOOL 63e689346b980d863f56929794d3bdc746258270e5ce4ab44aa2336306e5c78b8b9f18d159e94deb8a7a8b38c75896d5fc6c4235ea4973f6e5237f2cba109ae1
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEAREIAAYFAlAan0UACgkQl5yvQNBFVTXLXgCfRqlqRkPVRfilV6cIRywgekOW
-eXAAniIYfwzbbp1WdSpOU79ATqkFC162
-=BhHz
+iQEcBAEBCAAGBQJQM96xAAoJEO+t9ga+3I3a+7YH/is3KNvARDZe1iys3KAreb3Z
+XG9ARGotdHVFYuPfOwwzdmkDy+cAZ1b5yIhNgPUTq02gebSHoXIpfT9eK/sDLjOX
+hm6RPd0Bu+cjVKjHN39BYlwmR7831XqzR3NCIAQ6/MrixdX91YjLeE4s4RADYu1V
+OUD8NLYhXLFWyK6CVCw/xDVF+C7kbJXk0EUFPGlU2cw2153rHj+T5bS5RbvRJ4y1
+VOsFCTkYksrz0II35soJ6d/Je3CCHC1LYpRwyw4y/9dRuXYt1+VQCFvfiz7ELgsL
+pHMAUVZAobi45oZkoIpfpn2Bxi/uHKf0ogoc7isZtgE0RtkGkUdRcI1cv7SOh+M=
+=cGEG
 -----END PGP SIGNATURE-----
--- a/dev-ml/ocamlsdl/ocamlsdl-0.9.0.ebuild
+++ b/dev-ml/ocamlsdl/ocamlsdl-0.9.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.9.0.ebuild,v 1.2 2012/08/02 15:39:35 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlsdl/ocamlsdl-0.9.0.ebuild,v 1.3 2012/08/21 19:17:00 johu Exp $

 inherit findlib

@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ocamlsdl/${P}.tar.gz"
 LICENSE="LGPL-2"

 SLOT="0"
-KEYWORDS="~amd64 ppc ~x86"
+KEYWORDS="~amd64 ppc x86"
 IUSE="doc opengl truetype" #noimage nomixer

 DEPEND=">=dev-lang/ocaml-3.04
--- a/dev-ml/ounit/ChangeLog
+++ b/dev-ml/ounit/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/ounit
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ChangeLog,v 1.33 2012/08/03 18:18:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ChangeLog,v 1.34 2012/08/21 19:13:23 johu Exp $
+
+  21 Aug 2012; Johannes Huber <johu@gentoo.org> ounit-1.1.2.ebuild:
+  Stable for x86, wrt bug #428974

  03 Aug 2012; Agostino Sarubbo <ago@gentoo.org> ounit-1.1.2.ebuild:
  Stable for amd64, wrt bug #428974
--- a/dev-ml/ounit/Manifest
+++ b/dev-ml/ounit/Manifest
@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256

 DIST ounit-1.1.1.tar.gz 52677 SHA256 0ea290c639f5069656d43d05c7cb4999a9c7ec22733ee2d10ea2f8b8706ecd29 SHA512 a7f91b9784fce6d0401fb16afd242af6f36820fbfc624821d0ce339e6a1233754dca57e3042ceaa261797fff6dc95969edc17a51e0528d29857b38ba5d2bb807 WHIRLPOOL dadb4df7b1cd036c2478be496b32cbc4049d356741187853195c2384a838ee7899c7355ac1784960374ea0ff3639f57a95cfee9515c2ec41a6805810e4d1d5cb
 DIST ounit-1.1.2.tar.gz 58055 SHA256 e6bc1b0cdbb5b5552d85bee653e23aafe20bb97fd7cd229c867d01ff999888e3 SHA512 7f4e7e80dea0d508a286bcb306c163b2d19422442798497fe861d6095a5be711b4d078c25d595a0c1dcb7f5d9f9dd2d6aa37c6574b9c7bd717b131cf00312dbc WHIRLPOOL 87009c223fc7c6d05526e90e5f9e6e8d3753121bb04760879e3695a5cc47d9405f266ecd74a32e16f33315a233ac2cfd3c136e1e5314b7b93ff11b759c606e13
 EBUILD ounit-1.1.1.ebuild 556 SHA256 9051f6e1af202fb2e3639da5dec03514ff0d4ddb59f888dbca39142b96dd254a SHA512 8ce48a6bfe18b1c9b5bc1fc48dc02cfffdd4657da5b7c0d0d5d958c2fa6bb9095655271855ec4d11830269003d5102f547eda168c810b7b598d746b2aec394d3 WHIRLPOOL 44602060b8f1f7be69cc2c808cade64b29248de63264b37ae614613fa019bfd434654174b631e0738ffbcab43dd04751b3d3f079892b24730074ca99f7f1751c
-EBUILD ounit-1.1.2.ebuild 554 SHA256 7b7c6129a938ce02b49012bddd256818cdf98e1bfcc5d87af6002d123d6ebaf3 SHA512 71643d6bdf19ac094e896149e6865510f08e677073a377a3c47e07b85094fab4260b2e829d9ee0fb184108bed8d0a171e5c1870c072c6225941b8218dd11688f WHIRLPOOL e46e821fc38db9b6f841205d50676f4579d911079f3f9f05d7e7fb24ed9ff5c547de7cc37fba033fd393dd878e3d2b0f8c032dbe18fecc23af724fa8e5d7afc8
-MISC ChangeLog 3800 SHA256 70a5c97990d9d811f7f907cc6521b5cdf0904ab27f5ebe03c1d4c75c9253e5ac SHA512 8cffe9991f8f1a9bd59db7a9a63771fc9294a8b5f6c214dbe0c5ca5afe069b665fae52961f1626adfcf197817587a68cf23b8681f3ac5a383b91dd511f4ef61d WHIRLPOOL 755ba82bd6870b835725a400b26c0e5a553f0345c577626b2da28a95f41509e69c723cce6223a49e5100cec88945975e08fb1d39c7dfdbed622bc61e3bd789cc
+EBUILD ounit-1.1.2.ebuild 554 SHA256 7f158ef375245734177e89bf0806b842eaec456ec483c64172f41498884b86d3 SHA512 62684f037cde2d3aee221627b063ed137d050b9bd112686ca43312c2dca9b651c001c6b3ff71b20e5da77a84aad2b98ef374d2c34b86b65210e745d59ce3a988 WHIRLPOOL cf4cf8507ab7844d49200dc7e50de9e8691f019fdce20484cf1de13378e95ec48028abd15ed7bd8494d97c4f2efec37419071a217c61557650f49e8a71544995
+MISC ChangeLog 3904 SHA256 dccfe590ccbafd8c85fe9a9772cfecce8071c10e063434b3b768f08b20c5d0da SHA512 844ef40ecdb22e663b95ed796255a41eba322d331a8e61b9533424f7c07a37f7f48bb296aee9b3a96fc66fecd31e4c545eee6b5d89500ae91e9d97400dde8aac WHIRLPOOL 4cca805f32d5e525cb098cfb40d0013dfa088623fd1e8ca78830b89a1336c057c804d4fbbddbd7bf5542099d1223bdd3221cb633cb7c82a37001885b77105520
 MISC metadata.xml 155 SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81 SHA512 a525f91dd332fc144c42d1437bdae9c889cbcece6294c2d2f4baf6a532ac2e13492736e75b41c83fac31033a9ae53c37deb96286a5ab8575611136617640952c WHIRLPOOL 71a9c7aaf4e268c65c0d1e30e343911ccbcf99ef8c23773abc2b3af8d58d9f7d5c09632805d8ba9050c09eef629f2b340db9eb9ba8b9cd2e5d655fce3f91fcb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQEcBAEBCgAGBQJQHBX0AAoJEOTDgjZ80txdKroH+wT/Uto1QwjXE2TBZEmqM6we
-DhiEW0u/ReJfXgOyAeLrUG3RBF31ood7Vla22eQneHRl+Xuj40eCZ2BHzegaP66I
-KV7bbDIhT+/NqzHVDSXSK6MavnKCHQ5rsWJB3OMMc6JyMjKv3FUEHW2csO3wSevU
-doRJWIQV7MbR4VwfyYetwF+uf0qDflIurMtWIS9iIlj21v6aX+KBfMz/cPWPbXF/
-HNTbirvRGAg/o6y8LK7bqyZZpQHpNAsIw1J0QxpWDOoXbYftaOwhPR1vg9zT8Mte
-nH+4nC4dKi4BrOgIneWmGK878pJWOZP1xa9XdrWoEUmfWtcqYoX39i/hexSn/0A=
-=rPJV
+iQEcBAEBCAAGBQJQM93eAAoJEO+t9ga+3I3acvIH/j0WznQsYjqW/ktPLKyc71B1
+5CGyyoRW5gKCUGtl3h4gJIl2f2LhWEpU68ydTmdPh1ItH3pLlTmNALjQ6Yt5NMkS
+TMFStM/jNGrITl43viG3br5lQTq6+BNyte/rsA2VmgiMU6VdjIBCiDmwsjvw1AlL
+LXogb1PK7v0a4A8NqIQ9R6mBP7lpa9uazL7KejXszQTfmCsOdbbaNF0LwMtcKaY6
+agj4y8oMgIB7sDq5qzTNgo9yZZtcwusHin+qpN7tI8JqTy4fzghwEQKdzHnoiMXY
+00tW3M1uE5xyqS5SAzL8FJ/3ERhxs66/IrTuconcryIE8UXhA8jsaQU1JcP5WDA=
+=4re9
 -----END PGP SIGNATURE-----
--- a/dev-ml/ounit/ounit-1.1.2.ebuild
+++ b/dev-ml/ounit/ounit-1.1.2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ounit-1.1.2.ebuild,v 1.3 2012/08/03 18:18:23 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ounit/ounit-1.1.2.ebuild,v 1.4 2012/08/21 19:13:23 johu Exp $

 EAPI="3"

@ -13,7 +13,7 @@ HOMEPAGE="http://ounit.forge.ocamlcore.org/"
 SRC_URI="http://forge.ocamlcore.org/frs/download.php/886/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 DEPEND=""
 RDEPEND="${DEPEND}"
 IUSE=""
--- a/dev-ruby/jruby-openssl/ChangeLog
+++ b/dev-ruby/jruby-openssl/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/jruby-openssl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jruby-openssl/ChangeLog,v 1.17 2012/08/21 18:09:58 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jruby-openssl/ChangeLog,v 1.18 2012/08/21 18:36:34 graaff Exp $
+
+*jruby-openssl-0.7.7 (21 Aug 2012)
+
+  21 Aug 2012; Hans de Graaff <graaff@gentoo.org> +jruby-openssl-0.7.7.ebuild:
+  Version bump.

  21 Aug 2012; Hans de Graaff <graaff@gentoo.org> -jruby-openssl-0.6-r1.ebuild:
  Cleanup.
--- a/dev-ruby/jruby-openssl/Manifest
+++ b/dev-ruby/jruby-openssl/Manifest
@ -3,14 +3,16 @@ Hash: SHA256

 DIST jruby-openssl-0.7.4.gem 623104 SHA256 b0d67db29038e9e7ceefbff28a96f72bdb989e53808bc3b62ee167707179260d SHA512 de569ecd9f20320040bfe843717e7c7bb79dc08bf9d32154244575029aaf850024a983f3e38eb55798c65752095b965ef1de2c4c45d614e122fd4c0eef6279bc WHIRLPOOL db696c523b8faf2a1a3aa5eedbedb95710cd1aab6ab7655dfacc8da59cea75c09d600990fe43f406a3f3c6e1cfc8b0fd419fc5dae9fbfdb5aae82bc8a6ecf797
 DIST jruby-openssl-0.7.6.1.gem 690688 SHA256 17c236725a4e3bbe04d1810fb3c08e6196ab2ff00ceb7d9b43860a6825a68bc4 SHA512 9cf3fea6038d3f0af8eced2afff10b6aea3eebd2cf75f37fca0a2ddcb78bd8a25f1aa9d0cf369d99fb17672c5e5c63ea385e13e0d2b195e29879789d4b74c0dc WHIRLPOOL 24216abd938a63e5005c62ad35f9f4cc01a94881e4a92e6aad6f47de311058131400f5c619b02051d53fe8211218622f3b44ba302ecc8bebd69f20bf33233ee2
+DIST jruby-openssl-0.7.7.gem 692736 SHA256 2ea826de1f16434e4e4d8c4506b93bdaa79489f2ddb326549fd9a5300bd7d65e SHA512 55056d955f59496500ca0ae0e3645dd844f88b89b6221065f809ffc33585acd1b489329bdef50878ec47bbae1500f6ffb69df1cd852f09e4b25b66824badb32c WHIRLPOOL df8fd894fcf3b41dd48cd8838d84516fc8025c12c1a8ba96506dd4aa7b37df866e0258b3feac412479e3741f46798307ddec433639e6e1c341b21c2ac9548fc0
 EBUILD jruby-openssl-0.7.4.ebuild 954 SHA256 d361f282385b7a35708749004560ea9b4a67152e4f7723f30c62abcc8d5aeb18 SHA512 5d1ccaa3f418a725a1f0f9910451c3d663c2ddabd538a2c59922caaba2bd421077501a9bfbc9a77b9935b80132154d21daf81d00577ef185303319d556c9f2c6 WHIRLPOOL a78618a47d8abf1f8708788fb5189743041d02d3d10813c7f82542e55168b5f8c417d192c122aa5b9780e0696d4020346280bd8936e6400f57315111e16df1d7
 EBUILD jruby-openssl-0.7.6.1.ebuild 1041 SHA256 0aadf366382ecbf5f922e94d5de075e9ce2f299125615a59eeb348af232ec0ca SHA512 73ef2a9bae5a35c100907b3646d9956e9f1a22c9cbab6b108195e03f801e87a8df74f6d7fe9b1d703a42f4fbca5b76239759eb035fdc20417cd55e29a9d82119 WHIRLPOOL 9cb98ec9c01683b3c145a1ab04b484f654e1013af953b693dfe7e2971ac1bf8a51400d4f5aba470a988abcc8e8e338053f8e1a555e45e29f49b7326f6c6bb25c
-MISC ChangeLog 2872 SHA256 36cf181b2e01809ed1ff16a568d40b57a6a0452cc425afbaa45d7cf5acb60227 SHA512 23610921330663e8d3d7bbcaeb3360fba42d3d321295e840f9c74bef88ab9e5acc37fa3b07aa8bfd50d1357996450ec5231984420d1b43c94df59ce452da5228 WHIRLPOOL 6e063a8b91992c82af565b14988b8ad3799b14cbcb3c77fdd554203f260031404e84a37db89371bf70065880711d2e782488e1a280e40ae7819295bb33822b20
+EBUILD jruby-openssl-0.7.7.ebuild 1039 SHA256 48ab6970445531b562e3be49569b092f966a4d68b59348e68705a351fbf26919 SHA512 8bad15000729ffab53a10a77697bce6e3c968b2ea438bb1264e9dfee65595def2a6efd3348597087bc991343d11ddd3e63819f68692e32433c669645675e50e8 WHIRLPOOL 67757d1f8a42013629e813750a20e06e4b92a358633a9396a2072078fcc97eb331e8a4baa698f4fe7936859db51735dda1491c88965cdfe22ee7d4814b4a8e4f
+MISC ChangeLog 3004 SHA256 369dc0a384b187963859f45ddea5479c3b84430a2fea051bd811b8acaf424997 SHA512 ea26a926ce7040da83a0c84f60f261d7b5d6e77232051e98f27d93f8ea59d8ad3c9cdff42b60caac207910b25bbfa89aa84de35f16878d1fe158097a12f988c2 WHIRLPOOL c842dd44c1d503c918b2cd02a391d633e54908966c9d823d3119fa6a77c99f9372e88879344ce2d155409280f84675f1db31c6e5f4080f61434fd2088e919861
 MISC metadata.xml 178 SHA256 7108944ad555b610e09b37494694495147518fad485ec4f1241c4fcee27979ee SHA512 a147d9e4e3c8bb13c7d151eadbb87499ebeffcea88478b5bd188ddf3f839265048881c1489219d1a8b425c4461460dcd8bc8814909acbb714e078716e05533ad WHIRLPOOL 1f288ae53b8fd5ecff1171343a1a31cbfe1aa9d7e839fd28114e04b572019f5a84f4a8ede27c9e799720c7e434eb8af9f56acb4babe66931aaff8560e9e274e3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iF4EAREIAAYFAlAzzwUACgkQiIP6VqMIqNf6OAD/Q598KZJRkEZ5DgB9MovBBSBf
-D38sJVYUBBiTD1oAMREA/j9UUbrwPi8tH89MNtwYjOMtPD7oEIGQ5urnENtT8nAy
-=jeRd
+iF4EAREIAAYFAlAz1TgACgkQiIP6VqMIqNeYCAEAiOllHFT/M1/lLmGh/3ctPhIY
+yc2OR0sM+ocG6lmEKr4A/jZ+mYViBR3ZYHXs5OV0e4YXjCNmTpotVwYc/e/O6O1D
+=Z16s
 -----END PGP SIGNATURE-----
--- a/dev-ruby/jruby-openssl/jruby-openssl-0.7.7.ebuild
+++ b/dev-ruby/jruby-openssl/jruby-openssl-0.7.7.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/jruby-openssl/jruby-openssl-0.7.7.ebuild,v 1.1 2012/08/21 18:36:34 graaff Exp $
+
+EAPI=4
+
+USE_RUBY=jruby
+
+RUBY_FAKEGEM_TASK_DOC="redocs"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby SSL library that works with JRuby"
+HOMEPAGE="http://rubyforge.org/projects/jruby-extras"
+
+LICENSE="MIT || ( CPL-1.0 GPL-2	LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="${RDEPEND} >=dev-java/jruby-1.5.6"
+DEPEND="${DEPEND} >=dev-java/jruby-1.5.6"
+
+ruby_add_bdepend "doc? ( dev-ruby/hoe )"
+ruby_add_bdepend "test? ( dev-ruby/hoe dev-ruby/mocha )"
+
+ruby_add_rdepend ">=dev-ruby/bouncy-castle-java-1.5.0146.1"
+
+all_ruby_prepare() {
+	# Remove a test that only works with JCE installed.
+	sed -i -e 's/OpenSSL::OPENSSL_VERSION_NUMBER > 0x00907000/false/' test/test_cipher.rb || die
+
+	# Remove tests depending on a build_lib that is not shipped
+	rm test/test_java.rb || die
+}
--- a/dev-ruby/json/ChangeLog
+++ b/dev-ruby/json/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/json
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.96 2012/08/15 14:41:55 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/ChangeLog,v 1.97 2012/08/21 19:04:25 graaff Exp $
+
+*json-1.7.5 (21 Aug 2012)
+
+  21 Aug 2012; Hans de Graaff <graaff@gentoo.org> +json-1.7.5.ebuild:
+  Version bump.

  15 Aug 2012; Anthony G. Basile <blueness@gentoo.org> json-1.6.7.ebuild:
  Stable ppc ppc64, bug #428756
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@ -4,16 +4,18 @@ Hash: SHA256
 DIST json-1.5.4.gem 678912 SHA256 3acf6c344e5f9089b6e4d675d18384bb61a36c81d038ce9a65906987711c789e SHA512 f38768fb3bb2f9a5348d662b65c608eec635aa6ae931245d8afeca03ced587ad55186d78f95a1dad95700621bad526ea2eac51e4db4c66b46c726eaa4f02a897 WHIRLPOOL ffb1903ee5bb2193c5cc08e5ee872fca92a4981663fa77ce9f27ff897ce6279fd793eec2df92716c09deab62afa9bc1876c02a542e06b2722b0bf991eb61d051
 DIST json-1.6.7.gem 143872 SHA256 02ad99f012ea4aaaab5b15fd3b0b44ac05aed08ef29e0173d46fcf01d63a070f SHA512 200c0fa2dfecdf78bc8d9faa6b8cccaaa61966d2314f2d7aee0ac778bd0a0959894c8c5bebf6cb858a084b041fd68fe5106ab6545be3bf7b3dc28e7449efe1d9 WHIRLPOOL 2a58c1219f5b82255a947fcea79aaccbe71b31e930efc9c3eb7d1a06f6e9f20c8fcc5e31f3fd07337d43e49723139ba0575c8027faa362cca25adc05bf3b6af9
 DIST json-1.7.4.gem 145920 SHA256 d2129e3fa9f5ed1629367559a0740d8d920e0f5d328e7450a380ee8040eb9e4d SHA512 c0e5deceb3f67009abc6297ab5845885256bfc23079fdd09ed2e8ba4a05fb836be50cc64f00768cd7c0f2997f4dcdf02e096b116ca453913aba08d808ca3883c WHIRLPOOL 694311f2614cecfc6352ede4b8f2d69b029c037a16cdf0ab9dc793483fd0c269ba3efae99fb13bb14d0eda896b3f545afdfe2891faf3369514e72da5ca4be0d6
+DIST json-1.7.5.gem 145920 SHA256 e064596aed55983ece9b4864a347ace1b2f0d3541292c5bf4be955994f8d8e7c SHA512 840f83f7f56becb9e3f53e951e51d2d340148387cac92822f36b3f61766e55e4c04a7c958d39457ddd351ac510ab7e373cc1b773c0203b0ca0ece83a1d384b3d WHIRLPOOL 4b69f87fbb617e6cdbcd76299d666bdac940ad280fa76ef1ea8783316703f88fbcde86d1606025edc7dae13b9b6bd33ff41387c8b3f1fc38326e226b0fff3c78
 EBUILD json-1.5.4-r1.ebuild 1897 SHA256 0844022cc65f022e88b008cc8ebf0e17c51be3d584c056210490ae4102a6992d SHA512 7819d3ee8464b5af534a1d97cfe5873bbcf61324694fdb35c34377089a709545a33fde4bede444e4cd303965cd0888acbe368fd56f177491fc97f995aca59180 WHIRLPOOL 291e1774253b5cb687ecaa6c521885768a584368469ef81a6e49776d8de42240bd53ac659ba22670086596e842db0001e341238bb55f91da794ada6422a46978
 EBUILD json-1.5.4.ebuild 1882 SHA256 7d30ea4d1ddc3b04c248752a50c68080152c2c971352286689bcea02601d49a5 SHA512 98b79c0ba0d366ddf68360a3f01f8cf31bb8fb3b74c620eb1fb9aa31ef2ff43d767eaf10819f12a3e5fb04fae56c9908737a3eb4b4ba7d22c8172505245006d2 WHIRLPOOL 75bc2da173664550e50e9c7b4df1aef40cc9fe5ba928b2ea2a474445c4b8c12d538232115d0321e210d03cfa56d9ba3118193b8ed70d87d14a2c6c97d51ea1d1
 EBUILD json-1.6.7.ebuild 1992 SHA256 f227a6cd81627fec995b33dd1ca7dfbab4d3aef010782d305063d26c49dcf074 SHA512 f35aab3c03943848130928377d6a475c471267d7942e4713902a4066888a3b12f60789583061c767f6e1a0bcbfc24659a94c9baa633ea8aacdfb56636336a055 WHIRLPOOL 95a2cc382486ef4521a5a7e99eaa88319b7b37849ee6a61548ebbb50d6395be336a622aae1abb92521c1f27985ed961bf37dc7e430336845435521e333ad98d7
 EBUILD json-1.7.4.ebuild 1995 SHA256 9e35b383be8a2faa6dfef6b8a6953482c1e3877da18f8871ebd7689a54b9ba2d SHA512 30c270d192be99cf06cc1e9555e4373f262effd51d2204a4124eb1f91155251584cee987f5ff8bebe32e09a65c23489393082fd598ff926592b5cd7e66674d2a WHIRLPOOL a781c8848e6058870462e35f20e7df4756753e0077c24ca24c8dbfae03c35b1b3c927d63b29e70ae02a8d792ca517d67f99fc53935bd8ad05dcca02147c93bed
-MISC ChangeLog 12418 SHA256 14ffbc7a97c1660159096b8430b8b858feb1d7f8ea23ed88a0751bb02f5494ab SHA512 4b6ab159c68d1a19b8547560162d6cdf4f55ebf926676db1615a8904f23ab800ad9d7acf5e44d958c57b2cc20339601974f6eb7dfb42f2b6a32deb83a739d19c WHIRLPOOL 40e51347a2404444f372736c947755876a573186fa606f1194070f4c4c92b07770410d6424f898fdf52b6fc8bc948c54063ecc1b0babe75232bb7c50d3b80fb0
+EBUILD json-1.7.5.ebuild 1995 SHA256 fa78cb0ece60d495e33633d5cd1ae831d55e710959d1243238ff692aed9a4623 SHA512 f28b51360ea4fab611072a554492af23208eb1476953826d8d1e934212aca490ef154e33f8512d03c7231015967795a9f85325340a9844e0922585a4f58097a0 WHIRLPOOL d53a395b3f70cda87efd1976192a893e6e39cbbd2886634224270b3bdd2f353fb161d3f539038838c9f5919fe90b938c560d0dffcfc29d1b5f628eea88829aef
+MISC ChangeLog 12530 SHA256 0e0ba3d6dc6c06f03076e9ad9498616343d5a59ec303d4b283648241843d12d4 SHA512 4a34c0d5637ef155f9dfadde213d7552b9d0fd30a7c53fa62d6dee084098c7cfefadd6c14028ece092314cc323ceb742dd67665d23ec7dc14e936ce6d2416661 WHIRLPOOL 47a6745826ffbe0fe08c06382f6c6cfbb72021b1a47dca02d212727288805fb586230571614451ea6c226e28a3568be630902873ec980fc0d3390141dd1bf209
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEAREIAAYFAlArtTEACgkQl5yvQNBFVTW4nQCfacqDA4rs4hXVyWw+WqgIZOq2
-yD0AoJ/FjnPMz3WkGBux0PkGBJPTwbR6
-=1wFi
+iF4EAREIAAYFAlAz278ACgkQiIP6VqMIqNeapwD9HFRiSXzpvVRC9W51L6g9FHC1
+vmAHp01RfT2fQw2r3zkA+gLEGFbZaBAjXOwnNyq+Y1ulyDdJZxCf/mmqpSnJr5k3
+=xcJJ
 -----END PGP SIGNATURE-----
--- a/dev-ruby/json/json-1.7.5.ebuild
+++ b/dev-ruby/json/json-1.7.5.ebuild
@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/json/json-1.7.5.ebuild,v 1.1 2012/08/21 19:04:25 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ree18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES TODO README.rdoc README-json-jruby.markdown"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="json.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A JSON implementation as a Ruby extension."
+HOMEPAGE="http://json.rubyforge.org/"
+LICENSE="|| ( Ruby GPL-2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}"
+DEPEND="${DEPEND}
+	dev-util/ragel"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_prepare() {
+	# Avoid building the extension twice!
+	# And use rdoc instead of sdoc which we don't have packaged
+	# And don't call git to list files. We're using the pregenerated spec anyway.
+	sed -i \
+		-e 's| => :compile||' \
+		-e 's| => :clean||' \
+		-e 's|sdoc|rdoc|' \
+		-e 's|`git ls-files`|""|' \
+		Rakefile || die "rakefile fix failed"
+}
+
+each_ruby_compile() {
+	# Since 1.5.0 a Java extension is provided but it does not compile.
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		${RUBY} -S rake compile || die "extension compile failed"
+	fi
+}
+
+each_ruby_test() {
+	JSON=pure \
+	${RUBY} -Iext:lib -S testrb tests/test_*.rb || die "pure ruby tests failed"
+
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		JSON=ext \
+		${RUBY} -Iext:lib -S testrb tests/test_*.rb || die "ext ruby tests failed"
+	fi
+}
+
+each_ruby_install() {
+	each_fakegem_install
+	if [[ $(basename ${RUBY}) != "jruby" ]]; then
+		ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
+		ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
+	fi
+}
--- a/dev-ruby/railties/ChangeLog
+++ b/dev-ruby/railties/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/railties
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/ChangeLog,v 1.35 2012/08/11 08:38:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/ChangeLog,v 1.36 2012/08/22 00:18:15 flameeyes Exp $
+
+  22 Aug 2012; Diego E. Pettenò <flameeyes@gentoo.org> railties-3.0.17.ebuild,
+  railties-3.1.8.ebuild:
+  Permit newer thor on railties 3.0/3.1.

 *railties-3.1.8 (11 Aug 2012)
 *railties-3.0.17 (11 Aug 2012)
@ -155,4 +159,3 @@
  05 Dec 2010; Hans de Graaff <graaff@gentoo.org> +railties-3.0.3.ebuild,
  +metadata.xml:
  Initial import for Rails 3. Split off from dev-ruby/rails.
-
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@ -9,18 +9,22 @@ DIST rails-3.1.8.tgz 3647373 SHA256 df6718da6475a8cbc102f84ff426f086981f9ea44db2
 DIST rails-3.2.7.tgz 3802538 SHA256 3a16047cd010d5834d5c33a0a9f1843a0ae21e63f2322d9bb0a5820dd9ddd099 SHA512 cf46c3b3684f3493b37fb62bf78c05f28452d6e37d2fc097527a6c9d21fd839aa940c45e816363aaad4cf5d25fbac099e445eecabfad95d1c1de1b291d12fb7c WHIRLPOOL d2ad4e00728d5603b0b85154fa2783646f7749591b529506a4425c727748bff72a02b72e2f5ba9f762c13ea149f847430472ad76fce43a3096e93e334f57fee9
 DIST rails-3.2.8.tgz 3802639 SHA256 312b8c3b42be96015f24354c48cc11e9c3f84da61b426cf271c8dac961e9603c SHA512 d03a4bd95b34ed796097ac9b8c0d37fb612c008a03d29032f2384f15e306ef998537c84ef8a30e5608263efad457ddc76480cedcf5ce1aeeff374c4384f7ff8c WHIRLPOOL c07273181e6b599de7d6b8e873c3935b92c41f76552198f0bf440009cc1a882749e84cf822ddd2fa3ed89df705a6cd1fc219e0629c8312311f9a10b448f43e93
 EBUILD railties-3.0.16.ebuild 1297 SHA256 84db9b4c2bed683b5b2d5b4bbd142279006f15d28a0f85463b37d94e1a9df564 SHA512 9b46c9a992949ec44a16e7d91efd41b7f95980311d2f52e3dd390b588f084a0cd4cddb490905a83bd21274311f0754419ebb9d4df81bbc407e4dee20c22a6203 WHIRLPOOL 9176f248b98f95fb580ed1e23638faac8b6ad8794f51e08f3090dfaa1b330c112a0e225483ef3f378d7f905f3ee39c1519770f1b630f78e9603297ed75d48d98
-EBUILD railties-3.0.17.ebuild 1297 SHA256 d5accb45bd156975fc0d13be0aea7b04f3db4c6fa7c9c84ab72513066fe7e0a3 SHA512 38b63fa914c790a9e2a8c3cd579308dabc778158040e323edcf15ef19c30e0b27d667857584631ae593b05e03579c4c2cfa701bb86fb4e181ef6e83e6baf38e4 WHIRLPOOL 28913d834b48a8dc15794945941b3776c0342bb9850ccdca038056bb7c023b13027e4e11e279b9049600a17606487bb1477e183ad147b78bd33610615b8789f8
+EBUILD railties-3.0.17.ebuild 1415 SHA256 104a005cfa3699d2466930f46b1eb1d6916ddd8b70a0d1813496e0fe85b3d9ce SHA512 dc12c1bcb51064bda697978b8798035d677d2d8dacf7f01bedeb8b15d774886bd7fcff6ca33ece98846a9434c46285c33efbd1e7d9c378e82a43d540a8e2dde7 WHIRLPOOL 843afd5d4cc357a492465635c5f6692aa59a945aa559b9ffad7922d14ddef11e427554d5d1ea5844568466ef50606cdb39c439e575a54d6eb6497216a13afade
 EBUILD railties-3.1.3.ebuild 1590 SHA256 1f20e522d6f85b890ed782a71ed184d214892329518399ab8deb9201f013439f SHA512 18184aac325d0246fcffe4f263c488ac5e5423beceda832ae7fad575aca011de6c3cb5f98a2525ae721ad83e965de95082d8351ee14311c35dd2fa05767e81ee WHIRLPOOL 6ce546b87f9f728371d73fbc200ac94e483d1ba22ba3675fee4aeddd816538a80a391c7019887eb67a014209cb307bb9d1be5f944a4c221f2dda179df402b4a3
 EBUILD railties-3.1.7.ebuild 1595 SHA256 b776ac1fb903917b44d0f1e4896576c61fd867c32a0e53c9a7ddf26569c4cbf6 SHA512 08b600e5232c9a494cdd2550ba5c824f353af66d30f7feaf2d2ca4df19221ad84f59ef114135a1c7e21bd8c74ed17b5d9ba57d221401ed8e66dde9e18d93ad7e WHIRLPOOL e178198f6d849658b13df89db522a4cc17a41772be0c927e7f720a8636eb7bbfd35315f90d76892c8d6ea01792e87558a47fc1ae32255f3fa7e20fa5972ec4a5
-EBUILD railties-3.1.8.ebuild 1595 SHA256 2936b02719ea9e10140d6b8bf44d6bf90210213b08cfb1a1414db2f842bb17bb SHA512 4bdb57cd91ae88946cc7f50aa5967af474c2d56ce0939a99de03fead2722892f2245e0f130e2a9050372f76cedb71ce5599a2c51f4c76d4cee16a167d825018f WHIRLPOOL e8dfa2ccdac1df8a8c0a113fe61b2a665cfbd171bef4ff5d731aad3c9e7a4ef66a47a7c6771dd4a9a3c6bf70f54e96e481c6b70842a4aee503e921c76052b2dc
+EBUILD railties-3.1.8.ebuild 1690 SHA256 9e818a594212532abbc47c4f52115ec941920c8b5b35a8c77958e082b4811cc0 SHA512 2ba2f98f93b9053d2b83e87241907cfe4124b13360f5ad6985436f3d1d6dccce1e2f9b891a0cf153769f665f4242b7558151f0e396add31ccc296559689df66e WHIRLPOOL 8ccb44be7f7290f70583e4b211c6731d618a083545a11893e2da61ba26754a97fd47add2cd733f683defa8ada6365d3b625d97df788d90d4e8c0a9e0ed3f14ed
 EBUILD railties-3.2.7.ebuild 1942 SHA256 34660eb15a05e9fd65eee97fadc7c749d9def194ef8715cf872a9c92138eace9 SHA512 d40e13fa88ad27825be65c5745acf2dafde905d81e0f15a4d230ef8d9f15fd9850f8ff92ee6f851e9f4c47d3fa1b17df49ab213d977f359c9b3d73ce2284b049 WHIRLPOOL fe339c9f734d9d13fd119eabe0f918d9cec475ee69ff777e9c11e7148e46301f3e6ceaf594b5df8bf42b9a68c45b23193001fa61154f979df9446dc881ca426b
 EBUILD railties-3.2.8.ebuild 1942 SHA256 2dcca305ee12bd8ccb684b936bb0ff15da74ef87ab7ac8928d58ea55956d70ab SHA512 b733814e51cf78f4e8c275646f87fe49927113bfe423294a1e7a8c0325f292eb336587bf7c2afbcec1aefec331d3e6636f4b354d1808dcabecf4db247787fcb4 WHIRLPOOL eea3682e20f425c4b91b8309f72f1396857bc998583777f01577e91dc3750381ad71aa53782816f460a41214638f2179422077ff98043b89818d3a24d18da87a
-MISC ChangeLog 5183 SHA256 457862b475e70e703cd627610291949d19ca5fe2a9fb63a558f1668ffe21c1fe SHA512 c0dcb5fe9556ccdd50ff67af8cdb674a34535c8b0aba0ef935682b5646259cb97f31ea22c51761262d55cf54a97889b0ee848849502b353982ae13070b200df5 WHIRLPOOL 2bea1644381af118f0797480e9850560ac6aa5d9dfd50bbaa0984fc0ca94ed8647362465a8cdb96c4d39078eef39b22f62f97a5350d4d9756c276fbbb318af7b
+MISC ChangeLog 5332 SHA256 2bc1ae9475f23240e50711771bf3db34022f0faed72b78fabeb35d63dd64f698 SHA512 4cc9a6749812184163f1111166a2632d6f812f8936bd24b74f955e267c0bd0e13eda7cd15a66428b521bdf3e738260eb746909b7dbc177a8ca9348c27e81e11f WHIRLPOOL 1c34f8f2c54ecd55ae981526cde00a57694104f98df4a883de0e1b1460ec217695e2fb1d86b92e9f48ff972527ee4c99026b06a6ad42bbdd6891ffc4774bd874
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iF4EAREIAAYFAlAmGg0ACgkQiIP6VqMIqNctFgD/VwbylkCn1TaOgQJWIFuob8L/
-Ejgy382j3tZlJ4moyPwBAIX1n/eqO4m0yxvrPW4PxPom2HZ71/Awo4YCURlT2oYX
-=FCGV
+iQEcBAEBCAAGBQJQNCVhAAoJEBzRPIrUMBNCab8H/Rl/7Bs+3CLotr33jMrIe0TB
+xrMKj/3QHrGYE+HQdGhZFjD/RMgR+hc+K7SyJ4TUyK0ZTXPqj5XuM/9/5jatVNIg
+/AmMHUzVURlBycTe+2nC72KX2UbzyubE4MBnGXYNcJpIZOYiihLTJPElIU4LAtQ/
+PRTotIujpgl+vRv77R90pAcY+I845ODIBz/ZyTRBgdkvWWUYkYN4skF8n9c2Rqdn
+Uje9yIf1hmgpwAPz8q2yagvwHEKp+AuzgBWQuEqi97tBoK08np3p3J4EzaUpMlZx
+zlC1IvMXu/nChtC7T2bk4NFPw56mAFkcKKcf9nLOVLegHH3e5v4AYNMBLARcKmU=
+=iw3f
 -----END PGP SIGNATURE-----
--- a/dev-ruby/railties/railties-3.0.17.ebuild
+++ b/dev-ruby/railties/railties-3.0.17.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.0.17.ebuild,v 1.1 2012/08/11 08:38:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.0.17.ebuild,v 1.2 2012/08/22 00:18:15 flameeyes Exp $

 EAPI=4
 USE_RUBY="ruby18 ree18"
@ -45,3 +45,8 @@ ruby_add_bdepend "
 	doc? (
 		>=dev-ruby/redcloth-4.1.1
 	)"
+
+all_ruby_prepare() {
+	# allow newer thor
+	sed -i -e '/dependency.*thor/s:~>:>=:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
--- a/dev-ruby/railties/railties-3.1.8.ebuild
+++ b/dev-ruby/railties/railties-3.1.8.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.1.8.ebuild,v 1.1 2012/08/11 08:38:31 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.1.8.ebuild,v 1.2 2012/08/22 00:18:15 flameeyes Exp $

 EAPI=4
 USE_RUBY="ruby18 ruby19 ree18"
@ -51,4 +51,7 @@ all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
 	sed -i -e '/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\)/d' ../Gemfile || die
+
+	# allow newer thor
+	sed -i -e '/dependency.*thor/s:~>:>=:' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
--- a/dev-vcs/git/ChangeLog
+++ b/dev-vcs/git/ChangeLog
@ -1,6 +1,18 @@
 # ChangeLog for dev-vcs/git
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.147 2012/08/19 16:58:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/ChangeLog,v 1.148 2012/08/22 04:44:08 robbat2 Exp $
+
+*git-1.7.12-r1 (22 Aug 2012)
+*git-1.7.12 (22 Aug 2012)
+
+  22 Aug 2012; Robin H. Johnson <robbat2@gentoo.org>
+  +files/git-1.7.12-git-svn-backport.patch,
+  +files/git-1.7.12-optional-cvs.patch, +git-1.7.12-r1.ebuild,
+  +git-1.7.12.ebuild:
+  Finally, a Git that works with SVN 1.7, per bug #418431! 1.7.12-r1 contains
+  backported ms/git-svn-1.7 branch that will be merged into Git 1.7.13.
+  1.7.12-r0 excludes that backport but is otherwise identical. Thanks to Michael
+  Schwern for the development work!

  19 Aug 2012; Raúl Porcel <armin76@gentoo.org> git-1.7.8.6.ebuild:
  alpha/s390/sh/sparc stable wrt #418381
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@ -1,12 +1,11 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 50git-gentoo.el 472 SHA256 7cd37e8db7eaeee8d822d38851eb69771b0f09c79883a8e51309a9add85fdbe2 SHA512 0435d7d67f2b64460a62c6a95c65a722c0f8d5d50d064a81e690de84a761ba518d32db545ee70c0fa3ad7803d77d5dab100689888bc92c9d82f2d6d5073623b3 WHIRLPOOL 887682f79182f6728af3c0fd2ee0e81319d49761a987559684be5e4acae4af579a5b8d1197ddba31452cec179de3c8f5784cc85ad61f78b400e42c204c93f642
 AUX git-1.6.6.1-interix6.patch 457 SHA256 a8b788b8ef41ce7fd1018f13795694a908fbb1884de195c89a58fe87f3968849 SHA512 58e63d78d665f9122214ec1b7a8d730f7c9d8938283db98580334e293f46a984b86c8d72fbe48f891eda6d48fc76982857539761c6dcf881b1bb5817c275d263 WHIRLPOOL 803ec2121a7abe018c591c249c2b835aadd114a65b0cf6be4fd6440c77f9282d13b4225e1d63a5b22bb46f058bcd073dc97e801476278a91ff9f82634104f3d8
 AUX git-1.7.1-interix.patch 2192 SHA256 b560fcc41ea93df429290ec645f3e37368ceec1101f7124574fa6d9bab00a495 SHA512 bd02d6c2b83827eb3d286ef37b358c2eb25d453655bebf1d2d074b47e7aab1c3b3f07da21eca33f01ac457d2878b674b2c857f9915ac71438a02bca112c89c41 WHIRLPOOL 7a314149acaa54199a258c1ebd9ee34356fa0393d3d49c994b25a66a593d4214391495d5dd67db01e6b1e396cb6c96b0ddcb7c3d78316bec7fb10af0e7e38af4
 AUX git-1.7.10.2-optional-cvs.patch 11951 SHA256 ce5d3a85c2314177320f57a3e31f69a3df19c090b8c06bcd8ac4999cb3348b4c SHA512 4c9cb155e1c689f604712159336a53c2bea4d6e36cdc372aa77b509a462fd9dfa09275ed9f4dabde3e717feb0baddf1d2e6b54507a457e42943d2bcc01dbd31d WHIRLPOOL a47bb4914637902df5de35f721ceb1c8298357a869c76ecff093ae120b98b504e0e61b97ab5622609c2fe45b4aa0b4f2dd99cedc56403073456275b852d4e80b
 AUX git-1.7.11-optional-cvs.patch 12028 SHA256 252e92a9f7fed3149f5474de7f52eabcb8f297e3f4e8d8abcb249fbbaccb7ed9 SHA512 c228e9e33e1f2e9a48a9503e425372c59b4f8602bf5b425d6d70335c21f09b0c7cea244e6b6417154d95501027e6cec3911888d6feac47854d784986215b7142 WHIRLPOOL f650435fd06e5c95dd0644918a889a4c7b1ef5f12fd52552f59a58c2f1fd53faac7e6311af0b70578a1ed1f5428510a4fcc19dfc114a86754d0572d3b1ba0be6
 AUX git-1.7.11.1-optional-cvs.patch 11987 SHA256 78ecfd9b81069a36d810118344211d8f2a1d9f9f116c7f843464943f5d7b0e7d SHA512 811505de403f1f70fb474e8c2748fca370f82b5442b6a3e4178cbd91db9279af6a584a6043930837879d0bea237ea5307ace5d66278416455fe2ff66ab5d573c WHIRLPOOL 0c16c72de6b3f24061e19adbed9880585f49ab6d3ae70538bdaaa2445e37856ce260d429447c466412a3c2c812a027488af7263b87e204a0e8c1f750a3d705cc
+AUX git-1.7.12-git-svn-backport.patch 37717 SHA256 5379c97de060617ca6cef65bcc4f78a986943bdc587517af27c8ae80bb7bfafd SHA512 ad716ed9c449961d7b0bfe29f3450e0a4d4fe2c7c8069916bb0a69a6ee47bab5f7c4b68496b31cd67e6472aa05723ef8f32d8d7f56cdd2f4a40190058e324a8b WHIRLPOOL 30ecbf8cd97903d7a9b5b710f53b3ef6ea3092c224ebc82682a1840d93a28e6680c318d0e69af252b4901255f8f12a992b8a18eb46a9a015fc383a7c70312e89
+AUX git-1.7.12-optional-cvs.patch 11683 SHA256 4ffbbef802c60315740820491c25eaa57e1bba2c74cb5b2f7115b9c28b31d1bf SHA512 9f0af51636d95f78e6708dd2612aeaa8e439308a0537035019ae85a53ee124d73c74380e48706ef718666041e37d721d5ad1c224f902e3e0f88bf16214f6cfed WHIRLPOOL abebd47297245d8da9a28bd5454b6e54c5d16fb0757d099704f6fd7abeac67d2837bc6893bc7bc06145adf9ebc967871a4eec1a86924671b4b04c0b0d72742ed
 AUX git-1.7.2-always-install-js.patch 1167 SHA256 2988513c5a81f446818b850414b4bf7dc8a3177eb1dc32f29e530a80479baa9e SHA512 5607a5a4e6d4f23548cad4198badcae04774cf7a6f658b6ba53a48a4d3fad56525ced55280d037544f406e8233b2c556c670769d0d9fbc63671b7f48fe8a8c75 WHIRLPOOL 396765c75dd83c159af97709dfdc1cdb64fb39b726ff6360a0c2083aa51fda5c123a77942d4713c015a0c5272264225602c99e5269a5aa63072d7a118187dfbe
 AUX git-1.7.3.2-interix.patch 2283 SHA256 13dc741c481fcba6db060bbc8b54d0e19350c9c2270e113afe5ac3962d78e8b6 SHA512 6eb59bfaaef08725dec4405ecfd27549be4d116d48f8757d913b8c4514adea99ac98c2e33f620fc7d19d7f03a2a6a8c2de9a08b765fd6a7b7ce3f27daa703832 WHIRLPOOL a30523cd3e21821f00b865c051bda4e537833d1d8f50125720d2e2e643dd1f4d02235ca652b5d4be52f8bc1daa61bfd701af8679c79250eccdd3529ba2f6506b
 AUX git-1.7.3.4-avoid-shell-issues.patch 1165 SHA256 7dd0eef0b93ed52e1c744d2d1888387c0aafecbdaf2d889c8ad48f45ed68d5d5 SHA512 4f594688c8af3b31d323e33531ddfbb171a98fa6b6b42a9b6587dff510ba0c12b46b49b6272f296850467a5ce813853bf4596719230cb9ad0828ffd32353f466 WHIRLPOOL 7d61a65c2304f7c21c90ec266c1990dccf5670f9ada26087b6ea5f8cef0f3db07b1ee897705ffd60815ab47e31a2c93fd0cc6536f522c3bfe7d5136dcb8e1c67
@ -22,6 +21,7 @@ DIST git-1.6.4.5.tar.bz2 2176867 SHA256 5e570a62d443a32ef013561817b87b4e8968407e
 DIST git-1.7.10.2.tar.gz 3809702 SHA256 335e978814659f328e377715b13a33336859275ae6f215bf28bbbb2ae711bb43 SHA512 52ba7168d50128cf9abc2052400050f14f073c5398c8075d1e3e7695f2d701b107f74e24ca1b2b671a03411010eee86f46c0500de487d5b54d496f1e8d093403 WHIRLPOOL 3913dee3d07acc1a91a4bf553bec9c4fe41321a81d67d10cdbfab5ba81da9a1b010c3be4307616960749840fa85137c237eaf027bdfca6800e95e262752d203f
 DIST git-1.7.10.tar.gz 3753777 SHA256 d2a88d1564ebe468bb6a58a4edb57f5e06bda9846300cdbedbef8f7bccaf4ea6 SHA512 01c622c284a4a661c67facfe6776a86163b68612d7233a887be06cc49e2ba7c7eab36ac5033ee6eec6a56b36ceed1fc85d45f6118d9038fdea82f2bb2b9fd2a7 WHIRLPOOL 7f4f10b60cd2c9ce2e508815d8774424307bcd7272e0500dfe12b84042b998173a187511bbe5d52bde3f387dbb7aef06cf3b8e4e76ee0c6aa442868e5d6551a1
 DIST git-1.7.11.1.tar.gz 4000383 SHA256 b0d90066f3e929b84787d10270461d0d81314898b8f335884e257f4b3091e89e SHA512 23df9e81db3e5df6e6d5fd8a0156b4e645cfcf6ea4c1c03503d9bd780b51b3127a20c6e72a2b41d24c29ab9ef85264b95071ad7074abab6b09074f0de5b0ac4f WHIRLPOOL 4ff6ef2ee0dfa86af4f79a78383c30b963899ed4410f7981f2ca4dce80d80a4d95b252b793b6e8b6e86fa2a885ab3d8fe1812a3232a7f1b371c62a5a801dede9
+DIST git-1.7.12.tar.gz 4092043 SHA256 3b8661782dc280d3d4be5193bcb8a1895c1ba272cf02efb70857bbcc4415f505 SHA512 1353eca72d664bcceb900bbe90003ceb2b8f73db8e3a402e8f2c142f3e933fc19f95c4c5118a1c57221d6513dba3e1912f40169cf36ff8abea97dbf2f8e84502 WHIRLPOOL 11ede1f8383136d0ace13c99e7345c738e911f8038e09cad0aaf8e7cbba789d753b5c337f053b3a145d6a35d29285558571b893fa9f3bc6ac76ec8e25c4fc4f8
 DIST git-1.7.2.5.tar.bz2 2561345 SHA256 d84e6d76fe9d30af5515ea8177b0d8bfe774ee0836d21ed450cb4d52f5aa6311 SHA512 b78e59ea0b110c24121116abbbc191910ba8feae9ca2c89d661abc456cadfa21e42bdc72c961a94a46b47b20f64cd8bf23d0ed600ae40afb8572eb3455ea3ea4 WHIRLPOOL 36dc12f00c84f339502f9b3104a183e855e2b7eb5e11ef46c162804df0613dada52a237f1854177909ddd7d29bf9f317e3dfb6fe223f3e18db4518e7c35a6a1c
 DIST git-1.7.3.4.tar.bz2 2635522 SHA256 3e5e2b6547ee4aae82b4c5f589ff084996e9e6e0e2b52c92365e6baa1e4a0171 SHA512 93cb7a86020488bcb1e367442978c1f2c57be0c623f2f8d7d5cf385fcf2e43fff03354b18985e1560ef807f05d251ea1041440b09216408863cbc1ab7510a09a WHIRLPOOL bbe4f3c71d5322749203eec852aba838f591d24abcdc09949d0727155fa9ecdad9cc127de998173fc3e35459440d173317fda456822645f73c52c28fa37bcfd8
 DIST git-1.7.8.6.tar.gz 3546112 SHA256 45be602d0ca64eb44282cec7a5a7286487f7e9ed0c8112735456a22fdf1f6db9 SHA512 84b0341d040a0f99a40d2d316498a964cf386818673ccf04aacb3b2a7e3c09b275f819a7cd9746dec67e1d0300e13fe5706a57c94ae2d26fd1b82e9b93f405ae WHIRLPOOL 804e70176a229123e09348b6585a461bc162edf9786d617926f42fdab6e615ffba9a9b2b6654562d9757e96bdb3603aaa2ee78ac8c0f124d413409b0fcc7cfa8
@ -36,6 +36,7 @@ DIST git-htmldocs-1.6.4.5.tar.bz2 772113 SHA256 12c13ead869918d8470d68c7331675c5
 DIST git-htmldocs-1.7.10.2.tar.gz 1764063 SHA256 4cb17519eb621060d657c71ba8b10d755a6ea71123642ed6cc73d24ce8f0b734 SHA512 bb2d0b1e5914aaa10e0c13e2c31e45fdc62d413b06eaff3766279c39cc89a81fddcb902b3f3ba2b77118a94b52fc3b32f48c4a0131c8144966efa5349d6ef54e WHIRLPOOL 46043e51bfbb0279b9cde5ac2ac836416ebc77005cf4ee43696196fdf80eb33fe4933b8ece206ab5308be61230750e5262e785af8c944718f0c347d03dc09ab7
 DIST git-htmldocs-1.7.10.tar.gz 1759866 SHA256 049fb01aaaeb9b3dd7bb93e5d601fce33164ad4127519d797e950e0e02f54137 SHA512 2d201f29f1beb0ba7db4ed61fab75b50afc0da3fd6d60337830f178da064bb0c01061ea1bcf6ec3afbdec87d16f54ce8dee82fb8c03c630a62b27f1841049823 WHIRLPOOL 7c1ca7b3ab93e6567b7e483959be106c2abbed0ff5c62fe347abb1a622aa546f6f74ba0163379652d61aae46642d65e3f455df08501aeb47d7a54299b4843c25
 DIST git-htmldocs-1.7.11.1.tar.gz 1775348 SHA256 24cf2400deba4b07a8723e59e033848dd56f3539a5196b5f35aa0782dd682ecb SHA512 0ac99da600ecbc368ba987a387115bf01fe612b2e5675a0f8d95bfa6d039eaa148e7a5ba0bc270352de4aeb14de29962239dc3e799d31986869080afb5c78439 WHIRLPOOL 25cc47ff335c377e95a1dc1cdb557af758f60bf1bde8aeafdcb626bf964a70f40d61f23b6d5ffab93465c513ebb8ba0f0abe277a4d11719024387de7c84371c0
+DIST git-htmldocs-1.7.12.tar.gz 1787511 SHA256 7f58468a20ca7f7d225698d0747902c34f891c88df6beff270b739d6adf4d271 SHA512 6f76f5a2b1bccaddf2ff48a0454c8710c74a197d1ff60bd081fbd67c8c0b3baf21ee2d6c6c27b9cfdc975ce14550be3482241540da6cafa0761c291fd40cc46d WHIRLPOOL 1bd554a612afc58486fc1db4e7fc5cb8d110eb4a6d3eaffc757031248a17421796015f086fe3509b183e64bd84a656623ca8e3fa83ae72078dfdce8159121473
 DIST git-htmldocs-1.7.2.5.tar.bz2 919247 SHA256 6b6291ffad4eae80d2739acdffffdd6293b9e50366cfa53ffb0c3a1427700337 SHA512 e8b2bc14b1a687f76256dfcfae893252b091c6d60dcd0fc53da50ceaee1434d5c976f1d09d45f8cc5a2991a9051ee8d0482a281fe7559225b6c750fe241b713c WHIRLPOOL d1ea7a272ba728e01523439ac897e1ecbc22917aceaa8871ade522d18db37df0d305fd3dd1782ef20dc1c935ec3965ebbe86d4cc29419a9e82aee831002eabed
 DIST git-htmldocs-1.7.3.4.tar.bz2 929858 SHA256 24f03bcd6b5c3745c2395cf49260cdbf7fe80292883b0b4da3e1ac636aee6fba SHA512 3cda317a0608ef1ee18752fd9f0cba8bc91c3f5d66e0e1d8ee4beb63b7e50dd562721fe53bde3244528a915ad463fc60d13896f3344a7679256c11c79fdb33e4 WHIRLPOOL b83941afd6aaafa5354711fdeefa5cbce7e2b255c0ccab411f94dee48d97838fd7224d098c085eec5e1dfd3eb0599b1a39c8cddeeb1b727a15a2398d4c4b6d11
 DIST git-htmldocs-1.7.8.6.tar.gz 1688622 SHA256 7c7447fe136349b1807caba1c00fe6a46866c9b54cba068f322967c0f8b2c0bf SHA512 31a88363aad7a20a5633530a080258807ef52c1a4074dd308d00540f1dc2b6e1c68d1bb43fa55b14b0fff5e3c24034a15debc9236ad3a2eafa8440982a5462cd WHIRLPOOL a8bc612b3d3a453eb46cc7a79fd929b2ac1c9858a52b3687c59fd113c582c4330f44e1dd64f5c4b755ab49aefc03295a19c440af12001f2f42e5ab1836775f7f
@ -50,6 +51,7 @@ DIST git-manpages-1.6.4.5.tar.bz2 254368 SHA256 f73ae98b0cea0ef6d8f7c8b599d6cad0
 DIST git-manpages-1.7.10.2.tar.gz 511363 SHA256 bc57810ec8d87f7a10f320e31ceeb1f9eaf254e62e0f6414af67f17d0cf7d522 SHA512 f62c5996675273f4180de7515782025075ff6c0256b3d41b13916fd0fae1902a61cc554e24aa565b7bee61efb900ff072119332215d55a2819a02eed476f2245 WHIRLPOOL 5496599e839d17e0ce4194598c1e46aba80cd3c2a6352a7168a975a768d3ce71fdca413fe957cd9b2ab2af35adbf401497984ad66858a333f11ea7c8889d6841
 DIST git-manpages-1.7.10.tar.gz 510752 SHA256 19f2b47b436166a6d5958142d8517f057a9532d58249344c482462dbf204d703 SHA512 e6481a3d768ec2ad1f6e22e6e1630c934cb4dd719c86d2b6a5ac46d0f22d213c6602508ef44a584557bec123aa076e60087843e5ad0548dbe5a9de0f419e9e27 WHIRLPOOL f66e2eff2efd5b22db19e2d4d39b84fd1339cd2819cfb370391c2b8788651071a71c49120df22c0e750d07be45eb936122785b4e797ada5b50011bd78e0866b9
 DIST git-manpages-1.7.11.1.tar.gz 514150 SHA256 aaf8593c85400406ccd1a87af21401ed967fa9d4ff6f0cf04a1e121af1b47e77 SHA512 6b1580600c74b32131cbb07923494581a97c7690283c416c5cc18ceb3ceefd9593e3710c3f3da44b0c0bf82921d1ba91f206497860ea0e07641482cb76052d3e WHIRLPOOL cae734b0db0caa72501753b12b0e547438106dcac8d4b358defc00e96a392f6d3e926ae53dd02e5016e19a553c5328d196dbd657c1f7fe9bd174d76636812d2d
+DIST git-manpages-1.7.12.tar.gz 517802 SHA256 146a4e0899a028fd4256654e472ecfe3bef995fb029ea71c35ff9618f14dc127 SHA512 bc407311884e343a550f3280fd48efc8acf63d7682ad9b787c79f64de6268da3183ad9fb09d8354b3c1b8b76539e28d40aee595a5a49cfe9f6c1c147e52ba1be WHIRLPOOL 3fef3a1187574abcfc583a1fddd160fa0512f3466d58420442ca11afc15acc6c0343dd08a05f265fd44b51eb0c1fc5728a2b8cc7b647fcbd3fb3e8529dd47e5a
 DIST git-manpages-1.7.2.5.tar.bz2 289543 SHA256 a42a977a1ecfd3cea62e1f02fc89f57029a94f163ff7205f6a56ab4b67d6bd6e SHA512 b4065ef9ed7beb84d56fdfeadf9608c0b6bd36a06460b68ba575583062612f469e7db1d08c232f3a9253ca0b957bacc508fd4ec702070eb4c84d174af1828ab9 WHIRLPOOL d22249c22ad9da862cb842e37463cff3a7967de70441a851640641d78d185da916db9f3d3fec328bc10e48bc318b2b4fa085fae81c2576a758dededf153cc78b
 DIST git-manpages-1.7.3.4.tar.bz2 294381 SHA256 2ff98641bc655b29a7fb72bced46da09c99b6fad3b651722b7b8057df4a9ce75 SHA512 d73e3d11a0b551d35cfb3fbc214ecec34ea7cb79e11e9453be5dd7c649f7fd93b7ab286590cb6101d5f011b35ee0469443325cd9636520717dc15057f34c413d WHIRLPOOL b17d6e9fefdb02faf4a33ad7ca4707432274e0a929e274d5347fb9917250e76295f2d28da930dff16d9cee4a5fc6fdfbf5b9b700a6d8fdcc218df6ded5088c1a
 DIST git-manpages-1.7.8.6.tar.gz 501678 SHA256 559b7a6ba8eaad655d725765b75aff9c6a5aaed2cc77abcdd2f88c773a0b3a6d SHA512 925c1775e0d57ee832c0794a8adaa5ebe332556358dbe75cedf9298d1f2e39b31e43693d8873667fdd1795e9e7dd71be83880d78d6ff6454959f325fc518bd88 WHIRLPOOL 2ef274e721013070440f8addbc4fd5cfb886db3b78f3a961bf7add2864e9ae609340ca26de88e3edcbd7513ebab1f46ef8d25d3e06bfe760233afdb1d7ccba4a
@ -64,6 +66,8 @@ EBUILD git-1.6.4.5.ebuild 10406 SHA256 186e72aa90b3c98448a64b7ae718772675a601c80
 EBUILD git-1.7.10.2.ebuild 16480 SHA256 251dee03c550c64a91fd0a0f01f6a4dc5829bc88c64e1b761d1d5d4f98ed7d93 SHA512 9b5e31c796c77680e894b0282138ca633690d4fd6236ebea588369dfcc061b4d9cdbd7028331259f63ab7574ff38ecee87148e8ee2d9ae8b584802fd325dae4a WHIRLPOOL 6bcdc20a2a1ef7252483a8afdbc0abee548962c29501f742345d656341aa042dc31b3115dfe46126bf5a2729a03d104bcd291af1eae550416a3064111fa83611
 EBUILD git-1.7.10.ebuild 16477 SHA256 01123e296ddf96a8a949e224e18d783edabd64f6b95275827bca37bdc3dba3e7 SHA512 bd6307fe23fc952669e5f4010b77f6422008b3ab55b7be1c2159afc920b84f1dfeab3d917f67805fbd035bc8c7c10453541bf794acde2222d1bb764ab1d25c05 WHIRLPOOL 4212e9b5e0c89d3e5810578006d9b7961ebf0ec5067fe28a1ebe6ea871597d224e8b4a1abd66626df281c770e77c1852a4a13b77b337d74fc22f3f3763bfa9d6
 EBUILD git-1.7.11.1.ebuild 16499 SHA256 de0a1dd0e716d69e6b86e0d49a1c8d9f02ffc0a8c4d58aaf1612b1aa489d31b9 SHA512 e24476b2a6d6a4b637ec432793af557a76760a2c98585e7521aab4ba522cf4d0c71a5167ae20247a489f75a62c5444ae7ad67f0ad398e8e3a6392f70ffca5b88 WHIRLPOOL 0e0f5f38a4e1932ece197b6c7fa6f592316bd4adc7dcb818ac372a8341a700178f4df5494e3c2d8b435da88a408aefe5614de2e9d468c5f67899620a4d74d239
+EBUILD git-1.7.12-r1.ebuild 14793 SHA256 5aa06143749bbab953b4dfe537a29de5113c23ec3028e3b1be3ed2316ec02fce SHA512 eab3086fe5dd12fd88e5e9c537997a19b1b0d2954e955d825b9eccf7f14da4d3acb9db4bea4b5c46238471c0f51f918c076c096d2381e2f3e97105aa0699f7fa WHIRLPOOL 42692fe010d2b63b955a084e44ced90b5f6b9b20968fa12bcad7aed0f88901be3a9daabfd068f725c82eb5e06b14bf8858313445fc1fe1e61d2ab5af6489894f
+EBUILD git-1.7.12.ebuild 14791 SHA256 ee36594a4cc13667bc2b46ec8e72cf6729f5a996bfb3fbb2549c7bcfe637c575 SHA512 d157710099d711f12a4ca6037d64d7483708e69ede96856f351ba07587d475ad0f822b885274418ba3f4a6ee84fa439b5c565ec11bb0c1c4cfe8cc067647a5ab WHIRLPOOL 72edcec2b0100ddf4187f95334f79e7fea9a4608023f244c3e8653b2bdb075387f5f17bad1d6a1f44240e602fff2297c8160f52e4bb0ada0932adf29426b1800
 EBUILD git-1.7.2.5.ebuild 13520 SHA256 666e01293c6884d6ac11578b45f1fdcdf298cdb6d194c249f8e993d6c1b27343 SHA512 4784305ad792b86459e3641a5b86092512b85a149f3a222e55a3d26cd0c3cc63360555741812a8eae9a65a6b2bcb2962a40b220dd909f7f4866c047a38a6b9b1 WHIRLPOOL c08205a6b74fc22be4862544f44376fe8e3c651435a9f4e5d6bf63e677371ff356792a54af07006bb519372d9d8b62628f3f1f7039c1ae97b1c9bf72d6cd47d1
 EBUILD git-1.7.3.4-r1.ebuild 14029 SHA256 9d0c67c61774f8f1f644b182c551d53bdf305dffaad390d0f0aa3cc048c4f662 SHA512 7ec9d3a609d5de63bee9f2d74ab87013dad12b033e15a9a9daa730754a7b5fe9f16f5f96fb2d237b97887c88908435983004ffbce865af9881e5a9a9d63a7e83 WHIRLPOOL 1ab4ab72833d11853226171d481ed88db85473766033bcc6200a12958e07a8581fd81e7d460e0f91f697de000b3d99214742d6428f889567277795bb73a5754a
 EBUILD git-1.7.8.6.ebuild 14683 SHA256 38f21df5f6abefb90ce93129adacf4b307decd48417d6830eced6ec0b595cbd0 SHA512 7ef0bc6125d06100636bfc15fef7d0cacef08f2c9a75beaa7331f1e5c5e06a7cd96f84b0ec975be8fd290efccaf0b9e40edb524063a2a9bfe69870bd2b2c9185 WHIRLPOOL 06ed98a81369963955aafa2186b30fa64ec544f8f1b268c7bb228d83c0e371e70223a69f7ed69da7df47ddc1a10459c40f36e3b2659d9c85c57e0dc036870d9c
@ -75,12 +79,5 @@ EBUILD git-1.7.9.7.ebuild 16390 SHA256 aa860adfdb9e2633615e7889140405f95b98339d4
 EBUILD git-1.7.9.ebuild 16476 SHA256 7f80b6058d151746d295595df3a2193f37e10f5930c817144107eae535aa9f92 SHA512 a66f968e946d169d0ca8c93a965f36025366d928fbdc94135aaa13b3296a700afab1106d72bb7e09592c445975d0573ad93e248318026fdd4912c0f611199422 WHIRLPOOL 6a965cb166c6f98783529b517fa6f152ce7059b3168ea59b72f89d70008f2af247bca0ffeba6384ef384f00a85114c426a1e44e6a513369a80f5bacd7ac6f9c7
 EBUILD git-1.7.9_rc2.ebuild 16036 SHA256 0eb93296b4353374da0f7254a04f2cdf0b8d08210ef9d08f9ed11ded9baa401a SHA512 f70d16f4d3de459c034b8d237483e689a46ad199be7c6cddd2bb7ce67358b5bb1ed0f8d17493db0df3601277927290ae1b543101637e1865299565ff560a2954 WHIRLPOOL 1964b24328615fcefd5c42cf2f7c55e87cd3b53c7bf00ce0c5dba8514f34249c9e2fe79e770457e6751f32bb8f7dbe9550a515c5d4bb4ce0ad7f68a21f4b0fad
 EBUILD git-9999.ebuild 16033 SHA256 ae6378530c481d867808ff2d999262a91be6757c0941658ec5e04c947d2cef3b SHA512 11d55847e18092006f001165a623088e5587b72db0ff4d953a695f17bc4a72496684db011c89701f68d15b52551a368e08fa5c26231174bcd10d2405b2adf14d WHIRLPOOL e87a5da2805ddd947cb877a9644eaba8f39fe62eada5e81d26183aa3a84377cd9bba9e5f7323b8d7996a8314f0312ed299fea5772c6befe5602750d371996ce4
-MISC ChangeLog 90465 SHA256 5ab5541269fed79ba5dce80705e6ee444fad172cd53434c93e0df222c90f949d SHA512 693c30d0fafbbba244442d1a7f5aa2b5cad2d3a26a7d017c070092be3f25fc0e129c3c5aeb6a7e75763afa3918a9b2e356afd44935bd6cb920bc19e5df95d841 WHIRLPOOL b40346849a258078e8b5c87a12fa799d578409fefeb50928a6d85f86a077b320aac535e542ad471eb3e14d9de63c63cca2746da0e6ddbc1401b1c89c4bab8f82
+MISC ChangeLog 90971 SHA256 3d0c4f2f0344e5425d1534c7cba48cae0db118e5536b5c6ac5875efe64921023 SHA512 56176260f31cf8e8757d23b1517aef7c8ab747055a7bbdbc0d3209b7ba1f63b22e2a87637ea48dcca69627ff3781cf9382aa204c34bea057c62e276d4834a2cc WHIRLPOOL 75851a1d2421fc03bc2a6add6a677a8b6f5c73111a1351546d658973f27400d354effeaf4d161845de4611409f457c6e3b9e10dd08187935fcec6fecafefd6db
 MISC metadata.xml 1633 SHA256 d755feb6f78130bdad7592120067448f46e760430599a39c734a5340ef0d7ae8 SHA512 71aba84643f81abf3c9ad845803bb15b5dbddf1192fe98101998826311090726167ee638b6bd352d8b9c36193e44c3f8702333ddde38967d376c685eb8361934 WHIRLPOOL 38f0469034aa82eebddd78986c10d2783478e98dd6cd11d7281ddad953ab18706ffc61f5faae9902286093bba6cd99f4db4edec0c8c5f7c1453a7426be7e1f0f
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAlAxGzcACgkQuQc30/atMkDjkACgnz3FuhkZW6rhjGmd6jCRpl4m
-DiwAn3WflLx4rbaaWM+6ftq6xefrUAME
-=ZXt6
-----END PGP SIGNATURE-----
--- a/dev-vcs/git/files/git-1.7.12-git-svn-backport.patch
+++ b/dev-vcs/git/files/git-1.7.12-git-svn-backport.patch
--- a/dev-vcs/git/files/git-1.7.12-optional-cvs.patch
+++ b/dev-vcs/git/files/git-1.7.12-optional-cvs.patch
@ -0,0 +1,368 @@
+From eadb20b065c33d46b49c8c95d8cde0c9fe7c62a4 Mon Sep 17 00:00:00 2001
+From: Robin Johnson <robbat2@gentoo.org>
+Date: Wed, 22 Aug 2012 04:25:06 +0000
+Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
+ utilities
+
+Forward-ported from 1.7.10.2 to current git.git v1.7.12 tag PLUS fix-svn branch.
+
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/Makefile git-1.7.12/Makefile
+--- git-1.7.12.orig/Makefile	2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/Makefile	2012-08-22 04:23:48.335032122 +0000
+@@ -224,6 +224,8 @@
+ #
+ # Define NO_TCLTK if you do not want Tcl/Tk GUI.
+ #
+# Define NO_CVS if you do not want any CVS interface utilities.
+#
+ # The TCL_PATH variable governs the location of the Tcl interpreter
+ # used to optimize git-gui for your system.  Only used if NO_TCLTK
+ # is not set.  Defaults to the bare 'tclsh'.
+@@ -405,6 +407,7 @@
+ PROGRAM_OBJS =
+ PROGRAMS =
+ SCRIPT_PERL =
+SCRIPT_PERL_CVS =
+ SCRIPT_PYTHON =
+ SCRIPT_SH =
+ SCRIPT_LIB =
+@@ -445,18 +448,19 @@
+ SCRIPT_PERL += git-add--interactive.perl
+ SCRIPT_PERL += git-difftool.perl
+ SCRIPT_PERL += git-archimport.perl
+-SCRIPT_PERL += git-cvsexportcommit.perl
+-SCRIPT_PERL += git-cvsimport.perl
+-SCRIPT_PERL += git-cvsserver.perl
+ SCRIPT_PERL += git-relink.perl
+ SCRIPT_PERL += git-send-email.perl
+ SCRIPT_PERL += git-svn.perl
+ 
+SCRIPT_PERL_CVS += git-cvsexportcommit.perl
+SCRIPT_PERL_CVS += git-cvsimport.perl
+SCRIPT_PERL_CVS += git-cvsserver.perl
+
+ SCRIPT_PYTHON += git-remote-testgit.py
+ SCRIPT_PYTHON += git-p4.py
+ 
+ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
+-	  $(patsubst %.perl,%,$(SCRIPT_PERL)) \
+	  $(patsubst %.perl,%,$(SCRIPT_PERL) $(SCRIPT_PERL_CVS)) \
+ 	  $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
+ 	  git-instaweb
+ 
+@@ -2088,8 +2092,18 @@
+ 	$(QUIET_GEN)$(cmd_munge_script) && \
+ 	mv $@+ $@
+ 
+_SCRIPT_PERL_BUILD = 
+_SCRIPT_PERL_NOBUILD = 
+
+ ifndef NO_PERL
+-$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
+
+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL)
+
+ifndef NO_CVS
+_SCRIPT_PERL_BUILD += $(SCRIPT_PERL_CVS)
+else # NO_CVS
+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL_CVS)
+endif # NO_CVS
+ 
+ perl/perl.mak: perl/PM.stamp
+ 
+@@ -2101,7 +2115,7 @@
+ perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
+ 	$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
+ 
+-$(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE
+$(patsubst %.perl,%,$(_SCRIPT_PERL_BUILD)): % : %.perl GIT-VERSION-FILE
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
+ 	sed -e '1{' \
+@@ -2126,14 +2140,17 @@
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+ else # NO_PERL
+-$(patsubst %.perl,%,$(SCRIPT_PERL)) git-instaweb: % : unimplemented.sh
+_SCRIPT_PERL_NOBUILD += $(SCRIPT_PERL) $(SCRIPT_PERL_CVS) git-instaweb
+endif # NO_PERL
+
+# This is any perl scripts that were disabled it might be empty...
+$(patsubst %.perl,%,$(_SCRIPT_PERL_NOBUILD)): % : unimplemented.sh
+ 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
+ 	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
+ 	    unimplemented.sh >$@+ && \
+ 	chmod +x $@+ && \
+ 	mv $@+ $@
+-endif # NO_PERL
+ 
+ ifndef NO_PYTHON
+ $(patsubst %.py,%,$(SCRIPT_PYTHON)): GIT-CFLAGS GIT-PREFIX
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9200-git-cvsexportcommit.sh git-1.7.12/t/t9200-git-cvsexportcommit.sh
+--- git-1.7.12.orig/t/t9200-git-cvsexportcommit.sh	2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/t9200-git-cvsexportcommit.sh	2012-08-22 04:19:23.650741974 +0000
+@@ -12,6 +12,11 @@
+ 	test_done
+ fi
+ 
+if ! test_have_prereq CVS; then
+	skip_all='skipping git cvsexportcommit tests, cvs not available'
+	test_done
+fi
+
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9400-git-cvsserver-server.sh git-1.7.12/t/t9400-git-cvsserver-server.sh
+--- git-1.7.12.orig/t/t9400-git-cvsserver-server.sh	2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/t9400-git-cvsserver-server.sh	2012-08-22 04:19:23.650741974 +0000
+@@ -11,9 +11,15 @@
+ . ./test-lib.sh
+ 
+ if ! test_have_prereq PERL; then
+-	skip_all='skipping git cvsserver tests, perl not available'
+	skip_all='skipping git-cvsserver tests, perl not available'
+ 	test_done
+ fi
+
+if ! test_have_prereq CVS; then
+	skip_all='skipping git-cvsserver tests, cvs not available'
+	test_done
+fi
+
+ cvs >/dev/null 2>&1
+ if test $? -ne 1
+ then
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9401-git-cvsserver-crlf.sh git-1.7.12/t/t9401-git-cvsserver-crlf.sh
+--- git-1.7.12.orig/t/t9401-git-cvsserver-crlf.sh	2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/t9401-git-cvsserver-crlf.sh	2012-08-22 04:19:23.650741974 +0000
+@@ -38,15 +38,20 @@
+     fi
+ }
+ 
+-cvs >/dev/null 2>&1
+-if test $? -ne 1
+if ! test_have_prereq PERL
+ then
+-    skip_all='skipping git-cvsserver tests, cvs not found'
+    skip_all='skipping git-cvsserver tests, perl not available'
+     test_done
+ fi
+-if ! test_have_prereq PERL
+if ! test_have_prereq CVS
+ then
+-    skip_all='skipping git-cvsserver tests, perl not available'
+    skip_all='skipping git-cvsserver tests, cvs not available'
+    test_done
+fi
+cvs >/dev/null 2>&1
+if test $? -ne 1
+then
+    skip_all='skipping git-cvsserver tests, cvs not found'
+     test_done
+ fi
+ "$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9600-cvsimport.sh git-1.7.12/t/t9600-cvsimport.sh
+--- git-1.7.12.orig/t/t9600-cvsimport.sh	2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/t9600-cvsimport.sh	2012-08-22 04:19:23.650741974 +0000
+@@ -3,14 +3,25 @@
+ test_description='git cvsimport basic tests'
+ . ./lib-cvs.sh
+ 
+-test_expect_success PERL 'setup cvsroot environment' '
+if ! test_have_prereq PERL
+then
+    skip_all='skipping git cvsimport tests, perl not available'
+    test_done
+fi
+if ! test_have_prereq CVS
+then
+    skip_all='skipping git cvsimport tests, cvs not available'
+    test_done
+fi
+
+test_expect_success 'setup cvsroot environment' '
+ 	CVSROOT=$(pwd)/cvsroot &&
+ 	export CVSROOT
+ '
+ 
+-test_expect_success PERL 'setup cvsroot' '$CVS init'
+test_expect_success 'setup cvsroot' '$CVS init'
+ 
+-test_expect_success PERL 'setup a cvs module' '
+test_expect_success 'setup a cvs module' '
+ 
+ 	mkdir "$CVSROOT/module" &&
+ 	$CVS co -d module-cvs module &&
+@@ -42,23 +53,23 @@
+ 	)
+ '
+ 
+-test_expect_success PERL 'import a trivial module' '
+test_expect_success 'import a trivial module' '
+ 
+ 	git cvsimport -a -R -z 0 -C module-git module &&
+ 	test_cmp module-cvs/o_fortuna module-git/o_fortuna
+ 
+ '
+ 
+-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
+test_expect_success 'pack refs' '(cd module-git && git gc)'
+ 
+-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
+test_expect_success 'initial import has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1) > expected &&
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
+test_expect_success 'update cvs module' '
+ 	(cd module-cvs &&
+ 	cat <<EOF >o_fortuna &&
+ O Fortune,
+@@ -86,7 +97,7 @@
+ 	)
+ '
+ 
+-test_expect_success PERL 'update git module' '
+test_expect_success 'update git module' '
+ 
+ 	(cd module-git &&
+ 	git config cvsimport.trackRevisions true &&
+@@ -97,7 +108,7 @@
+ 
+ '
+ 
+-test_expect_success PERL 'update has correct .git/cvs-revisions' '
+test_expect_success 'update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
+@@ -105,7 +116,7 @@
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'update cvs module' '
+test_expect_success 'update cvs module' '
+ 
+ 	(cd module-cvs &&
+ 		echo 1 >tick &&
+@@ -114,7 +125,7 @@
+ 	)
+ '
+ 
+-test_expect_success PERL 'cvsimport.module config works' '
+test_expect_success 'cvsimport.module config works' '
+ 
+ 	(cd module-git &&
+ 		git config cvsimport.module module &&
+@@ -126,7 +137,7 @@
+ 
+ '
+ 
+-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
+test_expect_success 'second update has correct .git/cvs-revisions' '
+ 
+ 	(cd module-git &&
+ 	 git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
+@@ -135,7 +146,7 @@
+ 	test_cmp expected module-git/.git/cvs-revisions
+ '
+ 
+-test_expect_success PERL 'import from a CVS working tree' '
+test_expect_success 'import from a CVS working tree' '
+ 
+ 	$CVS co -d import-from-wt module &&
+ 	(cd import-from-wt &&
+@@ -148,12 +159,12 @@
+ 
+ '
+ 
+-test_expect_success PERL 'no .git/cvs-revisions created by default' '
+test_expect_success 'no .git/cvs-revisions created by default' '
+ 
+ 	! test -e import-from-wt/.git/cvs-revisions
+ 
+ '
+ 
+-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
+ 
+ test_done
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9601-cvsimport-vendor-branch.sh git-1.7.12/t/t9601-cvsimport-vendor-branch.sh
+--- git-1.7.12.orig/t/t9601-cvsimport-vendor-branch.sh	2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/t9601-cvsimport-vendor-branch.sh	2012-08-22 04:19:23.650741974 +0000
+@@ -34,6 +34,17 @@
+ test_description='git cvsimport handling of vendor branches'
+ . ./lib-cvs.sh
+ 
+if ! test_have_prereq PERL
+then
+    skip_all='skipping git cvsimport tests, perl not available'
+    test_done
+fi
+if ! test_have_prereq CVS
+then
+    skip_all='skipping git cvsimport tests, cvs not available'
+    test_done
+fi
+
+ setup_cvs_test_repository t9601
+ 
+ test_expect_success PERL 'import a module with a vendor branch' '
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9602-cvsimport-branches-tags.sh git-1.7.12/t/t9602-cvsimport-branches-tags.sh
+--- git-1.7.12.orig/t/t9602-cvsimport-branches-tags.sh	2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/t9602-cvsimport-branches-tags.sh	2012-08-22 04:19:23.650741974 +0000
+@@ -6,6 +6,17 @@
+ test_description='git cvsimport handling of branches and tags'
+ . ./lib-cvs.sh
+ 
+if ! test_have_prereq PERL
+then
+    skip_all='skipping git cvsimport tests, perl not available'
+    test_done
+fi
+if ! test_have_prereq CVS
+then
+    skip_all='skipping git cvsimport tests, cvs not available'
+    test_done
+fi
+
+ setup_cvs_test_repository t9602
+ 
+ test_expect_success PERL 'import module' '
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/t9603-cvsimport-patchsets.sh git-1.7.12/t/t9603-cvsimport-patchsets.sh
+--- git-1.7.12.orig/t/t9603-cvsimport-patchsets.sh	2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/t9603-cvsimport-patchsets.sh	2012-08-22 04:19:23.650741974 +0000
+@@ -14,6 +14,17 @@
+ test_description='git cvsimport testing for correct patchset estimation'
+ . ./lib-cvs.sh
+ 
+if ! test_have_prereq PERL
+then
+    skip_all='skipping git cvsimport tests, perl not available'
+    test_done
+fi
+if ! test_have_prereq CVS
+then
+    skip_all='skipping git cvsimport tests, cvs not available'
+    test_done
+fi
+
+ setup_cvs_test_repository t9603
+ 
+ test_expect_failure 'import with criss cross times on revisions' '
+diff -Nuar --exclude '*.orig' --exclude '*.rej' git-1.7.12.orig/t/test-lib.sh git-1.7.12/t/test-lib.sh
+--- git-1.7.12.orig/t/test-lib.sh	2012-08-20 01:22:48.000000000 +0000
+++ git-1.7.12/t/test-lib.sh	2012-08-22 04:19:23.650741974 +0000
+@@ -618,6 +618,7 @@
+ esac
+ 
+ ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
+test -z "$NO_CVS" && test_set_prereq CVS
+ test -z "$NO_PERL" && test_set_prereq PERL
+ test -z "$NO_PYTHON" && test_set_prereq PYTHON
+ test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
--- a/dev-vcs/git/git-1.7.12-r1.ebuild
+++ b/dev-vcs/git/git-1.7.12-r1.ebuild
@ -0,0 +1,511 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12-r1.ebuild,v 1.1 2012/08/22 04:44:08 robbat2 Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="gz"
+	SRC_URI_GOOG="http://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	!blksha1? ( dev-libs/openssl )
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl[-build] )
+	tk? ( dev-lang/tk )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs?  ( virtual/emacs )"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI app-text/highlight )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8
+		dev-python/pygtksourceview:2
+	) )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	app-arch/cpio
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+	)
+	test? (
+		app-crypt/gnupg
+	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc
+		app-text/xmlto"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+pkg_setup() {
+	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts="${myopts} BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts="${myopts} INSTALL=install TAR=tar"
+	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts="${myopts} SANE_TOOL_PATH="
+	myopts="${myopts} OLD_ICONV="
+	myopts="${myopts} NO_EXTERNAL_GREP="
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use nls \
+		|| myopts="${myopts} NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use pcre \
+		&& myopts="${myopts} USE_LIBPCRE=yes"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use python \
+		|| myopts="${myopts} NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts="${myopts} NO_MMAP=YesPlease"
+#		myopts="${myopts} NO_IPV6=YesPlease"
+#		myopts="${myopts} NO_STRLCPY=YesPlease"
+#		myopts="${myopts} NO_MEMMEM=YesPlease"
+#		myopts="${myopts} NO_MKDTEMP=YesPlease"
+#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts="${myopts} NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts="${myopts} ASCIIDOC8=YesPlease"
+	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts="${myopts} NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern,
+	# funded as a bounty by the Gentoo Foundation.
+	epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch
+
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="$(PYTHON -a)"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el \
+			|| die "emacs modules failed"
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use python && use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	newbin contrib/git-resurrect.sh git-resurrect
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		blameview buildsystems ciabot continuous convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \
+		stats svn-fe vim workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-vcs/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use python && python_mod_optimize git_remote_helpers
+		einfo "Please read /usr/share/bash-completion/git for Git bash completion"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use python && python_mod_cleanup git_remote_helpers
+}
--- a/dev-vcs/git/git-1.7.12.ebuild
+++ b/dev-vcs/git/git-1.7.12.ebuild
@ -0,0 +1,511 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/git/git-1.7.12.ebuild,v 1.1 2012/08/22 04:44:08 robbat2 Exp $
+
+EAPI=4
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_DEPEND="python? 2"
+[[ ${PV} == *9999 ]] && SCM="git-2"
+EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+
+inherit toolchain-funcs eutils elisp-common perl-module bash-completion-r1 python ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="GIT - the stupid content tracker, the revision control system heavily used by the Linux kernel team"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="gz"
+	SRC_URI_GOOG="http://git-core.googlecode.com/files"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+else
+	SRC_URI=""
+	KEYWORDS=""
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs +gpg gtk +iconv +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	!blksha1? ( dev-libs/openssl )
+	sys-libs/zlib
+	pcre? ( dev-libs/libpcre )
+	perl? ( dev-lang/perl[-build] )
+	tk? ( dev-lang/tk )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs?  ( virtual/emacs )"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( virtual/perl-CGI app-text/highlight )
+			cvs? ( >=dev-vcs/cvsps-2.1 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( gtk?
+	(
+		>=dev-python/pygtk-2.8
+		dev-python/pygtksourceview:2
+	) )"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	app-arch/cpio
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+	)
+	test? (
+		app-crypt/gnupg
+	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc
+		app-text/xmlto"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	subversion? ( perl )
+	webdav? ( curl )
+"
+
+pkg_setup() {
+	if use subversion && has_version dev-vcs/subversion && built_with_use --missing false dev-vcs/subversion dso ; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts="${myopts} BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts="${myopts} PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts="${myopts} NO_EXPAT=YesPlease"
+	else
+		myopts="${myopts} NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of broken build system ...
+	myopts="${myopts} NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts="${myopts} INSTALL=install TAR=tar"
+	myopts="${myopts} SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts="${myopts} SANE_TOOL_PATH="
+	myopts="${myopts} OLD_ICONV="
+	myopts="${myopts} NO_EXTERNAL_GREP="
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts="${myopts} NO_ICONV=YesPlease"
+	use nls \
+		|| myopts="${myopts} NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts="${myopts} NO_TCLTK=YesPlease"
+	use pcre \
+		&& myopts="${myopts} USE_LIBPCRE=yes"
+	use perl \
+		&& myopts="${myopts} INSTALLDIRS=vendor" \
+		|| myopts="${myopts} NO_PERL=YesPlease"
+	use python \
+		|| myopts="${myopts} NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts="${myopts} NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts="${myopts} THREADED_DELTA_SEARCH=YesPlease"
+	use cvs \
+		|| myopts="${myopts} NO_CVS=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts="${myopts} NO_MMAP=YesPlease"
+#		myopts="${myopts} NO_IPV6=YesPlease"
+#		myopts="${myopts} NO_STRLCPY=YesPlease"
+#		myopts="${myopts} NO_MEMMEM=YesPlease"
+#		myopts="${myopts} NO_MKDTEMP=YesPlease"
+#		myopts="${myopts} NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts="${myopts} NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts="${myopts} NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts="${myopts} ASCIIDOC8=YesPlease"
+	myopts="${myopts} ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts="${myopts} NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-2_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# bug #418431 - stated for upstream 1.7.13. Developed by Michael Schwern,
+	# funded as a bounty by the Gentoo Foundation.
+	#epatch "${FILESDIR}"/git-1.7.12-git-svn-backport.patch
+
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	epatch "${FILESDIR}"/git-1.7.12-optional-cvs.patch
+
+	sed -i \
+		-e 's:^\(CFLAGS =\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS =\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC = \).*$:\1$(OPTCC):' \
+		-e 's:^\(AR = \).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH = \)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -i 's/DOCBOOK2X_TEXI=docbook2x-texi/DOCBOOK2X_TEXI=docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+}
+
+git_emake() {
+	# bug #326625: PERL_PATH, PERL_MM_OPT
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="$(PYTHON -a)"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		"$@"
+	# This is the fix for bug #326625, but it also causes breakage, see bug
+	# #352693.
+	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el \
+			|| die "emacs modules failed"
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb/gitweb.cgi \
+			|| die "emake gitweb/gitweb.cgi failed"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+
+	dodoc README Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		use doc && dohtml -p ${d} Documentation${d}*.html
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc} || die
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc} || die
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc} || die
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	if use python && use gtk ; then
+		dobin "${S}"/contrib/gitview/gitview
+		python_convert_shebangs ${PYTHON_ABI} "${ED}"/usr/bin/gitview
+		dodoc "${S}"/contrib/gitview/gitview.txt
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	newbin contrib/git-resurrect.sh git-resurrect
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	for i in \
+		blameview buildsystems ciabot continuous convert-objects fast-import \
+		hg-to-git hooks remotes2config.sh remotes2config.sh rerere-train.sh \
+		stats svn-fe vim workdir \
+		; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	newinitd "${FILESDIR}"/git-daemon.initd git-daemon
+	newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+
+	fixlocalpod
+}
+
+src_test() {
+	local disabled=""
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh"
+	local tests_perl="t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			built_with_use dev-vcs/cvs server && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use python && python_mod_optimize git_remote_helpers
+		einfo "Please read /usr/share/bash-completion/git for Git bash completion"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache )"
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use python && python_mod_cleanup git_remote_helpers
+}
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@ -1,6 +1,18 @@
 # 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.81 2012/08/21 20:53:41 tommy Exp $
+
+  21 Aug 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  subversion-1.7.6.ebuild:
+  Drop already commented out --with-sqlite argument, fixes bug 413579
+
+*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:
--- 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 15659 SHA256 86803e206615359acf8e384ed742fccd057cebe4b61668852b92076365e5bd80 SHA512 83f1e2b67556caf35bf32cd1093831175139118b6f406230bf00a66da9b09771e0325d0696432f433f1f68092922b5ce07eb19fe2dc9d37558b1d04de7bde219 WHIRLPOOL f5151a678c07b54f5860ee9f373b89a7cfa8bb8c0c6d5cefe5c3dcd7a7ef70fa2961da710c68603c26d55c675db60213d511f6215f56de2f0593e18ac9ed4282
+MISC ChangeLog 85636 SHA256 64368ce2fd17426f7dd53e815ea36556179dc63f25a592ecbe0a7dbbe125156b SHA512 a22d15b7a60b2cc2be87686aebf78cc6837e95e003a5aff75d352cce69e8dd182d7a729d65fd64d46d6974e8567a3b09e2cc385c0dacffb756f3a5e8c00b7137 WHIRLPOOL 6b4f56d664a7e6f7bcc36afbe08beea9bee0bf81ed891871f25695e071e30c27a471d42864df6f5ec83f00ffd22f76213bb6bc0e641f9b8fd68b3353863cac48
 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
+iJwEAQECAAYFAlAz9WEACgkQG7kqcTWJkGc0hQP8Dn51VF4bo8zaVlLWxfvo3tX+
+UQSeXDv+S8koa9M98HLfCtfvHchMZ2jT2VHSqkpeW2bYB+ea9qyj/QewPH6CRioh
+U788WYniBcGIpwiA99LJVM0olCbPOnlk71KLTIvyw+3evGla22YlwMYuX5JjGTyU
+U6o912h3cAWRRM/Lnk4=
+=1YV8
 -----END PGP SIGNATURE-----
--- 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
@ -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
+ 
+ 
+ ########################################
--- a/dev-vcs/subversion/subversion-1.7.6.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.6.ebuild
@ -0,0 +1,452 @@
+# 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.2 2012/08/21 20:53:41 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
+}
+
+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
+}
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.377 2012/08/19 11:12:35 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.378 2012/08/22 01:41:12 ottxor Exp $
+
+  22 Aug 2012; Christoph Junghans <ottxor@gentoo.org> unpacker.eclass:
+  added support for cpio archives

  19 Aug 2012; Johannes Huber <johu@gentoo.org> kde4-base.eclass,
  kde4-functions.eclass, kde4-meta.eclass:
--- a/eclass/unpacker.eclass
+++ b/eclass/unpacker.eclass
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v 1.9 2012/05/11 07:46:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/unpacker.eclass,v 1.10 2012/08/22 01:41:12 ottxor Exp $

 # @ECLASS: unpacker.eclass
 # @MAINTAINER:
@ -276,6 +276,25 @@ unpack_deb() {
 	unpacker ./data.tar*
 }

+# @FUNCTION: unpack_cpio
+# @USAGE: <one cpio to unpack>
+# @DESCRIPTION:
+# Unpack a cpio archive, file "-" means stdin.
+unpack_cpio() {
+	[[ $# -eq 1 ]] || die "Usage: ${FUNCNAME} <file>"
+
+	# needed as cpio always reads from stdin
+	local cpio_cmd=( cpio --make-directories --extract --preserve-modification-time )
+	if [[ $1 == "-" ]] ; then
+		unpack_banner "stdin"
+		"${cpio_cmd[@]}"
+	else
+		local cpio=$(find_unpackable_file "$1")
+		unpack_banner "${cpio}"
+		"${cpio_cmd[@]}" <"${cpio}"
+	fi
+}
+
 # @FUNCTION: _unpacker
 # @USAGE: <one archive to unpack>
 # @INTERNAL
@ -309,6 +328,8 @@ _unpacker() {
 	case ${m} in
 	*.tgz|*.tbz|*.tbz2|*.txz|*.tar.*|*.tar)
 		arch="tar --no-same-owner -xof" ;;
+	*.cpio.*|*.cpio)
+		arch="unpack_cpio" ;;
 	*.deb)
 		arch="unpack_deb" ;;
 	*.run)
@ -381,6 +402,8 @@ unpacker_src_uri_depends() {

 	for uri in "$@" ; do
 		case ${uri} in
+		*.cpio.*|*.cpio)
+			d="app-arch/cpio" ;;
 		*.rar|*.RAR)
 			d="app-arch/unrar" ;;
 		*.7z)
--- a/games-board/pokerth/ChangeLog
+++ b/games-board/pokerth/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for games-board/pokerth
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/ChangeLog,v 1.39 2012/08/16 08:37:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/ChangeLog,v 1.40 2012/08/21 19:44:10 hasufell Exp $
+
+  21 Aug 2012; Julian Ospald <hasufell@gentoo.org> pokerth-0.9.5.ebuild,
+  +files/pokerth-0.9.5-underlinking.patch:
+  fix underlinking issues wrt #418349

  16 Aug 2012; Johannes Huber <johu@gentoo.org> pokerth-0.9.5.ebuild:
  Stable for x86, wrt bug #430282
--- a/games-board/pokerth/Manifest
+++ b/games-board/pokerth/Manifest
@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256

+AUX pokerth-0.9.5-underlinking.patch 376 SHA256 1cc0714344713904f0643f96d63499a77fa5deaceff05688f154365aa9ab8b6a SHA512 72e036c0da76843e71951213d2ce2feb9d5d28811706a408e30a3ed81744d88fc6d12bbfe8a2f1b26f56effdd342b4db6f7461042c1aecb4e8de7aa1276bf4bf WHIRLPOOL fec30046e4bcc2f06a2c80a8e47ca86f9b2a062fa77b6e91106b6ec35758b05823c97b58f31a3670143b915a2d06732160e5d8bd96d4bd8b04a56bb09dc91625
 DIST PokerTH-0.9.4-src.tar.bz2 10880379 SHA256 382de9a9f7d05c9acb0df4cbf7ba2881437ff961a2ee36dc605547ce469f23c6 SHA512 e37797293ca329f274f2b7e7561db9aff509f322403537309e4963edfcb1867b4c86f3335d17a93bcdf30e62e949b3c40751290d4c65098de64167ea2bdd515a WHIRLPOOL fe282a24d6e5e8486bbd9e4559f15d5ded10ea2dad87741ec083aca60eb59e58318af7ce71f585943fd9f8f13ed3105ead08f70d8cf37ba023dd2b079c25a30b
 DIST PokerTH-0.9.5-src.tar.bz2 13598803 SHA256 b837bdccbf13c15cb22f255ad0e367c24ac431119cb7c7da48e8a753b81c599f SHA512 88df4879e06f39e782fb64490b0259f9904af7d7fd6c23821192e481bd92e4089e3f21df90619fcd7c4edb49b646a0867276dc115b3598f287fe4267bce40d5b WHIRLPOOL e23bb2b559c2c6c7af6eaf75ece0c4146f5c5e030278f156bc9d3fb0f2847e91c3eff6bd71d41002c36810a28dcb3d458c9b240ad21566ce8f8b98a575991842
 EBUILD pokerth-0.9.4.ebuild 1899 SHA256 9e4dcaafbe3bc98e9b55d79a8fa32a25f8124aa822ddf935924c7086bf11a026 SHA512 f483eab72bbef10bc215a55593bb186d437ea59e6d7807d746f0497b1cbf1ad4525ceb265f225824c45e457fe0864c044fa43bec491509a8b905a8463154dae1 WHIRLPOOL 943801763303d3c7baa28ee69237a8865efb815c1789cbf3d1a8c5612c39bc6c9eaa81c9ed01ab9539c1bc147df028b6b31f6dc59e362aaf09509691f9da82aa
-EBUILD pokerth-0.9.5.ebuild 1899 SHA256 1f92f8f2feb04247594483aa73e3158c4c03196525d2c43217b64a6fda417239 SHA512 dce8df1ea457e0e156b1027431137f20d2518d06531427d898c6cd6bb312fbeb20e99f12b17dd8f6e54b59fa0cb65d2afafff771e5b144ef2a7469a254d8aa07 WHIRLPOOL eec78ae6e611f16a2493456ebb0215e6c4e41db018971b2c2a2c1a8ba8f02ab361d1f444d1bd80cfae01480cbceabcd4ec2350b469d6588452e58a4941e80c61
-MISC ChangeLog 5072 SHA256 4910b2eead04f1e3f942688185844e31bbb79c574e79993f7dec09abd3e32d35 SHA512 463f615be9df6f9149008361b5ecb0b5a0ec8d0f5ee000db3efb84f2f52bc8c5442bb4ade990555273a9ab897bcec874d3fbda00c5cccf82e24822eb3833a083 WHIRLPOOL 7a67c39ee377550cca3bfe2928eb363d36ed34d9f3c83aa798b8e21fb5d4784d07d1ccf424522a161b76d39e87577156f056c0e00fcb872d06ce769c4f7b24bf
+EBUILD pokerth-0.9.5.ebuild 1950 SHA256 8e92f4f60492cd0806fdd2e3b285d68814e9a46a7b25cc72d4b435030bb9e966 SHA512 6235cc30f0069ba783551cfb6ecd610446ed153182f0cbfc56dab7faaaa2a374eae20695e0edb463e437b4738e09fea3570aa9a5f8eeadb84414dbc67bfe8d46 WHIRLPOOL 000b6fc396bbb702303f6cc38d6dfdf085e1d7587148dd0364561291af546936c6129fc23200073c24fbf6ea008fd432976328a08248fa6ba7b66503752dbda8
+MISC ChangeLog 5231 SHA256 a9459c5603a4e41699c3ef61fdb9853b184c330370f0812eee5628153346d1c9 SHA512 cfb4375649e7746ff1862a48b62f0b9560b705b53d68462517d080cbb3a4b5737ee76986cffe88c2156d8a1f79f31a142b573f5ad4187ed994a8c76cc37d4415 WHIRLPOOL 2bcd9ba539a64afe989dba357b4d8f0885c879f892a48dd85f8397368896b2375944e9b30204843872d12fd93e56665472116bfcb9b1e0523bc69b62bae3f3d3
 MISC metadata.xml 160 SHA256 5ac0a3647e8149d52ce55d391cf1680ac52d6f0330be21c3bca4790b971b5e5d SHA512 e5ae2b384aa96a402995bf0e8b4c29d38d57f1ebc44eeca71d7eda9a29431b7737c3c3a5df053e868a21c21abb457658344e7fb7c2102d4625a160273048c2db WHIRLPOOL b626c8afedc54ba9adb429cb53f860c0165702b1cea15f5c84c4e458cc94f28755ec66c5b73d9ecc155c1de70c82e1d79ba859c2124d0a78437681f2786e1246
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQEcBAEBCAAGBQJQLLKjAAoJEO+t9ga+3I3aPQsIALDie8Oes3NN0irTa4bfqiba
-4UxWTcDDozs9PP0yzR+Nk4BhPCOAxw1Z8AQafAXECnIrwtcNWBVqdWios6jNW0be
-9kt7ZKlpTkVml+ncbJ4ifKdGgn+riHktfbSp0lLbHLqk0/sb+9pt6BK4JJRDthFT
-jNCPlaYYe7148v37qWBsdtzlGep1bGcKcj4Ux9RLA9kioIN5rbF7ED3BjXi/IuLZ
-GVrkC62o4fwjPvNlU9fSoamzzALI9owGgqec9Fh77iU8YUy2/3AdSwdV1sJIczdp
-XPzq5Dv/BOWzaGIEjMS9uTJsa5eM8Fjo+8iPanrofeMRi2s0RkLNYISMixINOCc=
-=gIXj
+iQEcBAEBCAAGBQJQM+PhAAoJEFpvPKfnPDWzLT4IAKS0Wkv9Jx7k+ry6visUSkfZ
+AFfM5oVljj01EWPa/qHpfTsDMFxO1CDfRMXmXsmWj2xFenDuZwYl4lc1oSxIjMZw
+NAwgBlyOh1CEz+0VQWBYozVjn82AXcw8EyxMMMip4sgCr0nSi7OcTJaaBqycJnAQ
+FPk0UPS2W9hh8t727/VOYoX/qJyI1sHR+sk6HtCQMsEpluP3EKmhwdGIq5x+x1Wh
+KZiSRy+5VHbCJCLL86iJm5KRh/DULvCANISkQCH0fHG9w8kMTmILSkiSSQPiaXqT
+YShGaez+Nr8TTbTa2qbdo7kpEp411F0WGuIHvEAPRG/kdZN3FTmhkupEN+Hut4A=
+=/MCb
 -----END PGP SIGNATURE-----
--- a/games-board/pokerth/files/pokerth-0.9.5-underlinking.patch
+++ b/games-board/pokerth/files/pokerth-0.9.5-underlinking.patch
@ -0,0 +1,17 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Thu Aug 16 22:25:12 UTC 2012
+Subject: build system
+
+fix compilation for linkers that don't permit underlinking
+
+--- pokerth_server.pro
+++ pokerth_server.pro
+@@ -114,7 +114,7 @@
+ LIBS += -lpokerth_lib \
+ 	-lpokerth_db \
+ 	-lpokerth_protocol \
+-	-lcurl \
+	$$system(pkg-config --libs --static libcurl) \
+ 	-lircclient
+ 
+ win32 {
--- a/games-board/pokerth/pokerth-0.9.5.ebuild
+++ b/games-board/pokerth/pokerth-0.9.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/pokerth-0.9.5.ebuild,v 1.3 2012/08/16 08:37:46 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-board/pokerth/pokerth-0.9.5.ebuild,v 1.4 2012/08/21 19:44:10 hasufell Exp $

 EAPI=2
 inherit flag-o-matic eutils qt4-r2 games
@ -46,6 +46,8 @@ src_prepare() {
 		*pro \
 		|| die 'sed failed'

+	epatch "${FILESDIR}"/${P}-underlinking.patch
+
 	local boost_ver=$(best_version ">=dev-libs/boost-1.41")

 	boost_ver=${boost_ver/*boost-/}
--- a/games-engines/gargoyle/ChangeLog
+++ b/games-engines/gargoyle/ChangeLog
@ -1,6 +1,11 @@
 # ChangeLog for games-engines/gargoyle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.18 2012/06/15 15:40:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/ChangeLog,v 1.19 2012/08/21 19:18:49 hasufell Exp $
+
+  21 Aug 2012; Julian Ospald <hasufell@gentoo.org> gargoyle-2011.1.ebuild,
+  +files/gargoyle-2011.1-desktopfile.patch:
+  make build output verbose, fix build wrt #432178, fix desktop file wrt
+  #432222

  15 Jun 2012; Michael Sterrett <mr_bones_@gentoo.org> gargoyle-2011.1.ebuild:
  games goes last on inherit line
--- a/games-engines/gargoyle/Manifest
+++ b/games-engines/gargoyle/Manifest
@ -1,6 +1,21 @@
-DIST gargoyle-2010.1-sources.zip 10771623 RMD160 68407ca19b4c3a4efc40c18a363e5e3dc15e950f SHA1 eeea17b34ba7cdeb0dc1b619b88b36ec2bb8368f SHA256 1646565625cf963bf27f0cbe91735523e1c83ea2d49bef9ff534c1ac78aa7e1d
-DIST gargoyle-2011.1-sources.zip 11291660 RMD160 43de562c12a068c5d6f4fab6bb62647faadd0ff3 SHA1 8e01e458e01dd7d20fe5330f95a3e44b7cbc37d6 SHA256 8642ac38add31d47bfd531d4121dc1e956d06895a9352ce573b5007e9cae4634
-EBUILD gargoyle-2010.1.ebuild 3253 RMD160 efc7f7579d42f2dc89144e6a559bb4e45a286433 SHA1 090d04e500ce4aa581d4904440cf2fa13e26b70f SHA256 8fdd51a82daf4243e5bac795f7f0c8e3cf5b0c1a52b8cf0f5f1f8284e6a3fee6
-EBUILD gargoyle-2011.1.ebuild 2747 RMD160 2af45f4af56d3dbf0bfd3706989ca982461ee4f0 SHA1 441fe1c37c4b58cf19ed4e6ba813c6e8df461a9d SHA256 57ed2d76a42ad4f506ba49e1a47c5a90c8ee00ce991defbae1aa8f0ce92ec055
-MISC ChangeLog 3140 RMD160 3c0e3cf3572ea95cd237f0454fedb3f7a9e5c2a6 SHA1 5d9673284d1f38e1846c6ef23d55d3fb71161cd0 SHA256 c9ab962b6b372df004bf624da772bfe2ed06a2307bc8681d4e36dd4e35e36394
-MISC metadata.xml 331 RMD160 d6a967accb25d826d8cff9ef9ba8cc7cfac40e2b SHA1 e6453420924637fed38cb2ebcbdc320815329343 SHA256 51cc1262568afa65da7057a6ff1799d5e09251f97eb7d15c4708b8140aa5993d
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gargoyle-2011.1-desktopfile.patch 1265 SHA256 b9f0eba5af34a7703c2d3bd38e216f82fd86cbf1acdb94267aaa06ba8b9a222f SHA512 ed31bc711b52b5d231f130956d7d07cb9080747e6d53c85b379aa413582f8e4ffe825298bc86180ec7d1eadff5e6bffc6e49b3ff7a2607f612dcf81a6c1af22e WHIRLPOOL b80e185d019ae88e256c14700c510a1ca81a9d7dbd081c9b685c7e5149d743d53d0a54606f295e8e35a074ba46753ea3ac1fe9fa10dd995910a872fa6d48b5fc
+DIST gargoyle-2010.1-sources.zip 10771623 SHA256 1646565625cf963bf27f0cbe91735523e1c83ea2d49bef9ff534c1ac78aa7e1d SHA512 45a24eae5b02864e8e0df2833ff53cc8aad28aed8e404bb6dd95caa48c9522989196b60b9d70702af4d5e0f7bc06af48e8067dc0580fd23d8612513305b72079 WHIRLPOOL 5cc4e2018c58b1080c5338981ea3543b45adc8bff6b7e3e6546387ad29c63dec978eddd048ccd484628645d274394ca3735c1bb1c617e691dd05787c0cb7b248
+DIST gargoyle-2011.1-sources.zip 11291660 SHA256 8642ac38add31d47bfd531d4121dc1e956d06895a9352ce573b5007e9cae4634 SHA512 65159580cf3494944f841c44320135580557258e37ad5523ae3ea30555c19834a2793231a8e42c217e5c1d055d50ed6a20d372d6302e880a2818bc4ea59b226f WHIRLPOOL 19e572d52ec6436c5b41d767e45d509bd965a0d4009b4445db08e79125eabb20636374bbb818ef7115a1ca9ac983a29cb2eaa3848a22e17d5e7d26284200b86f
+EBUILD gargoyle-2010.1.ebuild 3253 SHA256 8fdd51a82daf4243e5bac795f7f0c8e3cf5b0c1a52b8cf0f5f1f8284e6a3fee6 SHA512 3edd73646cd9a33bdc919a3bc3cef6e1fae814955cc8c9d9618582f3a4e7edabd56907d7e42b5c934a1fbdd9981516add5ca2046eb5de5caffed39ed3910bc5f WHIRLPOOL 7e23dfa4cd8d7b305a4f144c500c2814d9ec100893dabb19d6f7074dfbdfe7ea570022fead48f12330ec9d6708281e2246d272c1f01da487f16638624f343cd6
+EBUILD gargoyle-2011.1.ebuild 2862 SHA256 cc4f1996920b2cdeb2a76fe7ad67b1122fbaf885a2f59d44bc807858cef84a2b SHA512 9e37153053f6678aaefd1ee837599ee5297c0b3b450da82eeda294dd9eb20abc5d1b56f5abf8848c30d83b06eba28d5e1154a9b61c839d48bc77db11ce56594e WHIRLPOOL acf6a7c0840af8cef36a8f1208d205da1de10a8f960217cf765408eba85545d51e3e9b2a4473212ed5d71db6f03a198eb9c94602da5d1cf60edff04902d6e698
+MISC ChangeLog 3342 SHA256 221298364f475a3488cc2c4cda586bbb221246d37b99f82dc78e418a3b456046 SHA512 ddaf41baebfa62cf2ceb77bf016087fe2f73568b1c592745be2d3527400c2eb44293ae8448c84d926e34bb378d904cdf94cc27c86d73b31e58804acbc62cb509 WHIRLPOOL a5d44db0329a78958e0c3742f95aa66576234815e8f7609ad3c9cad2a92623c2ad53e9a1e61d26ab533f713b62f4e9cd1783f9b4ae8ccb214b382848abeccbfe
+MISC metadata.xml 331 SHA256 51cc1262568afa65da7057a6ff1799d5e09251f97eb7d15c4708b8140aa5993d SHA512 d7dd2d4155c4c41730c9e03d51239c275458d82e0ca3448aa54078937cbaef3256f599ef47fb5ee50c6f2cb3734270de9dc0face1e7444bd7c67a459ce4c41f1 WHIRLPOOL 0c2e76db27725d24fd24685f56305949a1fef04f87c5e0db8ebe5bd88e16a73b4d16b9109d3237a1968f466d36d3bc7660e03cecc2f9f8d479e4138ed38ee8f9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQM93vAAoJEFpvPKfnPDWzc3MIAKqzWbAVJyYtjFgCslYYJa5K
+fVLETvGMIyGzTUX5hxw6bXEyPvOdxw1Gz0CMPvXovQS+eGtdXx1UvF9qC0h+R29g
+wggoF+YPBRLkWCz4vo0Rww/LKYws+QlYI0uCuS8yhVYJWBNybYdQ41xi6zDqpbWf
+eBgeZ6Z13Ul/iN/fHbL+Uv7Bnfv6nvnQq8vNJklkuq0uJd4P3QtiX9Cv7+uNURCp
+iI24uMNqxe65BW/CeEn8wwn6RKmQhkyNw4w9I+VYDNw3JhjDpSYGj93mJ6vWvR5N
+5eW26DL26cvlXKS4qsx65L4O8IiJBq+BX9uFK/NWyUR5eEhE98PcUS00BTbFX/8=
+=dOcX
+-----END PGP SIGNATURE-----
--- a/games-engines/gargoyle/files/gargoyle-2011.1-desktopfile.patch
+++ b/games-engines/gargoyle/files/gargoyle-2011.1-desktopfile.patch
@ -0,0 +1,31 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Aug 21 19:06:54 UTC 2012
+Subject: desktop file
+
+fix QA issues:
+
+# desktop-file-validate /usr/share/applications/gargoyle.desktop
+/usr/share/applications/gargoyle.desktop: error: file contains at least one line ending with a carriage return, while lines should only be separated by a line feed character. First such line is: "[Desktop Entry]"
+/usr/share/applications/gargoyle.desktop: error: (will be fatal in the future): value "gargoyle-house.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path
+
+--- garglk/gargoyle.desktop
+++ garglk/gargoyle.desktop
+@@ -1,9 +1,9 @@
+-[Desktop Entry]
+-Version=1.0
+-Type=Application
+-Name=Gargoyle
+-GenericName=Interactive Fiction interpreter
+-Comment=Interactive Fiction multi-interpreter that supports all major IF formats
+-Icon=gargoyle-house.png
+-Exec=gargoyle
+-Categories=Game;
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=Gargoyle
+GenericName=Interactive Fiction interpreter
+Comment=Interactive Fiction multi-interpreter that supports all major IF formats
+Icon=gargoyle-house
+Exec=gargoyle
+Categories=Game;
--- a/games-engines/gargoyle/gargoyle-2011.1.ebuild
+++ b/games-engines/gargoyle/gargoyle-2011.1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v 1.3 2012/06/15 15:40:37 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-engines/gargoyle/gargoyle-2011.1.ebuild,v 1.4 2012/08/21 19:18:49 hasufell Exp $

 # Regarding licenses: libgarglk is licensed under the GPLv2. Bundled
 # interpreters are licensed under GPLv2, BSD or MIT license, except:
@ -10,7 +10,7 @@
 # don't apply. (Fonts are installed through dependencies instead.)

 EAPI=3
-inherit eutils multiprocessing games
+inherit eutils multiprocessing toolchain-funcs games

 DESCRIPTION="An Interactive Fiction (IF) player supporting all major formats"
 HOMEPAGE="http://ccxvii.net/gargoyle/"
@ -33,7 +33,8 @@ RDEPEND="media-libs/freetype:2

 DEPEND="${RDEPEND}
 	app-arch/unzip
-	dev-util/ftjam"
+	dev-util/ftjam
+	virtual/pkgconfig"

 src_prepare() {
 	# Substitute custom CFLAGS/LDFLAGS.
@ -52,13 +53,17 @@ src_prepare() {

 	# The font name of Linux Libertine changed in version 5.
 	sed -i -e 's/Linux Libertine O/Linux Libertine/g' garglk/garglk.ini
+
+	epatch "${FILESDIR}"/${P}-desktopfile.patch
 }

 src_compile() {
 	jam \
+		-sAR="$(tc-getAR) cru" \
 		-sGARGLKINI="${GAMES_SYSCONFDIR}/garglk.ini" \
 		-sUSESDL=yes \
 		-sBUNDLEFONTS=no \
+		-dx \
 		-j$(makeopts_jobs) || die
 }

--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@ -1,6 +1,12 @@
 # ChangeLog for kde-base/systemsettings
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.155 2012/08/17 11:04:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.156 2012/08/21 20:21:58 johu Exp $
+
+  21 Aug 2012; Johannes Huber <johu@gentoo.org>
+  +files/systemsettings-4.9.0-parallel-build.patch, systemsettings-4.8.5.ebuild,
+  systemsettings-4.9.0.ebuild:
+  Add upstream patch to fix build with aggressive parallel compile options wrt
+  bug #430940.

  17 Aug 2012; Johannes Huber <johu@gentoo.org> -systemsettings-4.8.4.ebuild:
  Remove KDE SC 4.8.4
@ -721,4 +727,3 @@
  18 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org> +metadata.xml,
  +systemsettings-4.0.0.ebuild:
  Added KDE 4.0.0's systemsettings.
-
--- a/kde-base/systemsettings/Manifest
+++ b/kde-base/systemsettings/Manifest
@ -2,24 +2,25 @@
 Hash: SHA256

 AUX systemsettings-4.4.2-xinerama_cmake_automagic.patch 923 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157 SHA512 078c335602def32a80eb7fd4775c5e12c5eb5fa92d111323ff16fed77257b034d07920355a5cfa48ed58b3a39222359d160f8443b696dff0643b2a40b92ebab4 WHIRLPOOL 32709a4c9f87a35b50caefbbfe90c77d5211036b18d6b0c7e0feeba37143c01077f9e67df8bc2033c1a0c09fb8b0c167dc09942598a9ce0a0d88a2a1dce4731f
+AUX systemsettings-4.9.0-parallel-build.patch 946 SHA256 e37e20cce5e8149dd6c5ea38e818c36a76ce16f5298680b7f933f0b49dfe0105 SHA512 f1bdd136fd23a5f770093035a0d06a3031d3b74ba020020d95bbe73b202a50159a2a9257468b96f1957ec14c1dfa913c6808e0d67b80edd042d6a90500fd883d WHIRLPOOL 050246421aed4e31651e47480c9343a11663005168cd291e5222e91a7a6cb42d7e65f4b56ba4af45e7374038e5565e5d0ed4380ae230e092b136cf7f9967755a
 DIST kde-workspace-4.7.4.tar.bz2 20557567 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kde-workspace-4.8.3.tar.xz 34217232 SHA256 08c6624fb0c37162e590dc3ba784d083aa58a47b7af72b6ca91bdddb34f6ab13 SHA512 cba41b57790e5e25390b4a1541e341641be5bf54346552a561ef1f5ca050d0f50611f416cea4aa0040395e30753f82165cc20340b9fa19f24e1f25810578ea61 WHIRLPOOL b0ed4fe507cff7e30563d1a00eb7cc28ec77476256a69336cfa5aa2c4a89849b6823d7fdd0ca723603f5a3e0c9871defd0a73901dbd54a9c7bda74255565ecbb
 DIST kde-workspace-4.8.5.tar.xz 21475948 SHA256 6dcb9ebcb14635e60f304c89c59ec530b030111d15f9e34478883df1be598c5f SHA512 94ceb5c01c2d390d02e07118e8982018893552c1e830789d5927c3dd8b4db615bdec0676b6414e97719796a87735c3034e50ec961b58aaae8b96d477a98f579f WHIRLPOOL 53a2f2a0a0b153c6bf1f5df7dd5970fa1819d4e33270542c01cf4fe7aa9dce578d8c3147512957eefa510533c137a46f5e71688d82a90ceb0c828c23ad86ab47
 DIST kde-workspace-4.9.0.tar.xz 22286744 SHA256 c563c6ec8a59e6551913638d89f5df0d898c32937a9ab8ab17d2d5ebd7593ebe SHA512 f6cc4396bf113d2d6f0428832105c86ff11245959597d5676db2fd4850d3a4fa4d42afdf2aaa3cff77f38c1872dbf703a608c5234e779c7c1b8cfdd7bec4cdd3 WHIRLPOOL e4918f61440cd6dacf4ecc86f53c27a4d0d1a6384b96b128f30dc4fff520b9e34117545c66b1e1b95977f3e9b0f596b6afda1c2dc6d2112dec575e2f684d4f0a
 EBUILD systemsettings-4.7.4.ebuild 2147 SHA256 882920b5d9449f0e569b4d22aea46f7c11ee0a82962cdb27ce8bde3c1ca9585c SHA512 63b5f51cf48dc260a86bba83577bccb1ea2747226d9c17a3d730b4f354b1f4963b78d555553ccc8f9929478f5e7d021a3d2e03072da0a595b25d141a5496d234 WHIRLPOOL db83649baba98a903609b49db6477d1169610100d5b830f89b4091a6eee73c1d5d5e856f768f428ac0c2ee0f0b4d3796b3cd581d2fcfb22f18222b69500a709d
 EBUILD systemsettings-4.8.3.ebuild 1969 SHA256 058a61c73763bbd4fec064eb987ff81fe95ae1b70116ee2565a4fce9c99b52c6 SHA512 427758367f1a9879fe21bc9225f850730bb2947e51bdea3e7295e90cbb45436d24380782b72962b488c29bbd09950c7be4dc732cb1699f5cc1cd11244c7c94f5 WHIRLPOOL 710adefe2d86918323b51dfc3d64ff1e7a5b35fa643731251c9f9607cedcf699dea88a49771f6d8264b783b8fba78b8a3c46b5579138f1f52519e5552d4c48dd
-EBUILD systemsettings-4.8.5.ebuild 1964 SHA256 a12c7886fe73b3b748df88e18030a3c3413f5186f065ae6039dfc2dd4e40c49d SHA512 280d5b8278a4763d4401e398e044298eac03343db71141923b58df993cde3b7f6976549e733c49cbc08b9322bf1bdf43cfb59fc1dacaa2ae4afcb1492c3a04fe WHIRLPOOL 7a01cccde14089f9742f9ec81e779d3ff9b6ad2cb365156eaf663f24c0f60acc73bf5e89c1428db87ca4e65748766848ea3e79c36472d888ac5ff73fd1f63579
-EBUILD systemsettings-4.9.0.ebuild 1937 SHA256 e89f96a4b23338da7dcb3c28098e2e2df3bb31fca341117e2eb3f126c9ee2100 SHA512 d33edb97b9174d5db92ec85dada3dfe0d8604312e1608fab1d6ecee233566c93de4291c979340d30f55c0f875be6c8753c248261109e4dfbb1a7b55002236f69 WHIRLPOOL b66f14b5ee2d75f652c9b43e8072913705cd958df7ecc940007b9d8346c8719463a16fa5e9e500eca686b8222e38ce51ac51fc9c24eda655bc3c2897183a2dd5
-MISC ChangeLog 22193 SHA256 19b4d8847a6a9168dd08ef506931ea059ccd2476d545a295c700bc259fb0738f SHA512 22e09f63a1e45bacef895bc9ddaf5f00ee0e5d489c9c39ff2f499834c6dc3d9b06635a59cc02278cf7b1a5e49f85d1ba22550862e8d64a144cb8c4b4d74af67d WHIRLPOOL 7cfdd4ee68aa7207aaad0fab35eb71b2ac3a27db72ded2859ca73eac0b88ced56cd50f97f0c70301f47d7695f5a0e58367b520e0c5aaceab121945ef1eb2eb69
+EBUILD systemsettings-4.8.5.ebuild 2024 SHA256 9693560ee96201546878ccbb27164eac7814347c13257866b28989fcfbcdc6b8 SHA512 8d97f1096c55d405c8fd2e13142dcaaa397b9ba85761d1de1dec2b8a9f56e8ed56c9374b8af3521a3f09d2db34e688dda7b53586ce8a560089742db9cb9c39f4 WHIRLPOOL 1c5feeceddb5a975628ce4da8dd669aca402606f0f136213956997cf667585183ba9e52da28829cf79cebdd510af0a388f53bd4f7dca76c1aca567fa76df9f6d
+EBUILD systemsettings-4.9.0.ebuild 1990 SHA256 dbc82e7f2a3d3721bb5542d5e10e286ba976d9c83dd19ef9df61dd9e0a13efa0 SHA512 8956b21f541ee17ec4a46cdb32b78b5402d15e61a98b87c04d09894024d85a10bc6eb30c1756ae8a2e7c0f244822d8691c90387f12606722906c95dd019b6c93 WHIRLPOOL bd00e0af329ea1d923e467aa2007e5480adc726eae720a68f48ee8a2917f729fbf3b910eb00034c9ad9f2c6099257dcb4487a3644fa38187e0a2ee52d4b6c95e
+MISC ChangeLog 22447 SHA256 bb838456fef69e9ba5f9a0c17f3821680fc1f0aff8ea4163df5622b904754744 SHA512 0230345bb5b79111b5af380ac8d7e297d33913422daf9d15eaf0b9797549dcc1f8f37adb2ec988159dca277c56745e858b158a2215ebb28fc24ebba21d0abeb8 WHIRLPOOL 996bc43313bcb5ae77ede685de50b5c35dcd4d3ee362293333e334ddd9e925ef74fab2dba51205614916033bacf5a0ae15471dfdf8f62b28c1dd2f43944d4cde
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iQEcBAEBCAAGBQJQLiYkAAoJEO+t9ga+3I3aCskH/0xyT5ADhFLilebF0YJY48DA
-XebIWClyHWQ/lLhrzoKrLIMgzwXmxJnyIoch/sskyVn+mw520kuNtboz+MjcspH8
-YXlSGmEkJJ4co9eKJBiY7ctFcT+X6QyOlgORHRY+epZGS3Z/iocdku4oX1P56tlF
-tkxhHG/3+Wo1EziJkookg941fIsMVA8KcHIoHp9xexJs4O5co8X+UGjuZOAAqPaz
-BW8YoGtLxXX2OZlca4SHgr38EfiQVfZWuEZs10Q+qDNQbYYo4oT8tB3iylly8toS
-99JJGBxT2UeRLP1U1FtDnGSiI+63IPS2F55mPkoBee83+pEyN59sS2yGEsUzyJ8=
-=OhZ8
+iQEcBAEBCAAGBQJQM+3xAAoJEO+t9ga+3I3an8IIAJ1OZhD4yWUHqNo8NVom392a
+owMto/UlI40jmUsVdsvXj+Ih7dS/LM99cHMQ9b7SugaJlyuqNpW7LHhi5VNVlImf
+iE0qB9+qDTxl/xMFyf9MPZnzB+2zA5fFnDny66UtM6su0WwTRAzYge63vImAGD+X
+LMpY1Y2ggkC1nQQVO8VG161euogDWHhPPpH039anYVn0C4QYRSb/ZDcDMCRZAx3V
+dLzv019sfYNQ5A4T8Z64L8tmFvv+4IRrwYzw535ptPUJ+9+V82Zc87PXrBSW84rB
+L2mOkQpfXLwjf4zf5aXDzP7Kj71r8V+K+k1j1jw4s1QyAcZIbkFKPLAFLtVzgOs=
+=JrZz
 -----END PGP SIGNATURE-----
--- a/kde-base/systemsettings/files/systemsettings-4.9.0-parallel-build.patch
+++ b/kde-base/systemsettings/files/systemsettings-4.9.0-parallel-build.patch
@ -0,0 +1,35 @@
+commit 00578c3036e0a267cd50e63d3745264a533d1899
+Author: Christoph Feck <christoph@maxiom.de>
+Date:   Mon Aug 13 16:41:37 2012 +0200
+
+    Use forward declaration
+    
+    Instead of including a file from another target, which might
+    not have been generated yet.
+    
+    BUG: 304987
+    FIXED-IN: 4.9.1
+    (cherry picked from commit 46b9acb42eed48f0fd3b9d2391dc8a217003cafc)
+
+diff --git a/kcontrol/randr/randrconfig.h b/kcontrol/randr/randrconfig.h
+index 37f7b57..86fdefc 100644
+--- a/kcontrol/randr/randrconfig.h
+++ b/kcontrol/randr/randrconfig.h
+@@ -22,7 +22,6 @@
+ 
+ #include "ui_randrconfigbase.h"
+ #include "randr.h"
+-#include "outputconfig.h"
+ 
+ #include <QWidget>
+ #include <QTimer>
+@@ -33,6 +32,9 @@ class CollapsibleWidget;
+ class RandRDisplay;
+ class OutputGraphicsItem;
+ class LayoutManager;
+class OutputConfig;
+
+typedef QList<OutputConfig*> OutputConfigList;
+ 
+ class RandRConfig : public QWidget, public Ui::RandRConfigBase
+ {
--- a/kde-base/systemsettings/systemsettings-4.8.5.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.8.5.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.8.5.ebuild,v 1.1 2012/08/07 11:05:02 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.8.5.ebuild,v 1.2 2012/08/21 20:21:58 johu Exp $

 EAPI=4

@ -52,6 +52,8 @@ KMEXTRACTONLY="
 	plasma/
 "

+PATCHES=( "${FILESDIR}/${PN}-4.9.0-parallel-build.patch" )
+
 add_blocker kdeaccessibility-colorschemes '<4.6.50'

 src_unpack() {
--- a/kde-base/systemsettings/systemsettings-4.9.0.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.9.0.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.9.0.ebuild,v 1.1 2012/08/01 22:17:23 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.9.0.ebuild,v 1.2 2012/08/21 20:21:58 johu Exp $

 EAPI=4

@ -54,6 +54,8 @@ KMEXTRACTONLY="

 add_blocker kdeaccessibility-colorschemes '<4.6.50'

+PATCHES=( "${FILESDIR}/${P}-parallel-build.patch" )
+
 src_unpack() {
 	if use handbook; then
 		KMEXTRA+="
--- a/media-gfx/sane-backends/ChangeLog
+++ b/media-gfx/sane-backends/ChangeLog
@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/sane-backends
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.204 2012/06/08 03:01:10 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.205 2012/08/22 02:09:10 ottxor Exp $
+
+  22 Aug 2012; Christoph Junghans <ottxor@gentoo.org>
+  sane-backends-1.0.22-r2.ebuild:
+  added prefix keywords

  08 Jun 2012; Zac Medico <zmedico@gentoo.org> sane-backends-1.0.17.ebuild,
  sane-backends-1.0.18-r6.ebuild, sane-backends-1.0.19-r2.ebuild,
--- a/media-gfx/sane-backends/Manifest
+++ b/media-gfx/sane-backends/Manifest
@ -1,43 +1,47 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256

-AUX 1.0.20-unbreak-udev.diff 688 RMD160 467154092c84c81c6444b788fa9a10d909930a84 SHA1 63d5f52ae04e17a9d1722d55f6e1b6f8ca5094a4 SHA256 467a170a9f4c5d825893029607dcdcb45110c3f2838e9ee230fdbbc1f8f0567e
-AUX broken_coolscan.patch 442 RMD160 9935934fe6963b7da31b544c7f3baa9065c39bab SHA1 2f1bda3b6bb54cae882005eb709cda33cfd17af8 SHA256 87b327a370f4f7e2884a9715dc880362f313611badf978ba1a1dd23f46284c98
-AUX epson2fixes-1.0.19.patch 922 RMD160 bdfa3ffb1bbdf78000531093663c134e7b63958e SHA1 daa5e62c01370c788a25448472fc9d5b55abaf9f SHA256 630aa0ed61c8d426f2b06c557a148caaf2ca07d659e97425fd121c5f896dc203
-AUX fujitsu_DBG_LEVEL.patch 680 RMD160 ed131cc2269ca0e621b226a34e7a96ed319d0162 SHA1 d7e7022b4ce1a4d07a89013bc566ff573a9445f5 SHA256 b7376d0981dec47d589164151b03cecf4d9855d1b02ed5362c34357847c5376a
-AUX genesys_io.patch 918 RMD160 fe105f644eec67a8626db78820a79f51c55ff2ca SHA1 6b75065e2db52ebc7ea58c89e4b4738a016c5b28 SHA256 c45f86420009e1c12c5cde449509bd7c14e94663b36969ff8f60732cb784eff7
-AUX niash_array_index.patch 4141 RMD160 31f84f470b4aecbfec00cdb72cb382481d092f41 SHA1 27edb0c70d8e2dc7e2e2403e164a9c1cc5681aab SHA256 a44687911c10e66c1a57efe73508d1c78eed55fa2699fe7e13c62ddc7b646187
-AUX parallel-install-1.0.19.patch 1117 RMD160 c6bc5abc5275dea4418f61cdd4dc007a45e12454 SHA1 5b5e9082f39d34d68fdefd5531e257fb7f7bdbda SHA256 5c3cb9747058df277eb6d7db8574252149834b61b68e0569ddf61bf67869449f
-AUX sane-backends-1.0.22-freebsd.patch 2227 RMD160 19ec3464d8d14aff8a5229eeeff7c424931a381a SHA1 89bd9ec0cbcfc7a288100c62baaa7212d8c5a5b4 SHA256 63944bde43b1cc838c1561d74c6fc1cb54adad080ca8db0a8a5725602e0f1b1e
-AUX sane-backends-1.0.22-libv4l-0.8.3.patch 999 RMD160 8b0a462c87e577cd4e1ae9cadb60c9b8fa340970 SHA1 7550b1a85bd127fa47218c002347b91680b7f1fc SHA256 bbfeaead9ed58110974c01d79b0b723e7fb34b9c4c73b1a78672b56376ca82bd
-AUX sane-backends-1.0.22-xerox_mfp-usb.patch 2308 RMD160 8b5547706e391226c33f8fcaa451c384844afba8 SHA1 1e10c4057d839e7a6263d5721b4b47984d7cbb88 SHA256 d3d9a03cb082fb1b735debbfe8a948cb4cee14b13c53a4cc9cd49f23174972c0
-AUX udev-rule-4.patch 1861 RMD160 eb841e97e2729dd7645df9261178d1f644b20032 SHA1 0d4911e060b683c4ded5eaf016c83f022ac94303 SHA256 d423f5027041c1a8fba0873941ad4fc60bc857b788b4e4bd6896b82942a2ca6c
-AUX udev-rule-5.patch 1462 RMD160 116e50bff2d00238946595136de535bdd0a747ff SHA1 cdbb5db3fe6c8e5660d86be7391e345ea242ba43 SHA256 edcf1275743ea4e418ec1468f990ad005f55f22bdf8ef143beda04fbbe070b6d
-AUX udev-rule-6.patch 1110 RMD160 7ba35f5338db19ce57892aaee5524bb484167b2a SHA1 0afe81c28310e8c54a5e0b205eae860589281bc8 SHA256 54426af647ea4bcc3f1318aa5aeccfe05637546c4edd592774d9948a8298fa75
-AUX xerox-grey.patch 861 RMD160 4b23bd68e0d75b41ced86eec54a6e044fdb5f8aa SHA1 243f392ce20cf6e1b7602e0fb35d08960c84a7ad SHA256 c338ae8353dbea1fbc18d7a5f5dc092b2fe611fd35a1393b208379c1ef58d1b7
-DIST sane-1.0.16-brother-driver.diff.bz2 8224 RMD160 acbe36d7c4347d49f6e8e708ea81f0ee604fec9f SHA1 2f0cf77d8bbb98b9bb6cc1f56a86f662fa9bda48 SHA256 795b4c553e5195261b4dfe5f624d2dba256910996d10af3af9551c192bbc92fe
-DIST sane-1.0.18-brother-driver.diff.bz2 8335 RMD160 8d86dccca4054699e367412c25d80d8641de42ca SHA1 60bf9c8d4b2fac3f250a95d1dc8043662fc974cd SHA256 4a2eceb222f6cd55979fd150c4a7c365a9a83f2beab15045852f8859404de23b
-DIST sane-1.0.19-brother-driver.diff.bz2 8192 RMD160 23dc1428cb587b874b31dc385bdc19c9fe8bdb71 SHA1 caa82756d849d5ff4ca9b9af835243df57ee0976 SHA256 cd71eb12e99ea735e524f66fe53e75d8d6f51036242d1326d09296f3b0fdea55
-DIST sane-backends-1.0.17.tar.gz 3588993 RMD160 43e440712e9da676e235dc6148c5dda347c30e22 SHA1 a73e01575458a5fb7dc265cea50c6740555e1711 SHA256 f5478acc07494498fe94aa8801193f8511cacd023fed19aaee1429e10e805d77
-DIST sane-backends-1.0.18.tar.gz 3789493 RMD160 aa863adff417d7c33cbb85c193878aa54a056100 SHA1 f4c360b87ced287e4015a0dafd766ad885c539e1 SHA256 d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3
-DIST sane-backends-1.0.19.tar.gz 4293184 RMD160 1aaf304cbfeb3d6c95f6081d04225441a87b6644 SHA1 3ff8eefa8f32e72dcdbaa4bf20fe125df90144d5 SHA256 13271a7eb4dc4aa6072162abbd78848e4faad32c468b9b44e7f95cde96a4e17e
-DIST sane-backends-1.0.20.tar.gz 4760873 RMD160 b80c0a15a75b3bce07060d65aecdcaf7860c323b SHA1 3b4d2ecde8be404bb44269771cf5dc6e4c10b086 SHA256 8fb1531e6192b9cfe2f44a020b881d78a13f05426b46263cfbe7fc2507ae3d3a
-DIST sane-backends-1.0.21-i18n.patch 2250 RMD160 35a16305f30e41478b3de82266eff72892e248d6 SHA1 d44cf640a0c56c3249e9da5cc64b3bf452e1989a SHA256 9f0d16a32fd8b8cc9ae5e0639b1c51af2137c5106b9b318f0df818d5689f3efc
-DIST sane-backends-1.0.21.tar.gz 5050344 RMD160 000ae42ffd6484c54389a9468bdde1dcfc758dde SHA1 4a2789ea9dae1ece090d016abd14b0f2450d9bdb SHA256 e44e2fa2925897cf3a9c637b81224772b4483835bf546a48cf9477689022948b
-DIST sane-backends-1.0.22.tar.gz 5150661 RMD160 524713474a819331d0179fa642fef710d073f1d1 SHA1 dc04d6e6fd18791d8002c3fdb23e89fef3327135 SHA256 9f84a16800497f0b79a278531bb1a0f438de6ce8cf509fefc65a252e29f90c54
-EBUILD sane-backends-1.0.17.ebuild 3830 RMD160 a71a6ea9176041a2c89713eed3189e9c136b8cf3 SHA1 46ceead31e245d9471f106fd446ed1f005e7143e SHA256 b1f2c9bfe80592c48b8d32d39d286b7211026c8fe7a7c80ecb5d19b689d3938b
-EBUILD sane-backends-1.0.18-r6.ebuild 4328 RMD160 af606f7e9f041ab64871d803eedfafb05e128e18 SHA1 5c327a4c5eb6329b475169e125e955ac323fdafa SHA256 54f2e851705b0fb692140f248fd5dc39fefa5d67d4976462a52e232d47fbcc77
-EBUILD sane-backends-1.0.19-r2.ebuild 4532 RMD160 5cce4c567f244d3747b382cfbdd2cbc753fc2c1e SHA1 14544edee4bcc935763dc4098abfa766c7219cda SHA256 8bd3a3e5ac75ee6e11c89e6d6c14dcd68e6b9627cea1c32280e52888ecca1f4c
-EBUILD sane-backends-1.0.20-r3.ebuild 4466 RMD160 234bbe32e14db66a8f3c3d8195691356ab6fdca0 SHA1 f335b20fa364fbfa499a587190f42bc54f2eb614 SHA256 48d0e27bccd35635a4034de26e2b93940bc9b01a22d883ce69fcfd54a8a241d3
-EBUILD sane-backends-1.0.21-r1.ebuild 4752 RMD160 52be1e6c96f4327e3a3ab833f1c82dbff9e17b4c SHA1 5d1ae745c236bdff40e73936e4ab8bee07db83c7 SHA256 48bee91c0181f7308469cc8f56eb3e5c3786a98a422d934a234ba7005dfdd04d
-EBUILD sane-backends-1.0.22-r1.ebuild 4730 RMD160 bd3517626746baa449a2a0edf2ce806c3dea2b03 SHA1 b5b3e3156738191ea090fe8aca3bc7a61594caa7 SHA256 67369951729c779d1d65402089ae0bae0b8cdf249a1119ae0bd792d464db0f49
-EBUILD sane-backends-1.0.22-r2.ebuild 5287 RMD160 847fc4c2d4b33680e304b3f1308cc8fe44d5f779 SHA1 4d794260f3b501e8edfd437ce52c5543f3e9fd63 SHA256 5981832b68bc2186ee02d50344d8575e5ab933333e026a0c5c40c86a4d6d443c
-MISC ChangeLog 35546 RMD160 7ae4411cfc28787e1915f5631dab1df038f102ec SHA1 05bfaa94f242489e462180609eec42f7371a5786 SHA256 269ec39173dcdc7ced79715f1c6444925068712afb4475a40aa476fb0d74c008
-MISC metadata.xml 203 RMD160 300bee51281e761b0c22b6b7994210d0e02af2eb SHA1 becd8a4405785b35675e2e84ec4ef696f0278802 SHA256 fa46f560cb484f9b761d3b5c3f3fd3368d4d68c241fa2697225f139fe6e03476
+AUX 1.0.20-unbreak-udev.diff 688 SHA256 467a170a9f4c5d825893029607dcdcb45110c3f2838e9ee230fdbbc1f8f0567e SHA512 a6ccd763de08dc231f9388f73c8df815644afe55a3a18a650b1e83e2d09679378e5301277f1326abd8775caad5b5eba55b5b613130c824835b26827cfb4d47be WHIRLPOOL 6188b12f5f8e687e7d5407a91adaf193964011265e138ff8d0be7622e9c63471f288e9a2964bf7596097d456ca1c216a6dd19521d39e0b82574a397ca3e0104e
+AUX broken_coolscan.patch 442 SHA256 87b327a370f4f7e2884a9715dc880362f313611badf978ba1a1dd23f46284c98 SHA512 6f2496af502f12ff29dfef5be5221d861922545720e2ba9d392e7e40d07a388fdc57d19abc1f5f5a07988a8cc3c46ada094d495125a0113c5857ce28f702d7df WHIRLPOOL 3f13c92646b6b2f347a7b12d7b78b88f230d5f6cfa11a3f5adb5989d89970609f906fb873cd5a17010ca689a6be391fd416adb995b99e8c571accd5fa84c99dd
+AUX epson2fixes-1.0.19.patch 922 SHA256 630aa0ed61c8d426f2b06c557a148caaf2ca07d659e97425fd121c5f896dc203 SHA512 920fb126b1b1023bf6d6207f65558e17fb02b97c2161485c6b7d2a852837e64e75b68eaa3266d92a3f086354b94f19baecdce6950df46b93eeac2b47b19658d0 WHIRLPOOL 2229d770f70ff307dd6a6df0194b22d26a7fdc655230da554543c597c69bdc3bbe3eddc324c49469d0882b847d48d0248f5cabef29def78e438bbbfc8e03b5f5
+AUX fujitsu_DBG_LEVEL.patch 680 SHA256 b7376d0981dec47d589164151b03cecf4d9855d1b02ed5362c34357847c5376a SHA512 08c1a883011c5678cb0e4df601060bd97f3799df6384280aa4046f08a9734f11fdd280af11e0a41f6a06742ba3ed1edf3857c389ece52c8e4a8843f6ccdca1b1 WHIRLPOOL 73d2c4ef2e4f76448662808b14959712d38e6dbd6ab3d947beb97bec060ac94d58d17d645772d0e83b4e16b0b77c88cee11bb49742c8d6d10bee499196cb6610
+AUX genesys_io.patch 918 SHA256 c45f86420009e1c12c5cde449509bd7c14e94663b36969ff8f60732cb784eff7 SHA512 20f48e3f2c48c921c42f254cd8aa2609ac69aade993ae78d0f3eba017c1aaeeb71d095138e66c631398410b8d2e4d3d2e92b0dd955c95bce223dc7db216db648 WHIRLPOOL 582822ea8d215e7549db2212154fd0563bc104c4482b37ac4f35636bcb56508e505b7f5eafddfbb032441323f0c18f2a714e402c772b01c3d9926a1537f6ba5d
+AUX niash_array_index.patch 4141 SHA256 a44687911c10e66c1a57efe73508d1c78eed55fa2699fe7e13c62ddc7b646187 SHA512 13dcba7d609cb5fe27442918818b46dd55b3d4c65aeb3f379377671775cf28f8cd48950a0633fb3abb33db29b223798c0b00a86a029956ae0bc323edc344d28f WHIRLPOOL c93d1c770e49550eb72f82f2a48385600b806531cc4e6072fa7317515c16ac7847acb63be7d8c94592fee299e433f438a2f7db82f362d7a57e79c42a2b13940b
+AUX parallel-install-1.0.19.patch 1117 SHA256 5c3cb9747058df277eb6d7db8574252149834b61b68e0569ddf61bf67869449f SHA512 9f5b1245d76bb4e7511b00c0d2cc68c7477c56588bec480a68ed717825b4a177ae03a1873c2967a9e685f51445f6121eee688649fb325116fb9298980184cf95 WHIRLPOOL e4a66212c9b97ac4134a50452291c7af34837d9e6dca819e050c5eeecf30ac23d116e35b4c2f2b097c0beb3240b151c5babd9fb53e154a75961be31c41d4b860
+AUX sane-backends-1.0.22-freebsd.patch 2227 SHA256 63944bde43b1cc838c1561d74c6fc1cb54adad080ca8db0a8a5725602e0f1b1e SHA512 ecff135b51b69c08e723c1410f4ed3fef2ad02fa8472d3363baa8782a7e8f04fff20b2015e25ee890b9ac2bdf94fb385601fbe4a4d23a1ede68d29717571971a WHIRLPOOL d8a7829eab14541c6b408e3a70977587f31ffe53db0c0f0e2e12b2e0839f5b3757dce07286a0a9fb8caadd27156fc8ca691a3a8b134a460dda81719fb4338aa1
+AUX sane-backends-1.0.22-libv4l-0.8.3.patch 999 SHA256 bbfeaead9ed58110974c01d79b0b723e7fb34b9c4c73b1a78672b56376ca82bd SHA512 8e90e8918c0ddad79255d88a8c8294eeb055e96af5032acf5279210ea6fba6aeb0cb01bd86279c07b5d050d5a8beb8a814c8dbf16381488ac0b4dd299640a532 WHIRLPOOL d4e9bd41f74f0ff8e809cdbf14d0b1708509d240d6661520b75031076c16bd142fb86128b0c6926c144c0d4cd99d4e03a21d048ef1142eaa3ac73e03b84d6ae5
+AUX sane-backends-1.0.22-xerox_mfp-usb.patch 2308 SHA256 d3d9a03cb082fb1b735debbfe8a948cb4cee14b13c53a4cc9cd49f23174972c0 SHA512 e8635c44ede7448d9d897dd41fa7e6b7c76bbbda4ee8cd8c020ed8823f73c2a7a211c7b5d7e175256d92ead0cb39b846d9b03facccc400cb1d42e42b4118f612 WHIRLPOOL 6b73d20c9febbba88b7ae239e96a293e2d3e1063ee9351fc3db5c6620675da97ada9ad4d7dbd5fb29ff4e51ad43dd208914bd0ac69004ea799107c8bb6d57e82
+AUX udev-rule-4.patch 1861 SHA256 d423f5027041c1a8fba0873941ad4fc60bc857b788b4e4bd6896b82942a2ca6c SHA512 898f18b5d175187e63e63236261f044ccd628c1ec3ca15109d42258dffc4d9a132f44b616a14528e692ce809b3b864ec15c76e8dfd62ddacc586693f8e6223c8 WHIRLPOOL c34f4325578f998dc14e08c224a9972206bdc082eff79179f27fa3c6bde046484ee0f3efd0b566c6324cb34a1daaf8301a1b5e66747417a4cb3e4975004cece8
+AUX udev-rule-5.patch 1462 SHA256 edcf1275743ea4e418ec1468f990ad005f55f22bdf8ef143beda04fbbe070b6d SHA512 f1570363caa41e033c9be0b03940b947a47cd6a673bbeccd5a4f8bc02f58816b88d315eff99231ae1ab967603d165fda49380d59ee4250ea2f3f8f969a21725a WHIRLPOOL 014604d85e975eafd9f7fde803e11d7514db140e24e9b157acc2e6b1629d46238abb36e305a03f3dfd1bcf00a8411919490b8442a0f78047c405a0e665c11aec
+AUX udev-rule-6.patch 1110 SHA256 54426af647ea4bcc3f1318aa5aeccfe05637546c4edd592774d9948a8298fa75 SHA512 f2ba7b4fe125d89778172ea2e105d6651c3b64177f196e0b384ce36721fc55f654edb407403fd45e5eb3b2a0f0f9f52a96d467cbff2366c62188369b9da6b5de WHIRLPOOL e58d93bb6bf018155d8756a12f3486b2080e5288e22170ae3d644b28c914c772b5d58e14a7f55572d3eb2cb138befaed4ea60704ddea83b86b7bfd18cd7fbb00
+AUX xerox-grey.patch 861 SHA256 c338ae8353dbea1fbc18d7a5f5dc092b2fe611fd35a1393b208379c1ef58d1b7 SHA512 31cb4dc65208cb6575e1a0cf2226d875d8f8e876c4516b41842d21517be31643bf2bfad33d13d56a8babcc9841eda00280456fc29b7ef7cd90eba04add28814e WHIRLPOOL 32b5e99453d14614c7972601ebc30860db802e305f0eb124f2d8150e43336b5692ddf7b81435ab3f9c649abf8a925de826da59c4618dcabb2597648901513493
+DIST sane-1.0.16-brother-driver.diff.bz2 8224 SHA256 795b4c553e5195261b4dfe5f624d2dba256910996d10af3af9551c192bbc92fe
+DIST sane-1.0.18-brother-driver.diff.bz2 8335 SHA256 4a2eceb222f6cd55979fd150c4a7c365a9a83f2beab15045852f8859404de23b
+DIST sane-1.0.19-brother-driver.diff.bz2 8192 SHA256 cd71eb12e99ea735e524f66fe53e75d8d6f51036242d1326d09296f3b0fdea55
+DIST sane-backends-1.0.17.tar.gz 3588993 SHA256 f5478acc07494498fe94aa8801193f8511cacd023fed19aaee1429e10e805d77
+DIST sane-backends-1.0.18.tar.gz 3789493 SHA256 d7876a78c5676b0c4bc29091c7a7e1287b5c0be5ff5bb61ef033fbffc73d66f3
+DIST sane-backends-1.0.19.tar.gz 4293184 SHA256 13271a7eb4dc4aa6072162abbd78848e4faad32c468b9b44e7f95cde96a4e17e
+DIST sane-backends-1.0.20.tar.gz 4760873 SHA256 8fb1531e6192b9cfe2f44a020b881d78a13f05426b46263cfbe7fc2507ae3d3a
+DIST sane-backends-1.0.21-i18n.patch 2250 SHA256 9f0d16a32fd8b8cc9ae5e0639b1c51af2137c5106b9b318f0df818d5689f3efc
+DIST sane-backends-1.0.21.tar.gz 5050344 SHA256 e44e2fa2925897cf3a9c637b81224772b4483835bf546a48cf9477689022948b
+DIST sane-backends-1.0.22.tar.gz 5150661 SHA256 9f84a16800497f0b79a278531bb1a0f438de6ce8cf509fefc65a252e29f90c54 SHA512 26ed793bbb4110a7b8bc9c3b22dbc125ba1bb5f7ff89545542ec9cae9c641351e7d420d3f53982e2c6d63577a4c90b24a8f4d6b748be65c98284123f778fcba1 WHIRLPOOL 8b47c0b2b4764155d54ad61c3c6946cc2e5c0a47dd8fe650cb036a51139694d486376c8ad76759b27987f00b9594cf62e849e470873d38a767907eac5a4e0f93
+EBUILD sane-backends-1.0.17.ebuild 3830 SHA256 b1f2c9bfe80592c48b8d32d39d286b7211026c8fe7a7c80ecb5d19b689d3938b SHA512 0f5f045204290af1b46f74de0a2a291673719ae53736d196fccf6ba065866897d749485f5b9e2112e204bff84e5c34a9a4ba5f34fdc00c01e98aef5ba60c0607 WHIRLPOOL f5b8709897e37369eea56214e43eb3d348e432ece886d7c66bc70ff7bf5ce674b1d5e31bf1a021da1ca2b797658a608b0d920f4fdad784c0f56886e4f539c44f
+EBUILD sane-backends-1.0.18-r6.ebuild 4328 SHA256 54f2e851705b0fb692140f248fd5dc39fefa5d67d4976462a52e232d47fbcc77 SHA512 d2eb4c34f68203730de78ee6c006f977ce71dea223fda5232bb0b7620c0136ce15a4387c68d9ca5be5bb2c453746fb054c61e13462c6a8e909c5819275ce7fc4 WHIRLPOOL 3135850db150a4f9a85757e33965163b3a5c9d03a0d236c7350d9258a02976d0fe09322eb383749109bf3b54e71c2ce9699eca1a0034b70c26289d03dbfc7a63
+EBUILD sane-backends-1.0.19-r2.ebuild 4532 SHA256 8bd3a3e5ac75ee6e11c89e6d6c14dcd68e6b9627cea1c32280e52888ecca1f4c SHA512 130f3d7eb3366a6233da5b33daa8c9a414b4e5cc679c1bd928a0b3944362484147743a7c0e0061594fd339f5c2669c0355308aeab6aa18fba9d73f208dea32a5 WHIRLPOOL d9b5199b9b55862ed92ffd191afb522aeb5ee532973e28668713756868a8d873d6d8df74dab69d0e7929f3050a2e20be4d5f2a4527885c61b456a560d4eecc83
+EBUILD sane-backends-1.0.20-r3.ebuild 4466 SHA256 48d0e27bccd35635a4034de26e2b93940bc9b01a22d883ce69fcfd54a8a241d3 SHA512 00a1b1a483149c7b925b8a295822e8d907b7fba9fdc7d43c1d8b589bb10fe18332d4d36718ad5ed05fea898ccb3dd0f9c38c1abeeaeb43bcd723ecb6d28e05a8 WHIRLPOOL bb8ab218e9d88626f128ebc10fa8dc9cbb3c9bb6fa6c0419af988e884b4eac82608102a6b737bb27b64af0056a7f66542b0dad0cc5b471642faf171c4fb49c8b
+EBUILD sane-backends-1.0.21-r1.ebuild 4752 SHA256 48bee91c0181f7308469cc8f56eb3e5c3786a98a422d934a234ba7005dfdd04d SHA512 27da0e9a6d6dde71ecfadb6a6bb4153fba11489fdde6b3a4d57205bc4f3dc49061576130de34af37d6b548640d5547867b9d1ea802f768b872a7e20b29cfa82b WHIRLPOOL bba2cb0a8111f01dff8e531e5bb89fda18eaf8356dbcf9a3967416a604179c97263804883a90d619a69eb9ec3872d3b3b66b10cb0fe07065d82f640027ea83cc
+EBUILD sane-backends-1.0.22-r1.ebuild 4730 SHA256 67369951729c779d1d65402089ae0bae0b8cdf249a1119ae0bd792d464db0f49 SHA512 4fae96e65466a19567bb53d564b0736c9d2ec25a4983f48d63c05901bc9b9e17defe1c1574a4a650b306a6fea54ccd95d740080fd9078f19a5973daf40660c64 WHIRLPOOL dafa3767c0d6c028733b85a46550009767cae3eb866570e1cf9f49207fc8c6984944987888436fa01da21de4538ca3e9ecec12d058b580bcbff366a6b9899490
+EBUILD sane-backends-1.0.22-r2.ebuild 5335 SHA256 d508b8c68a6e1d25eaafade77114383bbeb1fafe4b345c883aea2cfc8c490a85 SHA512 d1844097a8dbf361d58fb7b21a79500f8ce1c5dcd3d8e05abeb72615607ac1f7b04dd3980e22bea8a197ae3953654b93246799b4df9f48a9bdc821cc2001cdf9 WHIRLPOOL f90904045149808de7698e0f9ee2dadaa3bc70f466ff7a54787d2dea18df9c1eb8d9cfabc68c513dda337ab0c1bda1c1658e55d535bda45f338cbda1a5aa80fb
+MISC ChangeLog 35658 SHA256 7eef1623a7a9aeea48532e1c3b2668d03085c5795db5c526f0ded6822d00ca4c SHA512 974d611ad59edb5598bd341faddb752b8b465d1cc881161014954363613c9b8ca81d46ff339d7efc8c1135c3c257f17150835e45da1f13ca644650b23db1c453 WHIRLPOOL 734870b0a22535abafdf7ca31071ddffe60e36619d0a999c68252789e7e3cfa5fc02750c934168445152fe5f9f6219d2948db7d06d28b8d199f05d3162c2a971
+MISC metadata.xml 203 SHA256 fa46f560cb484f9b761d3b5c3f3fd3368d4d68c241fa2697225f139fe6e03476 SHA512 a3de685bc6e33c3a1e00e3823aa1786ae467259440fa1037fd02ca6a4bb403d1de1530ad41e3f296c1dc765c037408877fb0f7179c349a2e69ee6e8317d61d5b WHIRLPOOL 508c80f71e475b7d6eb2666b3f9e4bf050ca034ba7bbdfb8e378affe203a5a97b5a9cff6b84320dfe0710f44471d680a5904e9e7102f6e921d71f30d2693a40a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)

-iEYEARECAAYFAk/Rav0ACgkQ/ejvha5XGaPfkACfU6gcsKrX11sO0TNBZJk0HGVX
-gvcAni5Bz1K4Y2ZnvWfoNUysBCg4XZkr
-=nebW
+iQEcBAEBCAAGBQJQND9NAAoJEOeBhlrCAAWGDkAH/i6BBSZQdT5ManlC7gaADxAH
+/GgJOr9H9BrEWsPKHbXZ/1+4ojoKV1P9qjOTWnQWw+1U9hCRVxiQNzmpkyCgMT/w
+h4aujeRXExep3ovTc8vx5b7wUFytmmQadIZr/5fycv15hpo4d6iqDVU+aj3kVhEz
+Z+VtAFbpuIzML22KFVoB7NEP84dJznt5iy1oZ7xBgHmmObp8Z/XmkJb7f2p08bSx
+et0GkLmEP1wxI6OViOcaXhrr2H3nR+b3lPtix+MlX6prt3jdW923XlgQ6pxzu+KC
+8jy9ZFao1xQ8p36XE1SqQhNi1mMBfy205RxPRPIEbHqhOaS1n1rTdoVAvwmGWEA=
+=larY
 -----END PGP SIGNATURE-----
--- a/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild
+++ b/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild,v 1.6 2012/06/08 03:01:10 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.22-r2.ebuild,v 1.7 2012/08/22 02:09:10 ottxor Exp $

 EAPI="4"

@ -139,7 +139,7 @@ SRC_URI="ftp://ftp.sane-project.org/pub/sane/${P}/${P}.tar.gz
 	ftp://ftp.sane-project.org/pub/sane/old-versions/${P}/${P}.tar.gz"
 SLOT="0"
 LICENSE="GPL-2 public-domain"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"

 pkg_setup() {
 	enewgroup scanner
@ -220,7 +220,7 @@ src_compile() {

 src_install () {
 	emake INSTALL_LOCKPATH="" DESTDIR="${D}" install \
-		docdir=/usr/share/doc/${PF} || die
+		docdir="${EPREFIX}"/usr/share/doc/${PF} || die
 	keepdir /var/lib/lock/sane
 	fowners root:scanner /var/lib/lock/sane
 	fperms g+w /var/lib/lock/sane
@ -231,12 +231,12 @@ src_install () {
 		doins tools/hotplug/libsane.usermap
 		doexe tools/hotplug/libusbscanner
 		newdoc tools/hotplug/README README.hotplug
-		echo >> "${D}"/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
+		echo >> "${ED}"/etc/env.d/30sane "USB_DEVFS_PATH=/dev/bus/usb"
 	fi
 	insinto /lib/udev/rules.d
 	newins tools/udev/libsane.rules 41-libsane.rules

 	dodoc NEWS AUTHORS ChangeLog* README README.linux
-	echo "SANE_CONFIG_DIR=/etc/sane.d" >> "${D}"/etc/env.d/30sane
-	find "${D}" -name "*.la" | while read file; do rm "${file}"; done
+	echo "SANE_CONFIG_DIR=${EPREFIX}/etc/sane.d" >> "${ED}"/etc/env.d/30sane
+	find "${ED}" -name "*.la" | while read file; do rm "${file}"; done
 }
--- a/media-gfx/xsane/ChangeLog
+++ b/media-gfx/xsane/ChangeLog
@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/xsane
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.95 2012/05/05 07:00:20 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/ChangeLog,v 1.96 2012/08/22 02:24:10 ottxor Exp $
+
+  22 Aug 2012; Christoph Junghans <ottxor@gentoo.org> xsane-0.998-r1.ebuild:
+  added prefix keywords

  05 May 2012; Jeff Horelick <jdhore@gentoo.org> xsane-0.998.ebuild,
  xsane-0.998-r1.ebuild:
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@ -1,8 +1,22 @@
-AUX MissingCapsFlag.patch 412 RMD160 d47a4387277f6478062c2e0ad113687be6befa37 SHA1 524ad7a060713f68e7f1b1a87d52aef115375152 SHA256 bb1f80b0eaff16e120c76544feb724e52cd50a4724e9de8c680ef3808b486c30
-DIST xsane-0.998-patches-2.tar.xz 54804 RMD160 2ee1c2446e05f29b991e1741f5dc845fc6cae19d SHA1 2bee9c7470686694ec66e7842c42e9dcabca33b3 SHA256 84af533cba6309cf44892da8952b6203daa4dcfaf64e2efd1dddc5144e4cab4c
-DIST xsane-0.998-patches.tar.xz 54828 RMD160 81eec017e8a61bf7152b9ea73e71c11de6b977ca SHA1 bda04294705a76405c85f60587a66d9fd051c506 SHA256 0ffcc52ec5b11d5e854e7df38c4ac298920116f2453056a1565dc1f83a64f72e
-DIST xsane-0.998.tar.gz 2950560 RMD160 aecf63ac3f15b878d01b697ac3ca95de34d18323 SHA1 59e238b310979f71a8e15b692eab3c5b2ce6fc32 SHA256 a32e2f8057782a29619f082dcf6b5f944bf12abe3d4121c516f7c9589064c26e
-EBUILD xsane-0.998-r1.ebuild 2219 RMD160 32e139d8e77240c0d0bf967bbbddd498a6e18706 SHA1 55c8404470206d66e982717a4a26de477ab48b1b SHA256 1252780193f5a3bc7aa2b6f60ca3b85e145ecf0ab2cadb67e899f8d474bc4da8
-EBUILD xsane-0.998.ebuild 2198 RMD160 f9a5fba6f6f7b7882b00c75bb8f8e375a4d4870c SHA1 c0f3fa37533d0ba3d83edece3336f43615ecae3e SHA256 c75b78512b96a90ee327d3b1380a56bf2cde3737db2435bcc8ad92f6f44caa1c
-MISC ChangeLog 12200 RMD160 b247e5be3dc9796ab5298d20776455cf034544ee SHA1 707b56fef217596769a2a1775ff82e0b1f6b0892 SHA256 fcd9daeb81690dad35408453959d95bf47b8f96ba3bb5f3352b744db965e03f2
-MISC metadata.xml 536 RMD160 80b112256ac62a7c8c9a7c9c3e54f103659b176c SHA1 9347d82534d0df1647fc144f0a3460beda1a80cd SHA256 f707de877394da20d06198b2e7949381aa4923621aec6909dbc00e2d06ada22c
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX MissingCapsFlag.patch 412 SHA256 bb1f80b0eaff16e120c76544feb724e52cd50a4724e9de8c680ef3808b486c30 SHA512 f9f48cac3ad353bcc884a8e6f410239fdc538d6977c9c9a18d0adc1a1c1bc8cab9c7dd917299e5be1eb456548cdf8df00efbc6c9be9c1d302db34156f796f16c WHIRLPOOL 4d6a881f01f29062bfd30a897e0e550484b8c590d0aef2aecf6bf1285f530cff5327f2b5ea6f7275de9f17286bdc7af3c0d8cf1d70cfa73ad75fc1dfd448db71
+DIST xsane-0.998-patches-2.tar.xz 54804 SHA256 84af533cba6309cf44892da8952b6203daa4dcfaf64e2efd1dddc5144e4cab4c
+DIST xsane-0.998-patches.tar.xz 54828 SHA256 0ffcc52ec5b11d5e854e7df38c4ac298920116f2453056a1565dc1f83a64f72e SHA512 c1248ff1ffe9e8f091d3da307451055f0607ea55165cd2db042f4f05a671434cb4212c127caf110240ab6aff76462c117ba6dd06dc2582a01f4f2256037d6e13 WHIRLPOOL f85d9400e26a34b086dcdcef96f6fe33bd372d44c727e099e6928f3229d2518da77ccc00b4872ca3b68e95e87347f59c8dfefcf71aa01c798a32a51298ba3780
+DIST xsane-0.998.tar.gz 2950560 SHA256 a32e2f8057782a29619f082dcf6b5f944bf12abe3d4121c516f7c9589064c26e SHA512 8cf6f01e706175cb4df88effe13c0547624bd62b08f485118279a9bcde77b9a555f3148b24f3d6348157868f50bfa450f413a20a514b4f0218579b75f642fc04 WHIRLPOOL 424c2050b2abf0d647adef7a0d22ee3c19d57ebc21d888d97667f82243c2ef10b5d99fef15a15da6f900f25f1aae3914824c87e71141a75a3dd6b1b44a0b0e4c
+EBUILD xsane-0.998-r1.ebuild 2321 SHA256 60305e5d6dd4dcdc327231e9a8ea9a35791a79f3be1997be42c76e1658e97485 SHA512 d2a8e1df19c9120958b4a156cc454066ff97e59011411b0550ea8b0627a9323ceb4fb67aacf93eeac62f03ef344c8ee9c4a42917f19d39fd0c19052e531b088a WHIRLPOOL fe336af9040189dd215bca458cbdbc5c97a0840224998a921517be71a1cdeffa946eb66767a431e2c24e427f46a72ce4f4fe10d364ade9505dfd9b7e05868f43
+EBUILD xsane-0.998.ebuild 2198 SHA256 c75b78512b96a90ee327d3b1380a56bf2cde3737db2435bcc8ad92f6f44caa1c SHA512 a890790a0869fdfbe7181829232703968a4fe47c52c720f971692a8eedb96ce1ea28481d2cad86f03ef88cd2f56841de21e0cf2f57f766aacc8eb406001c5f4b WHIRLPOOL 29bdb5b9939fa70cdd2ee5d18fcb0cd072eb4a1e5884fe6649143db71440c734bb83e39f8a4bbe8918d03480405204fdfef6e827efa16adeda330af603cfe267
+MISC ChangeLog 12302 SHA256 b3fc1d434ebf3df7ac833015f894fb7a943682ae389565f665f366714b2b33a0 SHA512 271486bad00e459055fd8c9e2d0679e2982712fd1d075b2970f76febabd54769f5b9fb9f8844b4e60c74ef64afdb756719054d92423492a8134c49bd760913fb WHIRLPOOL 388f98ee8db24e971761b8c65a74e9e30fa8c35a6036ff09e0c80a6cabf5a5676c04651ce6b62bf0391aca80fc6fc5827661dbf9c230c5a79e8ccc469c1084f1
+MISC metadata.xml 536 SHA256 f707de877394da20d06198b2e7949381aa4923621aec6909dbc00e2d06ada22c SHA512 69e0d534532585e06e9de634b0410ce3cba412dbc03688e4985a0cbdb3eaea319718f153925bfab471c7dd50d4c633d3a8955d6a871973b659f8f2433999915b WHIRLPOOL f958908485582e9baf4a4689a66aa858eff7d6c4b0b0981132077911338cb20988595ed5a5c8abbf1a5145eb3c247e9885f070e3904c20947ea5b245babab9ed
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQNELRAAoJEOeBhlrCAAWG0HMH/R0vnJDmg2foKyC6kOvfT2sh
+0GyL5J/4zflZphHtRgoC8lmM0qtLsfmbm9sm/rO7JQcTkXVfXp0gr/h34sOsJV6Z
+MqexU5P4Q6UufkU5bp7CIL0U2xiCGmpH7ymCZNO/iAx124C7TJm7MgxqTmCHQLsR
+aJkHBZSrOhvnnxAQR8h+3R6e8u0Nkgk/FOfoL/YPFO7An4hztTxZuhOIrZpCBtN7
+LteU1wDaaKPzwM3PZLiclAsw4eIBmtPhCerIsjWf9U+r1G7mA4zCuFByRUyEr7+r
+cvhgZjSaRkh4b2vjlgBnSXTJowAlaVUhFCJtn34E907HxUYUznvLBCFoeOnbqUo=
+=+Rwj
+-----END PGP SIGNATURE-----
--- a/media-gfx/xsane/xsane-0.998-r1.ebuild
+++ b/media-gfx/xsane/xsane-0.998-r1.ebuild
@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.998-r1.ebuild,v 1.2 2012/05/05 07:00:20 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/xsane/xsane-0.998-r1.ebuild,v 1.3 2012/08/22 02:24:10 ottxor Exp $

 EAPI="4"

@ -13,7 +13,7 @@ SRC_URI="http://www.xsane.org/download/${P}.tar.gz

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="nls jpeg png tiff gimp lcms ocr"

 RDEPEND="media-gfx/sane-backends
@ -50,7 +50,7 @@ src_prepare() {
 src_configure() {
 	local extraCPPflags
 	if use lcms; then
-		extraCPPflags="-I /usr/include/lcms"
+		extraCPPflags="-I ${EPREFIX}/usr/include/lcms"
 	fi
 	CPPFLAGS="${CPPFLAGS} ${extraCPPflags}" econf --enable-gtk2 \
 		$(use_enable nls) \
@ -68,15 +68,15 @@ src_install() {
 	# link xsane so it is seen as a plugin in gimp
 	if use gimp; then
 		local plugindir
-		if [ -x /usr/bin/gimptool ]; then
+		if [ -x "${EPREFIX}"/usr/bin/gimptool ]; then
 			plugindir="$(gimptool --gimpplugindir)/plug-ins"
-		elif [ -x /usr/bin/gimptool-2.0 ]; then
+		elif [ -x "${EPREFIX}"/usr/bin/gimptool-2.0 ]; then
 			plugindir="$(gimptool-2.0 --gimpplugindir)/plug-ins"
 		else
 			die "Can't find GIMP plugin directory."
 		fi
-		dodir "${plugindir}"
-		dosym /usr/bin/xsane "${plugindir}"
+		dodir "${plugindir#${EPREFIX}}"
+		dosym /usr/bin/xsane "${plugindir#${EPREFIX}}"
 	fi

 	newicon src/xsane-48x48.png ${PN}.png
--- a/Show more
+++ b/Show more