diff --git a/mail-filter/assp/Manifest b/mail-filter/assp/Manifest
index 78faba7..8ec2dd2 100644
--- a/mail-filter/assp/Manifest
+++ b/mail-filter/assp/Manifest
@@ -3,10 +3,11 @@ DIST ASSP_2.4.3_14258_install.zip 1530651 SHA256 e3c0f850b4c790242787f90bc5c4d49
 DIST ASSP_2.4.3_15059_install.zip 1560794 SHA256 e2f5f841a4b85968abf3be26c3674900fc1a09ab7bc2bb348132964fbf0dfa2d SHA512 dd48456d451655a5bb449a7503e3c9028adca911215ea16f1ae78f75f756bb5792fb602836198fbc8c4aab9a5a7ed3c091ad041adb2aee0c187a4cb812b7b2f1 WHIRLPOOL a24bf988043a03d14b04aa6e0df217b5699bd4f15b0001cf9554c46327f1636661fb40b3b1caa2240f061c9f6cc6a4ccbb00be26fa34cbdc625d3e8ef8763ae5
 DIST ASSP_2.4.3_15075_install.zip 1562804 SHA256 a78cc642abdbc2e1a97e6be2a68ae2f9801fbf29f0298efa75bf80ba4eef217b SHA512 8f7fc580146e750ac2a3692310a2b16d1765b7b8abd19dc52db6b68f9ff94e225e6a14d49aad7352ecdad097f0e6f285abfd565c72358e157ea857b453731153 WHIRLPOOL 2ea3218a11e2b958cc943139c9e1f53bac7c75b0d460c57bfca5ac89b565fc9bab84de47188c0289c0fedebadbfa0a9e6cf8d09f7e083563140ff3b24eb80ebe
 DIST ASSP_AFC_3.11.zip 14293 SHA256 17922aa14229e6f9bf40f41ac42543a02a043565b25a61f1dd45702099f6dbcc SHA512 6552ccdd5d68b2d8ea9961a12eaeb0f5a50a7cfb19c6b4728cee5aa4f3f67ff183b9ea693eb7461a8852c35ac937d07a4ec309d1814c2ea5441c66a40ef409bc WHIRLPOOL 59fb7cd5f5e4631af970ad8ac21a301720cd5897262013c0bce2eba29abeb6ecd99355d56fdd861b354e539259e32945e97362b9ca2e0bb2894ef48592faff7c
+DIST ASSP_AFC_3.12.zip 14271 SHA256 d256abab56252ddbe9394d203a0c73e313cf7926d042b4144810aa29567a4e06 SHA512 11ad0e8c6de569367af789c6be32471497589fa9ca261f38b7c33ac958c1e03657925a29971fee871de3217a28973cf99f7421ceb8c5a0e3244fa13783b891fe WHIRLPOOL 0b45d893879bf9c972d90a2e6bb1bd62cf8bf519dbfb2b5f02e15215d89d65d3eb2c779da00e4a9661b6223a3b98855fda6d2f1122f1ee722b317118a90d7700
 DIST ASSP_ARC_2.05.zip 9104 SHA256 a53cbe763f4a939e173d63ea78025c3bf8bef106f5ff3946f55d919cd893c60f SHA512 64c8d136cf2bd60544ca9c2c84635604e56b4be8b92d2dfb654eb8fa471398f9ce028da9a0944a0e2d7dac0c612e074d94d90f4de6aef929b076339262ffa11a WHIRLPOOL 50b27ca94487cb4b1f17ca2d5a93d5a733787e85e341587c71bfa9d9ab289a23a62aaa06dc8281a35438b9edcf9a88663304def9de95fc45bb80b41369ab8823
 DIST ASSP_DCC_2.01.zip 6018 SHA256 9b40e8fe9dd4f8bef741fadaf867084c26106fea61a0863c01bdd2cdf9d85753 SHA512 caec1fbbac8b2f31373c31e0fe637d3020f34dd02f7f010e7af42c7c28f62d7673d0ca93036608b524711b7d1958dd6657cc089df16f48dfd84ed5067c1d0521 WHIRLPOOL c012559e934b94427004bf0636245e6c49aeee5f1c7618719a3c53487ed24dec8ea40126667edcaec737b1677d5130b2c4be57a7bac55f5efcd4e2967ec6602f
 DIST ASSP_OCR_2.20.zip 7837 SHA256 dd1005b7758482659a90713ce163e53b26768b84063628931c6ec5f2dca631e2 SHA512 9e51df6ae8146afb5984edccac1eed2eeb89167877bb4122d3bc1c54fc7ef2455a9e0679f632c2d486d76168718b688ffcd372f4d2b2bdd7f8d8a61a1c8949b6 WHIRLPOOL f8123ec79fdea8222bfba737647ed905ea64171e6f242189b345b9db2dee88477245220247de9b5e7df801897ca687a470daa9576a7046661e96c92aa1a65a50
 DIST ASSP_Razor_1.09.zip 4308 SHA256 9da4791bdbbea05f8308e9eda67916f74c8acf26e1361239e7e1282ee9bfdd1c SHA512 b68860610b2fc5c4322c2a236d85030c0b290338708926e379071318966e355666e9f3edf5838412b186ab72a2f9ddaa7dea1c723d8468e2a0e515ef854a3d7f WHIRLPOOL 070c72f7cf3f8320f2b2f3fad6f6cdb7ee3dc3f50264a14ebe5626bd5cdfde1243cafb18fa237088888d990aec43966adf25f64112d9b8dc145318b19ab9f5e6
 EBUILD assp-2.4.3-r14258.ebuild 4916 SHA256 f1cf5779e6e8f33782a54e3597514d5b73bc675ef579aef377c9b951bccdcae5 SHA512 6178bc06d21a2507c39ef9e94f5ae99757979eac6685abe033b62d7fadd897e90bddc57eb56428b30fe8be9664616d646f11126b31d64c171f60fd4a8c24d316 WHIRLPOOL 766b3703fddaa6ec8a28ea187c502e053be4358e76d13de3bd42d04e562db3207b894b3738c92e94459899051d4791c80f535cb9004ec1ec7111615b424ca49b
 EBUILD assp-2.4.3-r15059.ebuild 4916 SHA256 f1cf5779e6e8f33782a54e3597514d5b73bc675ef579aef377c9b951bccdcae5 SHA512 6178bc06d21a2507c39ef9e94f5ae99757979eac6685abe033b62d7fadd897e90bddc57eb56428b30fe8be9664616d646f11126b31d64c171f60fd4a8c24d316 WHIRLPOOL 766b3703fddaa6ec8a28ea187c502e053be4358e76d13de3bd42d04e562db3207b894b3738c92e94459899051d4791c80f535cb9004ec1ec7111615b424ca49b
