gentoo resync : 18.11.2017

5 files changed, 75 insertions, 47 deletions

diff --git a/app-misc/anki/Manifest b/app-misc/anki/Manifest
index 37c19969dc4a..477f411abfcc 100644
--- a/app-misc/anki/Manifest
+++ b/app-misc/anki/Manifest
@@ -6,6 +6,7 @@ DIST anki-2.0.36.tgz 3410538 SHA256 fb208230cdc50ea02d53f521cf03926c627fff7cf731
 DIST anki-2.0.41.tgz 3422038 SHA256 f9e8498d62cda2c2892ca2141ec1a318159499c6b280edeaf8c2b95e97e3ab4e SHA512 b5f58fdd690cca84fbe26f6b626d04e638b9d814a51fa6bad33f86eccc3c8d41712594a60a6621b1103fe974350a6ecffcd4e5cc1702eb3d79d3187fe30b8872 WHIRLPOOL 08b0e8beae817ccca10f392d4bd8be1d560860a4768515e5b3023b792288680651baae2669532b66aac65c2afe1fc4d18ca0cddb9282b6f5159a31d670624810
 DIST anki-2.0.43.tgz 3422113 SHA256 009b91568f944bfd14886428ca7de550158043d16438257211e0569285241a7b SHA512 e50ee4cf6fd7be266b6d38682e28a06b51cc42a2667f35fbafa755152d47bbadb2fbd2baa771d13e73f39973a4102d626fbe7327a5de05efbc3700d7a2c9909c WHIRLPOOL 2b7ffa788d65b8fd4b489556b3a66a5e6f2bdcd1807d94a02a64995dfad1d6a8f2821cabd5bfaa760d222b5c05aa99e8a87eb6fefc72f60568136e414e3907e9
 DIST anki-2.0.47.tgz 3422231 SHA256 fbb5356d642a94a2cb2fb7f949e6db7c8acbe322f38a18c0603ff88f5bd4eb18 SHA512 5e4bbaac6d60506f43adfec1c4ff83285ac423405bfba57b566e7a9d632a22cf0f9ca7fe3eff3ce56c516a6cbb0112e5251319f11ba984d74bffd2c25e04c64a WHIRLPOOL dddef926f3754c1c3686e903dee539a9d84692dc6619cea7f9a71e2256cd5dcced113ce2d7da8cecf13a9ff8c36942a1216c72c5744a496e1792e70dd4750cf8
+DIST anki-2.1.0_beta25.tgz 4117303 SHA256 f91ce359e3b0d5b186f4dd8e07056743f95a12d743d91358f1768e59d25882dc SHA512 9ddf984c575df00fe9b7974f24166a0f18d63e904b3d9bd4370de506828a251efed0fb319f06dc23c6852aae46e552994c6633880603a6e746d4d242b9e627f8 WHIRLPOOL 1b4c5c97df4f2c426d791c953c009731cbe2b6a213fb7aa5acf6d71e393867e85082ff04959d836dd9e1c6739367604fdf669ee713641750de564660de0cbeba
 EBUILD anki-2.0.31.ebuild 1548 SHA256 8442f14b8f1e7a7acd3a1a0db7e05675f331d86380ae7a87085140b38c1429ea SHA512 c53dadfb9ed9106915de6f456de56975688578f01617e928e043c79271ee573150d64b0f010d6026423833a065faf63e24410bf42859920911258ea49093aca4 WHIRLPOOL f5b01e8ec14eb8de471dff010252f601f4e765a4195d0be0f04172e592d6d1ceff528f2edc5de23ff1323e40ab3eb3ec94c68aee6df11ad0039c4b80c5981371
 EBUILD anki-2.0.33.ebuild 1294 SHA256 074500a6dda66ade956f5ff4bbd48654c29e244c4b133bae256a58f925466cc0 SHA512 1a2abf48874cb5facea0c85ad10278d7a6e90d7c0d23e5fc9e7de203f12a221450673ed11f54d8f1f400368691b2d8d64c7c15bbe7596fa01a497e42c1a838cd WHIRLPOOL 5fa35e35c0ea6df92598304a4b1e43a5ddc3389628aa7aa83021f384d1d712fad36050f41b907f3f32a9af25956bef93023bbc88769b95e230c19f9b2d1af44f
 EBUILD anki-2.0.34.ebuild 1296 SHA256 597f7736a74f30326978f26d0f1ef901195e4d9ab2c014de8771a136015d6118 SHA512 88a5c498fa2ff9aeda8ccbce9ad2ba515e1e3a088531e00310052298fa60eae6b40ec640418ff37c9f451f11dfc87971e71a3c8c628ab4271ff2702003468aef WHIRLPOOL 827343c2a166dce006bbbf24476ce21d8842caf5cde344df14db28298c870af65091251ca992b4ff108981141dc5cb3af13604eb0bcae6dfd3dec84b6e4132fa
