gentoo resync : 03.02.2018

6 files changed, 57 insertions, 49 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index eef5f6afe2e4..f3b3be1b56dc 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest
index 589a2e78fb92..1aa0ba249889 100644
--- a/media-video/devedeng/Manifest
+++ b/media-video/devedeng/Manifest
@@ -1,6 +1,8 @@
 DIST devedeng-4.8.11.tar.gz 1883961 BLAKE2B 6687ec3a73cc96ae7ab3eba499ebffc9f41cab5767c65e38ce85a506c7415e18ebf3cf68510542c65260decd1de9a05415b9a1843da632bc9d896ca47797df4b SHA512 275d70882ca6a7b7de75d44f4bfef83a4f5eea92dea1c2f69b99bfdefd1066761b5a46d1c8ea6262a659665165552c242eeda238d327a8695654d584820d439b
+DIST devedeng-4.8.12.tar.gz 1884025 BLAKE2B 7c6ed3c94bfd18a19147a8627fa846d78fe1f4c686a4875a917062419c2e4f136052aa79f2697e0a3642ebb92246b42ced3a4a398a4773599242726ff01c157c SHA512 67eaf426d3f69a6efb8fde5f5df425d2b8ddf1052f22cd2d36056c687bc0978a456f6158a0af302292ef5e1abb837c9ac7ca6b4e0332e81c31ca7333ea86e184
 DIST devedeng-4.8.9.tar.gz 1883507 BLAKE2B 4b973b13d8dc1bdb08c2a057769246426ae6c8bf7947474446c4a1440e3828292d8fe69f66fd3010ff895a518b5a89e063a955fe58175d26c016fb55454de7c3 SHA512 224a10886ea7f8a0e2cd3fdeed9c7b0ef5413892f4b800194d957a764b90220fed7b2f3d6bfa416798acb89024a95d678604f3d23fb19cccb8a11e2734a92b7a
 EBUILD devedeng-4.8.11.ebuild 918 BLAKE2B 3b94f4f0bb8c1d5a1bfcf293b39ed2878098b5bac39e40c282071b58caba2078dfe623eeff5ca19a9b4a1a14bd8cfad3ca75e8df81cf24ef286a98c7f4f7c58f SHA512 b6c6857fbbc3288f1aec19387150ad933c7591dd507357df80c0d8b34a79375d75e1d473956b77e2f40bda613516f9f1cfac7b85042e0b9588deaeabe9c7929d
+EBUILD devedeng-4.8.12.ebuild 918 BLAKE2B 3b94f4f0bb8c1d5a1bfcf293b39ed2878098b5bac39e40c282071b58caba2078dfe623eeff5ca19a9b4a1a14bd8cfad3ca75e8df81cf24ef286a98c7f4f7c58f SHA512 b6c6857fbbc3288f1aec19387150ad933c7591dd507357df80c0d8b34a79375d75e1d473956b77e2f40bda613516f9f1cfac7b85042e0b9588deaeabe9c7929d
 EBUILD devedeng-4.8.9.ebuild 813 BLAKE2B 99ec1c072813916cf9aa7b8c768132e0190f0e33d38c06986c4f47893f26d846c68831de34789b7f94bdd08139e8e81bdacc29a79fdbb9c7488d3650712471be SHA512 7d7574be3df9e4128e6fa278dfd6ea1af8805dd42c12734073dc4adb720c38054e751a20078d7f90f25c0d607a642d0a69950b0839963e66a8bb1f5969372773
 EBUILD devedeng-9999.ebuild 897 BLAKE2B b14e5fa2489f2c2c210ebb17367150ea877eb204a544cc9294fd6cfb30dbee38044581aa1149aa8a0d5dc7bdbd17b1c611773ec9488d8586f848c793995d82d8 SHA512 71ec9ae8b6aafe81c4289af480af88ff6fd2bb4e6fa24c1215365f392097584f458cc3d8509643e1af774f04177223d3512db86296cab44ff3dd7531fc9ec0c8
 MISC metadata.xml 943 BLAKE2B e1e02dde0b9b21f3d398d1b38cb302842b6f5748405709ba2066dc5497c699f3d7daae40c4daf00eec37a739b5f3ab9d54a78c7e2d700f677abfaeceae75ed09 SHA512 9c5cf515b958e7125d383fc9513546f9a663ea45e4c60308fb20e85eb6eedf22c71a94561721ebffd156ee5b61d5ac309c66c9a7782d905b98a95c2ad8b7b545