-EBUILD assp-2.4.3-r15075.ebuild 4916 SHA256 f1cf5779e6e8f33782a54e3597514d5b73bc675ef579aef377c9b951bccdcae5 SHA512 6178bc06d21a2507c39ef9e94f5ae99757979eac6685abe033b62d7fadd897e90bddc57eb56428b30fe8be9664616d646f11126b31d64c171f60fd4a8c24d316 WHIRLPOOL 766b3703fddaa6ec8a28ea187c502e053be4358e76d13de3bd42d04e562db3207b894b3738c92e94459899051d4791c80f535cb9004ec1ec7111615b424ca49b
+EBUILD assp-2.4.3-r15075.ebuild 4916 SHA256 7ef4d0762f1662936b7d0664c204e288d4013b8d0c805d35b5279175a30d5fd0 SHA512 7e8ac0c051b69ea5e07229cdc497677319141d2adcfa16a30b90141c3b4f83de3ff62101c8c4d6933f550ff9d9424ba88eaaf0f36db50df7a3f9f552c3b9e76d WHIRLPOOL 7f9255298f907888ae8fcdc517184a6814e7283d026dd7a929e0774405398aba38b36abc17c99575c8923292c24aa5eaa6377bd825af6d7565eab2468fde31f0
diff --git a/mail-filter/assp/assp-2.4.3-r15075.ebuild b/mail-filter/assp/assp-2.4.3-r15075.ebuild
index c53c193..c51af58 100644
--- a/mail-filter/assp/assp-2.4.3-r15075.ebuild
+++ b/mail-filter/assp/assp-2.4.3-r15075.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 
 inherit eutils user
 
-VERSION_PLUGIN_AFC=3.11
+VERSION_PLUGIN_AFC=3.12
 VERSION_PLUGIN_ARC=2.05
 VERSION_PLUGIN_DCC=2.01
 VERSION_PLUGIN_OCR=2.20