@@ -14,6 +15,7 @@ EBUILD anki-2.0.36.ebuild 1296 SHA256 597f7736a74f30326978f26d0f1ef901195e4d9ab2
 EBUILD anki-2.0.41.ebuild 1325 SHA256 8cc264ebd7463771924eb24b270c1c8d214a5eb7846f193f364001e60efa93da SHA512 5dc09ba11eb492f6d77ed90cd113e29bca357f6d49b357481e1c99ec73d22bbcf0423db9abf1dda8dc0488927455970007c851ce188738625cadde6a46f3a5bc WHIRLPOOL cfcea3408aed60ad119e9f8022f8b1897135c8816c7955ebd64620dffae322e805ac848538abfd309db07c548096146048c01223072e4e6f50dda0c98b952a0e
 EBUILD anki-2.0.43.ebuild 1407 SHA256 4f8789898944ca0f2ece43f55050fd73cdea3d8636e83ee46d13cd249e116526 SHA512 6d52decb78cfd69476ec57e135b00fe77dd83fdd51af9ca92938e8208016fd381296d287e4213be50ed4243e6680b12606a792d8a8916f150899a60665464fb9 WHIRLPOOL f11a4d1845c878189676774fec9f6591cc3739d62c46852a6a5ad8352e505dafaa566536c0d88e2c358845359dc978612f494535aad0e8abfd7c922ac61240c9
 EBUILD anki-2.0.47.ebuild 1407 SHA256 4f8789898944ca0f2ece43f55050fd73cdea3d8636e83ee46d13cd249e116526 SHA512 6d52decb78cfd69476ec57e135b00fe77dd83fdd51af9ca92938e8208016fd381296d287e4213be50ed4243e6680b12606a792d8a8916f150899a60665464fb9 WHIRLPOOL f11a4d1845c878189676774fec9f6591cc3739d62c46852a6a5ad8352e505dafaa566536c0d88e2c358845359dc978612f494535aad0e8abfd7c922ac61240c9
+EBUILD anki-2.1.0_beta25.ebuild 1439 SHA256 e2a184d9e23d2fd67915018a4c374c0f82c7fcbdb6fe39706f6174cd109efdc8 SHA512 fb11d84e94348b8560edac04415cd839f56e573655ffd2236c2d416903bb98dbe785e75a8300a20f1b7afe13c2c4a010a566bf3b19b8061667bf462a69fad239 WHIRLPOOL 5a4f9a24f313af14ef1f0be571b7ec3f655835c89f10d6c8e8f00f1219766d2099db9b4a184a1f56cef9306bbd548b08ea8110c04e112afbfe910fba0bb7e669
 MISC ChangeLog 3476 SHA256 79612fb9bb0d638c26f9f6c77fa331ad8002e5907bb7b7220f9eba2a0a8e68d6 SHA512 7374e6b0b7ca10d36454b3b60e94d6dc495e72d16d67c66475b240668a3f8be1b05f17689554316240749969ad2553adaa4b1dd8a71ff27af488dd4f66d372d5 WHIRLPOOL 1d28a2a5d4b41eccc58e56bc30f8b83908ab620ee71f8f326c183ef4a12280671e0efba7677e81710ffba3135247fd129795df24ca34c00c316e7e9edb5d74e7
 MISC ChangeLog-2015 13597 SHA256 f169f73f5e36840c9b281c98f2d420597ea86866573b224c12c87f054be9c23b SHA512 8a148eca4be6552c783d903eea48cab5ea7f6a4bca1b9c9f3d80a3fe80f989855943069c99a7f361d3ee85b98d2f8f94d4a751fc7a456292fe7ffa02105cce22 WHIRLPOOL fd93017f71140b91cad14d2a30d2c1dd30e355c95db551c03e64aae79dced66f3ad4fd12e54ae8516c87b4a8ff85f074cb23bd8b5eb545c9dc5b7dbe9a1bc43c
 MISC metadata.xml 647 SHA256 d7e3745ca759b3a639d07405aa61afcdbe2fbf9544b35c2b8a4a69da471c0016 SHA512 411bf74e025678e91d050615c1edf332a05cbf9d51bf5b14a2bb10b27208551487946670b6368f0bad6567a02534d984a0a1ca026b1c96b391f48b80567fb932 WHIRLPOOL a658a19d653a6d068011402f904fbee2d88a58726fc23fa714e889600567b6d5a26479426e9ded1e766f5d7512c46b43b058b4dcd9a7cc4c20fe9f404de0ef7a