diff --git a/media-video/devedeng/devedeng-4.8.12.ebuild b/media-video/devedeng/devedeng-4.8.12.ebuild
new file mode 100644
index 000000000000..d1ed266804d6
--- /dev/null
+++ b/media-video/devedeng/devedeng-4.8.12.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)"
+HOMEPAGE="http://www.rastersoft.com/programas/devede.html"
+SRC_URI="https://github.com/rastersoft/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libav"
+
+RDEPEND="dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3
+	|| ( media-video/vlc media-video/mpv media-video/mplayer )
+	!libav? ( media-video/ffmpeg )
+	libav? ( media-video/libav )
+	media-video/dvdauthor
+	media-video/vcdimager
+	virtual/cdrtools
+	|| ( app-cdr/brasero kde-apps/k3b )"
+
+DEPEND="${PYTHON_DEPS}"
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/peek/Manifest b/media-video/peek/Manifest
index e244ea774acf..fb2bab1a652d 100644
--- a/media-video/peek/Manifest
+++ b/media-video/peek/Manifest
@@ -1,7 +1,5 @@
-DIST peek-1.0.1.tar.gz 2602750 BLAKE2B 84ed887847ed915f2690ab4ef02a25f3eb5d773a0dca74879580449dc092389809e0cc348f6b41cf9ac4f6ee05cec7102040977ed057642933cccadfe3c30a2a SHA512 c021e6e686de25afdd2e66bea9f2d50c08909847bf2e4d8dfbda8e18975febb2ed247a86d46c7f2a954768f8683cfc218be75ad8f495cd729e787e16f09b2dfe
-DIST peek-1.0.3.tar.gz 2620773 BLAKE2B 51615a9bf2f291786bbba8312453b3dbbbdd5c3848e04d55611f078bbcd52582e0f3b494667d3d7efbe41bb6dfc855e253f34cccc8a0bb6d3de9534200e733d7 SHA512 92e7d61fdd32b4525991a45a0781c304160dbbdaf518ffbc6389d3df2829593a830e8b1cf499b10c02ab1809984c945770c3394221dc31b29041da45ca291ab7
 DIST peek-1.2.1.tar.gz 2650099 BLAKE2B 4b53bc6cce94c585029d179937c680a3743fabc9722cc9474dd870f4be1d1d79c994420e528581c0006df81f6b6caaad285fc9f35c0addd1ae0072b40f461786 SHA512 fcb3b30bc7b434e9daafad243f82d2849d308fcd22371cdf790b60f765b78d6009ffb3c519f571718e26cf285d1cc6bc8fdd3f61dbb427f95fd08f1e3cc52a42
-EBUILD peek-1.0.1.ebuild 810 BLAKE2B d98fb6cdce6a1f050e6d49daff649c88893d310d9dd09d12c28b4f186b9026a488a2383289170decbc934ba46a206fee4e72feda6a541390dc2219239151cf08 SHA512 099234d0943401d7d55b3a01a055f7b7e0a6c588effdb480c1d3df06ffeab53bd860c78eb515005e6f72cc4107cae6b085df5565118501d612c4053450e7cd3d
-EBUILD peek-1.0.3.ebuild 828 BLAKE2B c94c8dc01b9250edd8881993469aaa2fa135ae1b710ec2fb415375f20fa242b33d5fc83ce8c62ef10327b196e73d49f5310481698b48e41660a198cbca7f3d21 SHA512 427c2aa225f5f4e746269991c40631e60bfc5236129b8e9b91c66a2c1ae29eb3b6ec96f99ae79ac23440e3cc18212f10dcedfbee5df9a12fc4dcaaa210521009
+DIST peek-1.2.2.tar.gz 2654168 BLAKE2B 2abce1609889d6cbdee493a94d768c2c201d523690d687cfa023eaa966b74716b9300ed246f443258f2901fdf341392c7428bf8d14891c3fdba9e803b680e06b SHA512 7c6fe42e41d4a3c10649b2052741a11a3c51170dbeaa834198c5b66867597c8525ecb8794694c2955f94a3e12f62c71068f2422e3a551ddfa4957595efbb6c03
 EBUILD peek-1.2.1.ebuild 1035 BLAKE2B c54cf88f3557196bb414b84818325c518aa330ccd5592f85897c4385933a07917c56391cb329b742024fb82d04afed2c9b98682b680afa1129c07a7d45648219 SHA512 dd916c9ec2668cae67187da7917b6a2d390933fe2c1deb7b8f8280fa4b4deb70bed5f96bc245cdcbde09cef598e3cc570174244d3d0f34545b4496506ed146ef