diff --git a/www-client/torbrowser-31.6.0.ebuild.diff b/www-client/torbrowser-31.6.0.ebuild.diff
new file mode 100644
index 0000000..05368c6
--- /dev/null
+++ b/www-client/torbrowser-31.6.0.ebuild.diff
@@ -0,0 +1,76 @@
+--- torbrowser-31.6.0-r1.ebuild.orig	2015-04-17 08:31:28.000000000 +0200
++++ torbrowser-31.6.0-r1.ebuild	2015-04-17 08:44:13.857045554 +0200
+@@ -41,12 +41,24 @@
+ 	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+ 	http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz
+ 	x86? (
+-		${BASE_SRC_URI}/tor-browser-linux32-${TOR_PV}_en-US.tar.xz
+-		${ARCHIVE_SRC_URI}/tor-browser-linux32-${TOR_PV}_en-US.tar.xz
++		!linguas_de? (
++			${BASE_SRC_URI}/tor-browser-linux32-${TOR_PV}_en-US.tar.xz
++			${ARCHIVE_SRC_URI}/tor-browser-linux32-${TOR_PV}_en-US.tar.xz
++		)
++		linguas_de? (
++			${BASE_SRC_URI}/tor-browser-linux32-${TOR_PV}_de.tar.xz
++			${ARCHIVE_SRC_URI}/tor-browser-linux32-${TOR_PV}_de.tar.xz
++		)
+ 	)
+ 	amd64? (
+-		${BASE_SRC_URI}/tor-browser-linux64-${TOR_PV}_en-US.tar.xz
+-		${ARCHIVE_SRC_URI}/tor-browser-linux64-${TOR_PV}_en-US.tar.xz
++		!linguas_de? (
++			${BASE_SRC_URI}/tor-browser-linux64-${TOR_PV}_en-US.tar.xz
++			${ARCHIVE_SRC_URI}/tor-browser-linux64-${TOR_PV}_en-US.tar.xz
++		)
++		linguas_de? (
++			${BASE_SRC_URI}/tor-browser-linux64-${TOR_PV}_de.tar.xz
++			${ARCHIVE_SRC_URI}/tor-browser-linux64-${TOR_PV}_de.tar.xz
++		)
+ 	)"
+ 
+ ASM_DEPEND=">=dev-lang/yasm-1.1"
+@@ -226,9 +238,15 @@
+ 		|| die
+ 
+ 	# see: https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/gitian/descriptors/linux/gitian-bundle.yml?h=maint-4.0#n148
+-	echo "pref(\"general.useragent.locale\", \"en-US\");" \
+-		>> "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/000-tor-browser.js" \
+-		|| die
++	if use linguas_de ; then
++		echo "pref(\"general.useragent.locale\", \"de\");" \
++			>> "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/000-tor-browser.js" \
++			|| die
++	else
++		echo "pref(\"general.useragent.locale\", \"en-US\");" \
++			>> "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/000-tor-browser.js" \
++			|| die
++	fi
+ 
+ 	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+ 	emake DESTDIR="${D}" install
+@@ -267,7 +285,11 @@
+ 
+ 	# Profile without the tor-launcher extension
+ 	# see: https://trac.torproject.org/projects/tor/ticket/10160
+-	local profile_dir="${WORKDIR}/tor-browser_en-US/Browser/TorBrowser/Data/Browser/profile.default"
++	if use linguas_de ; then
++		local profile_dir="${WORKDIR}/tor-browser_de/Browser/TorBrowser/Data/Browser/profile.default"
++	else
++		local profile_dir="${WORKDIR}/tor-browser_en-US/Browser/TorBrowser/Data/Browser/profile.default"
++	fi
+ 
+ 	docompress -x "${EROOT}/usr/share/doc/${PF}/tor-launcher@torproject.org.xpi"
+ 	dodoc "${profile_dir}/extensions/tor-launcher@torproject.org.xpi"
+@@ -283,7 +305,11 @@
+ 
+ 	# see: https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/RelativeLink/RelativeLink.sh?h=maint-4.0#n248
+ 	dodoc "${FILESDIR}/README.tor-launcher"
+-	dodoc "${WORKDIR}/tor-browser_en-US/Browser/TorBrowser/Docs/ChangeLog.txt"
++	if use linguas_de ; then
++		dodoc "${WORKDIR}/tor-browser_de/Browser/TorBrowser/Docs/ChangeLog.txt"
++	else
++		dodoc "${WORKDIR}/tor-browser_en-US/Browser/TorBrowser/Docs/ChangeLog.txt"
++	fi
+ }
+ 
+ pkg_preinst() {
diff --git a/www-client/torbrowser/Manifest b/www-client/torbrowser/Manifest
index 9ae9aa5..ddfbeb4 100644
--- a/www-client/torbrowser/Manifest
+++ b/www-client/torbrowser/Manifest
@@ -4,13 +4,19 @@ AUX torbrowser-24.3.0-allow-lightspark.patch 615 SHA256 904a090199d82d3fea3f96c2
 DIST firefox-31.0-patches-0.2.tar.xz 4636 SHA256 fdcd4e68093fb905af06cd89aad7042f8a4e695dea9c184351945fcb5872a062 SHA512 2fee84ac6027a1e1317470112df54fef411596a522bca756f82c525b13ba952015e71f2aa05a807fec04c3bd092e8cbebd0c2349e0dc4950b329a88811b00151 WHIRLPOOL 59dc5f3457dc2a0c0c83a0128063da00d127cee13487b112064368de7d98438b7ffeb1dfe362080eca6a82af4834f3e27c6bd887e51b5d59c728ae124b26114d
 DIST tor-browser-31.5.0esr-4.0-1-build1.tar.gz 170142149 SHA256 75c39110209cb20d9b83782114edbf3d94e77fa4bf9c2ef0b79ebe8bc6100375 SHA512 d9b692cd5678ea96c3b62f630017057c07a9976fb11102d9f1bb489cf495e6ab890ebc36b756e6efc39b1837804c32efa72c76621bbad563ecb9954bcd61771b WHIRLPOOL d9432bb1dee8e39ba8bdaac252315f83d645cf2374789b2f7eb3f4453bb87b5a67422c3e6f92a81c007db17f6f9069e7f9023051073123c07178fc3fca3e9b5b
 DIST tor-browser-31.5.3esr-4.0-1-build1.tar.gz 170134864 SHA256 346039cb3ca3cafb085c3bf01ef04a718dc27f48ad774b3f1e5bef85881ed3ca SHA512 8f73bb575d5f764fdf48c4324657966cb38c9f200148370b08d9bbab4b12869530baf6779eabd41f9cf2665a9ce24bb1d4f83b9fd7909577fc12677597ed5a3e WHIRLPOOL d7c0c2bf9d85b0cfc9f54f5e4a4f805e1b3811be8c9ec246a16e4067d0a2082777557a826619ff4ec22ebbfc53f3aab8a577f04a0c6bc9eff88b5a5030fd6826
+DIST tor-browser-31.6.0esr-4.0-1-build1.tar.gz 170145497 SHA256 00ccf77d30efe0a124f91ffd5621396a5f81e39a96b63f769295e820acf9c928 SHA512 b59b93f3494ddd93e85ac4c5ca3d4c513a203bc9ea8638fcf04e3acaaa345973ba39ecbc37b1cc2257f120ab1ee6fc4c8e6395f2205fc903c8778c73e91efcea WHIRLPOOL 2fce2ce978966a58bc5437a99a33c4277685a99d2f587e542747d9ddbca32e4cb53cb5539cd912e77414a859e31682bed51fb34ebdac4abb16643d70aab5e4d0
 DIST tor-browser-linux32-4.0.4_de.tar.xz 43232372 SHA256 954f630c426d3961253d99913926422c62804b9ed058e38ba39e622c670bc9f4 SHA512 1c16dbcf5faefafb9c3b5a93ca8fc85d1a6cdada233cd96ac63f96c110db188e39ee96ca822a8dde1e778fd748dc6a8741f27c698e136606da88c0e01bccaf56 WHIRLPOOL b2a49f38f965708956bd3a32f4a3d1e08d9cf87647bad49c2a62b090fc4923990977f5da1adfa612de7a67356ab17e0b4761836a75e61ebf4b1f88b6f9c9a4dc
 DIST tor-browser-linux32-4.0.4_en-US.tar.xz 42884008 SHA256 f527b85a057ae402fa1dc84e6c175071e6448300cd2ebdd0d50494e1dd605185 SHA512 f5846b01d9b6bcac69c188bdb1d2d2fade86aec37c9f2216a6efcb8e95286cee9558acb5d2acf8fb1d36c11540ab460c3159d7f66f36d386d4c5e47e1da4fe16 WHIRLPOOL ae293d1fa156058b0f475c230723d8b3a7844ba50c98e3a21e0251d2e634802fde8facb56e28c8168e023d33dc75278e8421429de42bf9b7e8b06db8dd659e8c
 DIST tor-browser-linux32-4.0.5_de.tar.xz 43294656 SHA256 b82fb144d928670c65a79efba03e6e3986028ef8f21f0dca6521391bf1eb97be SHA512 3ddc3be402a4af369fdde9ab2884fbb7e6d8cd67f16f0ed9ef9aaa25a3cc81cc85656c2a8dd229def3e88b7c4b8dd818e9fe925f3ffd15da9a7040d0c5f7e87e WHIRLPOOL d4358d65fdfe43d210b88453e1942fc46e008cb1c898d72869178e83658f359c9c59497c701e44a52b8e2b1f4d68e5748e297c3403a0fa1ccbc4c9c3416e15d9
 DIST tor-browser-linux32-4.0.5_en-US.tar.xz 42954776 SHA256 c30c9897d3bf0056a36eafe5f5f8fe0c5e6b6077b5db1e62aed7503f07f992fa SHA512 74f3ed7addaaf3bd14fb018a862dd6406a3b4e595667ccb0c0e23f2877e29e9e5c5fcf24718b50b8ddb8ac88e428a877411487601a764afaf97c497ea449273a WHIRLPOOL e6822995c746cae94eb9d001848f24124a5bd30f911a4253e1bf3f0bb00fd69f6de3b7e717b695d92f64c9d934b4c70a189bf15799dc92b6c6c671424594f741
+DIST tor-browser-linux32-4.0.8_de.tar.xz 43294968 SHA256 08419493a9d33dff2c39dcc8e02f658e68363a3c2e9a4bee12bc537c37f91810 SHA512 b3cf1e37cb08fc6d831d234573e4d19fcb8f87f24b30c18ee8864086dc27e6934faddef185b4483428edcd7d54fb8a24c082585d5d0e2d048a69fe36b9138b07 WHIRLPOOL 5df4d3fa7e5a36f64ea44fe6affe0b79488b77552b2016e3313303b32be5292e9f6828571a90e57d1b0b370a76d74eaa278e37e2dc720fbd819c8c07b2d8b827
+DIST tor-browser-linux32-4.0.8_en-US.tar.xz 42957292 SHA256 152186ff31425660675c082af1759ef6cc65f618b6e49e25385c7ccacfe70061 SHA512 9558b6313b1bbb12e93e311ec45cf4cef30565601e0176ba443f1a68489830e19e6558df2705a6c6b2d3ad82b3bc3436bcea518731f5c4ddfb5d27a98ff3ee08 WHIRLPOOL abb481d639f1c8de5f66a39feffe829fa21871ad705c5623a578b7fe882227b635b65121c6e1ec8f388df19468f2faed0e110a7d8a06b53f2b976adfd5f86aa4
 DIST tor-browser-linux64-4.0.4_de.tar.xz 42429892 SHA256 58942a6979ef817f6a645eeb6e1be869b4793ea64f59aec989de88fdae7b44ba SHA512 5d3341d82a15b1e65ef0160e358eadca239764c90e6b3d8b0526cbc97f20d3df1d359219791e33fb976c7d11a2ade2c4e529abed658c5dacb10ceed8ae01e294 WHIRLPOOL 61d82917e9a86ec1eaade3aa8abe6e6e401d53407cd61d061b11b8d84bcd39e149038edc1ea4788f64148c7f58cf6502addba900049ffb45ad88abd524dee411
 DIST tor-browser-linux64-4.0.4_en-US.tar.xz 42068548 SHA256 0f0a07905daaf714322bc54cf25ed0e3b8ef91aeb937ab0df2d39010c9ee7b82 SHA512 8dbed4d037ad4927811089ce05c0411c71d6f7fb6614d9131a4554c00630a397b9c88ea31c0389ffb813297ed77a69ed158a2cc5186a7df8b0d8728b35e480ba WHIRLPOOL 40f93d1fb610095dd8762ffb41d5d989d5e357c7ddb8dd8a07b3dd87962988e25fe07de8fa5bbe995f8ca2f368f395dd6a0e0bcb12a43fe4a8cd8f48feeb51b2
 DIST tor-browser-linux64-4.0.5_de.tar.xz 42484704 SHA256 d296e6798365498c3bf633bf7b964430a634618590c01b64f2bb45130b22376b SHA512 d645495f8c316422e49f8c550017f90da068d5394e97536085b485010e14a79c1d2e7dc3b06d9b56e4cc94312664b7d7fc9f3e21cc03348f33b823c385970297 WHIRLPOOL 0545b5fdc366d782771e6f4cd6119860ad968a298314f81200718a87b7f49b94b623ef332478c7a728d42c4835881ef03647524245216871cec8e6748ef01c04
 DIST tor-browser-linux64-4.0.5_en-US.tar.xz 42136108 SHA256 e1f6f74e1c73e9830d488669d097d7f6720fd0b45f80bf07283382b99dc03b70 SHA512 c4a508d2bece3883dfc21bf566b6a9cfb82d3ef55182d0479786c72cad41aa098f871247fd379326ade2792dbc4591718f6f76f8c1ce5daa436946ae1f1b3c5b WHIRLPOOL bdc7402155c571384104ea833726b9ccdf9ec46b7900938e142243e85924596253da15dce4597927501691cbbeb30e2ed9b0eda2bf038ff42dd970448d5dfb0a
+DIST tor-browser-linux64-4.0.8_de.tar.xz 42490472 SHA256 5520d0d9d17e5d23787d98fcd3a4404e00a77afd4c9e9fdd4010a0b396984b96 SHA512 5e49276d19e744fa7fe85a8fbde7f5e0c4aa4580f7efafef4081fe83549e91f08011eef96471de39ffc9907584f033f193ae0859303e6af035385d5239cf0205 WHIRLPOOL 8f4c1b053d5fc4e242fe0d3a7e98701e9105ea7f7ebc1916c63f92e06f49b9d437abcae6e819c5a33f2b5dced4ae509ca5b5f2b1173d7562b6e1a7c04cfcdd7b
+DIST tor-browser-linux64-4.0.8_en-US.tar.xz 42138024 SHA256 d8e1ff1865542eb358834bd6f095a2bfa2a991a30ca5188a5752883636a31a36 SHA512 3b4175f828725845ce5192dbe8c397d459d418e15a26216ed56c4bbffdc4fdd465e1c2730bf83df5dfc338e7c2bb7f769791ea0ef21ed24ef738c0ab46fabbdc WHIRLPOOL 177f5948569b801ff3813065412c32a189f09e2512c83c75f1e62ab74559a0289df8fe40b36fca87b5d6664cab9d44fb498ef10b7962b56c90f1e96164b59d25
 EBUILD torbrowser-31.5.0.ebuild 10670 SHA256 c27eccf48212314d182c47a19fce7bef3e1f3535ed59414b7d9aa5f7bdea5daa SHA512 2f7891db7e8cc613a240c9491c151ee5cefe56f2a37f9c9e55601b041d345c3fa071d68efb006700c265a9a4cd0c0bad0bc0a427035d92d31843a8c0b29d72f7 WHIRLPOOL abc0eb3003b4e22a0d9a0df1a663b1f944e8ae5a2f0657b54b824b5cb9c42c307606efb157d18cdb5729a5c522ed3a219233c4c75e4696efabc36f6c6aec0dd1
 EBUILD torbrowser-31.5.3.ebuild 10670 SHA256 337d93d0bcf625639ca4d9cecbf8229fc7680e75aae0eb64866c185ddee5deb9 SHA512 1389a21dcd96ed28892c2a483b9764f824fb9c1d5d5c1b9833fe49cc6d2aecbf74537de495def959bb25557f12da21fbe1d172345ddfb24cd5dba0e98592e05f WHIRLPOOL 9c5e99cf5da660f498ec3d1fbdec5b5a1ee2747dc1938fdeff437fd0dfb0d7fcb816f229bf37d65302e47e3cdcd8820fcd82661ddb741439991a8a75a787d0ee
+EBUILD torbrowser-31.6.0-r1.ebuild 11041 SHA256 77c4da199d2165af88708642e47a79a6b35d498314cc0d815bc2ac632fd01968 SHA512 082f18ab6ae26ef9bac4abd4b55f380058980ee73cc0c6aea48940c3741b5fe7244ce5053cfb58a0087d2dbcc70968118c159e12e178c8bb979e7ac01b83dd06 WHIRLPOOL 9a532661598d2084589a8ca676d52abbc906562f0c3f985917c128d4584be6d95a83bb721fc55ae55b36230ed0dbf2fb1fc0266d860db9c32c56314564cd7e14
diff --git a/www-client/torbrowser/torbrowser-31.6.0-r1.ebuild b/www-client/torbrowser/torbrowser-31.6.0-r1.ebuild
new file mode 100644
index 0000000..19937d6
--- /dev/null
+++ b/www-client/torbrowser/torbrowser-31.6.0-r1.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+WANT_AUTOCONF="2.1"
+MOZ_ESR="1"
+
+MY_PN="firefox"
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${PV}esr"
+fi
+
+# see https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/gitian/versions?h=maint-4.0
+TOR_PV="4.0.8"
+GIT_TAG="tor-browser-${MOZ_PV}-4.0-1-build1"
+
+# Patch version
+PATCH="${MY_PN}-31.0-patches-0.2"
+
+MOZCONFIG_OPTIONAL_WIFI=1
+MOZCONFIG_OPTIONAL_JIT="enabled"
+
+inherit check-reqs flag-o-matic toolchain-funcs eutils gnome2-utils mozconfig-v5.31 multilib pax-utils autotools
+
+DESCRIPTION="The Tor Browser"
+HOMEPAGE="https://www.torproject.org/projects/torbrowser.html
+	https://gitweb.torproject.org/tor-browser.git"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+# BSD license applies to torproject-related code like the patches
+# icons are under CCPL-Attribution-3.0
+LICENSE="BSD CC-BY-3.0 MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="hardened test linguas_de"
+
+BASE_SRC_URI="https://dist.torproject.org/${PN}/${TOR_PV}"
+ARCHIVE_SRC_URI="https://archive.torproject.org/tor-package-archive/${PN}/${TOR_PV}"
+SRC_URI="https://gitweb.torproject.org/tor-browser.git/snapshot/${GIT_TAG}.tar.gz -> ${GIT_TAG}.tar.gz
+	http://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCH}.tar.xz
+	http://dev.gentoo.org/~axs/distfiles/${PATCH}.tar.xz
+	x86? (
+		!linguas_de? (
+			${BASE_SRC_URI}/tor-browser-linux32-${TOR_PV}_en-US.tar.xz
+			${ARCHIVE_SRC_URI}/tor-browser-linux32-${TOR_PV}_en-US.tar.xz
+		)
+		linguas_de? (
+			${BASE_SRC_URI}/tor-browser-linux32-${TOR_PV}_de.tar.xz
+			${ARCHIVE_SRC_URI}/tor-browser-linux32-${TOR_PV}_de.tar.xz
+		)
+	)
+	amd64? (
+		!linguas_de? (
+			${BASE_SRC_URI}/tor-browser-linux64-${TOR_PV}_en-US.tar.xz
+			${ARCHIVE_SRC_URI}/tor-browser-linux64-${TOR_PV}_en-US.tar.xz
+		)
+		linguas_de? (
+			${BASE_SRC_URI}/tor-browser-linux64-${TOR_PV}_de.tar.xz
+			${ARCHIVE_SRC_URI}/tor-browser-linux64-${TOR_PV}_de.tar.xz
+		)
+	)"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+CDEPEND=">=dev-libs/nss-3.17.1
+	>=dev-libs/nspr-4.10.6"
+
+DEPEND="${CDEPEND}
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )"
+
+QA_PRESTRIPPED="usr/$(get_libdir)/${PN}/${MY_PN}/firefox"
+
+S="${WORKDIR}/${GIT_TAG}"
+
+# See mozcoreconf-2.eclass
+mozversion_is_new_enough() {
+	if [[ $(get_version_component_range 1) -ge 17 ]] ; then
+		return 0
+	fi
+	return 1
+}
+
+pkg_setup() {
+	moz_pkgsetup
+
+	# These should *always* be cleaned up anyway
+	unset DBUS_SESSION_BUS_ADDRESS \
+		DISPLAY \
+		ORBIT_SOCKETDIR \
+		SESSION_MANAGER \
+		XDG_SESSION_COOKIE \
+		XAUTHORITY
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+
+	if use jit && [[ -n ${PROFILE_IS_HARDENED} ]]; then
+		ewarn "You are emerging this package on a hardened profile with USE=jit enabled."
+		ewarn "This is horribly insecure as it disables all PAGEEXEC restrictions."
+		ewarn "Please ensure you know what you are doing.  If you don't, please consider"
+		ewarn "emerging the package with USE=-jit"
+	fi
+}
+
+src_prepare() {
+	# Apply gentoo firefox patches
+	EPATCH_SUFFIX="patch" \
+	EPATCH_FORCE="yes" \
+	epatch "${WORKDIR}/firefox"
+
+	# Revert "Change the default Firefox profile directory to be TBB-relative"
+	epatch -R "${FILESDIR}/tor-browser.git-bccc144c21f6069a294038a6559ba46ceb8da2a2.patch"
+
+	# FIXME: https://trac.torproject.org/projects/tor/ticket/10925
+	# Except lightspark-plugin from blocklist
+	epatch "${FILESDIR}"/${PN}-24.3.0-allow-lightspark.patch
+
+	# Allow user to apply any additional patches without modifing ebuild
+	epatch_user
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${S}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that our plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${S}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Fix sandbox violations during make clean, bug 372817
+	sed -e "s:\(/no-such-file\):${T}\1:g" \
+		-i "${S}"/config/rules.mk \
+		-i "${S}"/nsprpub/configure{.in,} \
+		|| die
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/browser/installer/Makefile.in || die
+
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${S}"/toolkit/mozapps/installer/packager.mk || die
+
+	eautoreconf
+
+	# Must run autoconf in js/src
+	cd "${S}"/js/src || die
+	eautoconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="${EPREFIX}"/usr/$(get_libdir)/${PN}/${MY_PN}
+	MEXTENSIONS="default"
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# Add full relro support for hardened
+	use hardened && append-ldflags "-Wl,-z,relro,-z,now"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+	mozconfig_annotate '' --disable-mailnews
+
+	# Other ff-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+
+	# Rename the install directory and the executable
+	mozconfig_annotate 'torbrowser' --libdir="${EPREFIX}"/usr/$(get_libdir)/${PN}
+	mozconfig_annotate 'torbrowser' --with-app-name=torbrowser
+	mozconfig_annotate 'torbrowser' --with-app-basename=torbrowser
+	# see https://gitweb.torproject.org/tor-browser.git/tree/configure.in?h=tor-browser-31.3.0esr-4.0-1#n6401
+	mozconfig_annotate 'torbrowser' --disable-tor-browser-update
+	mozconfig_annotate 'torbrowser' --with-tor-browser-version=${TOR_PV}
+
+	# Finalize and report settings
+	mozconfig_final
+
+	if [[ $(gcc-major-version) -lt 4 ]]; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]]; then
+		if use amd64 || use x86; then
+			append-flags -mno-avx
+		fi
+	fi
+}
+
+src_compile() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake -f client.mk
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="${EPREFIX}"/usr/$(get_libdir)/${PN}/${MY_PN}
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	# MOZ_BUILD_ROOT, and hence OBJ_DIR change depending on arch, compiler etc.
+	local obj_dir="$(echo */config.log)"
+	obj_dir="${obj_dir%/*}"
+	cd "${S}/${obj_dir}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${S}/${obj_dir}"/dist/bin/xpcshell
+
+	# Add an emty default prefs for mozconfig-3.eclass
+	touch "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+		|| die
+
+	# Disable adobe-flash by default
+	sed -i -e 's:pref("plugin.state.flash", 1);:pref("plugin.state.flash", 0);:g' \
+		"${S}/${obj_dir}/dist/bin/browser/defaults/preferences/000-tor-browser.js" \
+		|| die
+
+	# see: https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/gitian/descriptors/linux/gitian-bundle.yml?h=maint-4.0#n148
+	if use linguas_de ; then
+		echo "pref(\"general.useragent.locale\", \"de\");" \
+			>> "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/000-tor-browser.js" \
+			|| die
+	else
+		echo "pref(\"general.useragent.locale\", \"en-US\");" \
+			>> "${S}/${obj_dir}/dist/bin/browser/defaults/preferences/000-tor-browser.js" \
+			|| die
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" \
+	emake DESTDIR="${D}" install
+
+	# Install icons and .desktop for menu entry
+	local size sizes icon_path
+	sizes="16 24 32 48 256"
+	icon_path="${S}/browser/branding/official"
+	for size in ${sizes}; do
+		newicon -s ${size} "${icon_path}/default${size}.png" ${PN}.png
+	done
+	# The 128x128 icon has a different name
+	newicon -s 128 "${icon_path}/mozicon128.png" ${PN}.png
+	make_desktop_entry ${PN} "TorBrowser" ${PN} "Network;WebBrowser"
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification ; then
+		echo "StartupNotify=true" \
+			>> "${ED}/usr/share/applications/${PN}-${PN}.desktop" \
+			|| die
+	fi
+
+	# Required in order to use plugins and even run torbrowser on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/plugin-container
+	# Required in order for jit to work on hardened, as of torbroser-31
+	use jit && pax-mark pm "${ED}"${MOZILLA_FIVE_HOME}/{torbrowser,torbrowser-bin}
+
+	# We dont want development files
+	rm -r "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk} \
+		|| die "Failed to remove sdk and headers"
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}" >> ${T}/10${PN}
+	doins "${T}"/10${PN} || die
+
+	# Profile without the tor-launcher extension
+	# see: https://trac.torproject.org/projects/tor/ticket/10160
+	if use linguas_de ; then
+		local profile_dir="${WORKDIR}/tor-browser_de/Browser/TorBrowser/Data/Browser/profile.default"
+	else
+		local profile_dir="${WORKDIR}/tor-browser_en-US/Browser/TorBrowser/Data/Browser/profile.default"
+	fi
+
+	docompress -x "${EROOT}/usr/share/doc/${PF}/tor-launcher@torproject.org.xpi"
+	dodoc "${profile_dir}/extensions/tor-launcher@torproject.org.xpi"
+	rm "${profile_dir}/extensions/tor-launcher@torproject.org.xpi" || die "Failed to remove torlauncher extension"
+
+	# Force remote Tor check since the control port might not be available
+	echo "pref(\"extensions.torbutton.local_tor_check\", false);" \
+		>> "${profile_dir}/preferences/extension-overrides.js" \
+		|| die
+
+	insinto ${MOZILLA_FIVE_HOME}/browser/defaults/profile
+	doins -r "${profile_dir}"/{extensions,preferences,bookmarks.html}
+
+	# see: https://gitweb.torproject.org/builders/tor-browser-bundle.git/tree/RelativeLink/RelativeLink.sh?h=maint-4.0#n248
+	dodoc "${FILESDIR}/README.tor-launcher"
+	if use linguas_de ; then
+		dodoc "${WORKDIR}/tor-browser_de/Browser/TorBrowser/Docs/ChangeLog.txt"
+	else
+		dodoc "${WORKDIR}/tor-browser_en-US/Browser/TorBrowser/Docs/ChangeLog.txt"
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	echo
+	ewarn "This patched firefox build is _NOT_ recommended by Tor upstream but uses"
+	ewarn "the exact same sources. Use this only if you know what you are doing!"
+	echo
+	elog "Torbrowser uses port 9150 to connect to Tor. You can change the port"
+	elog "in the connection settings to match your setup."
+	echo
+
+	if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "31.2.0" ]]; then
+		echo
+		ewarn "Since this is a major upgrade, you need to start with a fresh profile."
+		ewarn "Either move or remove your profile in \"~/.mozilla/torbrowser/\""
+		ewarn "and let Torbrowser generate a new one."
+		echo
+	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}