diff --git a/app-misc/anki/anki-2.1.0_beta25.ebuild b/app-misc/anki/anki-2.1.0_beta25.ebuild
new file mode 100644
index 000000000000..9abc929ee656
--- /dev/null
+++ b/app-misc/anki/anki-2.1.0_beta25.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_6 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils python-single-r1
+
+DESCRIPTION="A spaced-repetition memory training program (flash cards)"
+HOMEPAGE="https://apps.ankiweb.net"
+
+MY_P="${P/_/}"
+SRC_URI="https://apps.ankiweb.net/downloads/beta/${MY_P}-source.tgz -> ${P}.tgz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="latex +recording +sound"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/PyQt5[gui,svg,webkit,${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.4[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	recording? (
+		media-sound/lame
+		>=dev-python/pyaudio-0.2.4[${PYTHON_USEDEP}]
+	)
+	sound? ( media-video/mplayer )
+	latex? (
+		app-text/texlive
+		app-text/dvipng
+	)"
+DEPEND=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e "s/updates=True/updates=False/" \
+		aqt/profiles.py || die
+}
+
+# Nothing to configure or compile
+src_configure() {
+	:;
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	cp tools/runanki.system tools/anki
+	doicon ${PN}.png
+	domenu ${PN}.desktop
+	doman ${PN}.1
+
+	dodoc README.md README.development
+	python_domodule aqt anki
+	python_doscript tools/anki
+
+	# Localization files go into the anki directory:
+	python_moduleinto anki
+	python_domodule locale
+}
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index 1a970025fdfd..32fa387408bb 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,7 +1,5 @@
-DIST byobu_5.122.orig.tar.gz 581198 SHA256 0e5f14db8340712cf5b1049002c5b7f2a116ca28e6df418cb7500d3c4fa43234 SHA512 df090d964dfc9b9667fa357f828e021788e0c43ed6849c9f0d4f0a95e8cc431e3cb74ce4569e96187a78f640a5fb91d5eda8cc1f2619d83cf2ad79c82a8c1f10 WHIRLPOOL bf58f3b3784ba8587242f4bebefb0a4c0adc66a604d452c2f37d5f8479a8e21867ae79b32c2ea9203aca1e7c1bd0a8e92d28d4c864fc43a9a0a8dcb5d10d790c
 DIST byobu_5.123.orig.tar.gz 581421 SHA256 2e5a5425368d2f74c0b8649ce88fc653420c248f6c7945b4b718f382adc5a67d SHA512 915ad330e85a4405ad808a6f03205c468800c0942507fc0183a883bb0b33be4023b5ef9d7a63b3fce328f771ac1a4952735ee6119a26d6a5f2b01afec7a04059 WHIRLPOOL a3c35f42828e3fc492d2873f67f9094d8b6a73db594acb7b50616bed5a1638415ea1526345ef12b0b79e65e461900fdd6caaded597f8ccfcb400b082ad7a3ac3