+EBUILD peek-1.2.2.ebuild 1035 BLAKE2B c54cf88f3557196bb414b84818325c518aa330ccd5592f85897c4385933a07917c56391cb329b742024fb82d04afed2c9b98682b680afa1129c07a7d45648219 SHA512 dd916c9ec2668cae67187da7917b6a2d390933fe2c1deb7b8f8280fa4b4deb70bed5f96bc245cdcbde09cef598e3cc570174244d3d0f34545b4496506ed146ef
 MISC metadata.xml 442 BLAKE2B 0737081df17bd9a248ff54ed5f788f5488c5506cb23de18dd57ade4e87f328a96fc249371cf2e78b8399528b3a3759440ceade1f16d0d1bd11a62263e12b4854 SHA512 c94b68c460e7d302d1761ba0d7adb23530c862e1a64b48f0688b68678a353cc7ae54433e6517c564e457c5ee5dac3ca6325ef967d11c66ae998da2348854296a
diff --git a/media-video/peek/peek-1.0.1.ebuild b/media-video/peek/peek-1.0.1.ebuild
deleted file mode 100644
index 94e00bcb32f0..000000000000
--- a/media-video/peek/peek-1.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-VALA_MIN_API_VERSION="0.22"
-
-inherit gnome2 vala cmake-utils
-
-DESCRIPTION="Simple animated Gif screen recorder"
-HOMEPAGE="https://github.com/phw/peek"
-SRC_URI="https://github.com/phw/peek/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.38:2
-	dev-libs/keybinder:3
-	media-video/ffmpeg[X,encode]
-	virtual/imagemagick-tools
-	>=x11-libs/gtk+-3.14:3"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=sys-devel/gettext-0.19"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DGSETTINGS_COMPILE=OFF
-		-DVALA_EXECUTABLE="${VALAC}"
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/media-video/peek/peek-1.0.3.ebuild b/media-video/peek/peek-1.2.2.ebuild
index 1e4e2893c204..8715e8e623aa 100644
--- a/media-video/peek/peek-1.0.3.ebuild
+++ b/media-video/peek/peek-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,18 +8,18 @@ inherit gnome2 vala cmake-utils
 
 DESCRIPTION="Simple animated Gif screen recorder"
 HOMEPAGE="https://github.com/phw/peek"
-SRC_URI="https://github.com/phw/peek/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/phw/peek/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="keybinder test"
 
 RDEPEND=">=dev-libs/glib-2.38:2
-	dev-libs/keybinder:3
 	media-video/ffmpeg[X,encode]
 	virtual/imagemagick-tools
-	>=x11-libs/gtk+-3.14:3"
+	>=x11-libs/gtk+-3.14:3
+	keybinder? ( dev-libs/keybinder:3 )"
 DEPEND="${RDEPEND}
 	$(vala_depend)
 	app-text/txt2man
@@ -34,8 +34,18 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DGSETTINGS_COMPILE=OFF
+		-DKEYBINDER_FOUND=$(usex keybinder 1 0)
 		-DVALA_EXECUTABLE="${VALAC}"
 	)
 
 	cmake-utils_src_configure
 }
+
+src_compile() {
+	cmake-utils_src_compile
+
+	# Compile helper programs for tests
+	if use test; then
+		cmake-utils_src_make -C tests
+	fi
+}