-EBUILD byobu-5.122.ebuild 944 SHA256 485a0b948ce7c1e687f267c60e805cf2df2ad899514b64e3ac92435d9aed2adb SHA512 68e5edd4db0a5afba31ce4c984e3c1a95c84a16e7e5f8fef9afe6be77126c596e9e288f339f3994eb00c4d7f56514e5e2ce13e61a7cd0542542835aaee903d85 WHIRLPOOL dc82ff78c16e7d03589c82f46d51e3750749c920912bc55fd3c2127cb2f683f065c789b2a1ab97ee1c7f433c7c6f94700ba033810b533430038955def1ef6ee2
-EBUILD byobu-5.123.ebuild 946 SHA256 97b528071cb6a2e83196a56dfe0496c697b664885b67599c9aef9e6d598b5e70 SHA512 468978f2398a70477a5b62df314507b44891b29fe4df4f8424f5be639238f9f997a39debeedfc3ddf30a60f447147fdb2d50707d2c98d6f7b73fb3836773e115 WHIRLPOOL d0b5ace176ff5643f2e20c1a281e2f3b9b0bdd46243cf4f139e735907d35247d54ffc8d8cf7497d1dc288e3df74559dc8dc71450c25542dfca13deaf04553780
+EBUILD byobu-5.123.ebuild 944 SHA256 485a0b948ce7c1e687f267c60e805cf2df2ad899514b64e3ac92435d9aed2adb SHA512 68e5edd4db0a5afba31ce4c984e3c1a95c84a16e7e5f8fef9afe6be77126c596e9e288f339f3994eb00c4d7f56514e5e2ce13e61a7cd0542542835aaee903d85 WHIRLPOOL dc82ff78c16e7d03589c82f46d51e3750749c920912bc55fd3c2127cb2f683f065c789b2a1ab97ee1c7f433c7c6f94700ba033810b533430038955def1ef6ee2
 MISC ChangeLog 3620 SHA256 6b22e5926089414b3b95997a64e06a78475903d5bac7a669ee95bd0dde05d452 SHA512 99b113f79ccd3f6e6227817c21f9ee000edbaddcf3463a73d3656e852b3a797dcdafb973834b3e846531c9c3ffc9a2066f7c3e49cdad8cfb63c6bec6bf9c77a1 WHIRLPOOL 05aaeaa0f116e34113acb91e21ccc2bf4865917ed85fbb48c2fcad1058a985814ab27befe7b722a4969a7a635b0ea1ab9dcc454b1e0a60267b553d46c0c21406
 MISC ChangeLog-2015 12471 SHA256 531852cf207b4352df24e8e700c030bc47a0d99f33bb9600f068a1c8be507cd1 SHA512 9e326973776877400b25d66b6588eda51b8c14d0f88a61f9bf1acc7c3af085f4e190c4ed1f1db7474a58c36997626dfb286dfa138def952be626703fb67e2063 WHIRLPOOL a20bd396a7ff709971e1848c9f010411502f8b09f945c128a2bf2f8a4ed0b7659abaaedf1a8390de743465882a3be26dc1cf0b804704b86ce9608240b058405d
 MISC metadata.xml 981 SHA256 12ed9e6f289257b9736de831582aad543b658b80e1835de42ed0a3def0a721f4 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b WHIRLPOOL 64ab86e527a04173c76dd9c21fba8c0ca577761f7fe58401b3181aa5d696188b88de6e35463e19724bf62658fce5d7d269ac092fe790c5c9b6a208e27a025a98
diff --git a/app-misc/byobu/byobu-5.122.ebuild b/app-misc/byobu/byobu-5.122.ebuild
deleted file mode 100644
index 33c36ce0cdc5..000000000000
--- a/app-misc/byobu/byobu-5.122.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
-HOMEPAGE="http://byobu.co"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="screen"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/newt[${PYTHON_USEDEP}]
-	screen? ( app-misc/screen )
-	!screen? ( app-misc/tmux )"
-
-src_prepare() {
-	default
-
-	python_fix_shebang .
-
-	# Set default system backend to screen
-	if use screen ; then
-		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
-	fi
-}
-
-src_install() {
-	default
-
-	# Create symlinks for backends
-	dosym ${PN} /usr/bin/${PN}-screen
-	dosym ${PN} /usr/bin/${PN}-tmux
-
-	docompress -x /usr/share/doc/${PN}
-}
diff --git a/app-misc/byobu/byobu-5.123.ebuild b/app-misc/byobu/byobu-5.123.ebuild
index f67cbf99d559..33c36ce0cdc5 100644
--- a/app-misc/byobu/byobu-5.123.ebuild
+++ b/app-misc/byobu/byobu-5.123.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="screen"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"