gentoo resync : 07.10.2018

10 files changed, 14 insertions, 184 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index d372c70d5121..a29417bfc34f 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index 18a59436638e..5bb18610c012 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,5 +1,3 @@
-DIST cdemu-daemon-3.1.0.tar.bz2 79943 BLAKE2B 23407c3a14b426fa9f53c2d62564e34a8f878598c24cdd9419c811786d858135a0af3a1cde8b7afc4178f7772336ed533077c089c976e98de30c932deca1c426 SHA512 f0f3de31b2bf6a97852bb1bc45d301e6cbf401ca7499f42e99811ca62431e86b344c83ddb4420571f2038e43432711e04817b9ed3859893eec7d36fbad8dfdb5
 DIST cdemu-daemon-3.2.1.tar.bz2 82426 BLAKE2B 282b1a62ca3a770e709ff31ee7b72ed9f5e102c5f318a765a99421c93881e9ecacfdc5867af494e69dddda40603c8eb6cc8904a7c82fec004a6d5644a28a9f87 SHA512 399dbb818de8a550bd31784a5a7f0adb9d2e35d922ba71f341df81d20fd7e5ebaba5f31db1554caca17919325773f9ec6bb3d5ae99afa5d6eaf5b22142e010ee
-EBUILD cdemu-daemon-3.1.0.ebuild 1110 BLAKE2B 001cea1a051505de440cf792f5c561617312d8b946675623d47a204bc7e4b94ad4fa5e4ed8e2bdcb8d47483a0f33d8c2ffdbb935ffe3f401e90358f45de8d97e SHA512 ee7fdd166e61e9a9e6339629d46ed9c6aa91984e0e2b357958aa40d79c3401cde0d9fdf24942708074a7389b66205b6b38ad156674581cd68f16e89284093d14
 EBUILD cdemu-daemon-3.2.1.ebuild 1149 BLAKE2B c291fafea057bdf318b306757e6b77a54f5b42648bc9c7ef33b9a9f32b0e586f81743dbf3671ac48783dbd3a4cf7607ddaa6a00c0a8d2bde424da762bb876681 SHA512 e24a1b64ca31e69a0deaff694d5c0ebe256242de04636b53c9ff7ee4da208daccad0bf0da97fc3683240d5b5fabe53e0213c585600360147b18371e01f0caf5b
 MISC metadata.xml 455 BLAKE2B 23500677c263c1b8fc4839698bd6f1c08e9821fe4472a0b1725ad4777cfff385531ab6ec966f32a2335571c315b6f886f973451076745aa9fe4297c3cc436a30 SHA512 51c8d87f3c49c81798e4d2e038f911a2e05bfde742f229939f759c6768c6459cf4aa6829981791c57ef766fd447923194d7c14d4ad16951ae505d3b5a73c3479
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.1.0.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.1.0.ebuild
deleted file mode 100644
index e7bdef53c7de..000000000000
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cmake-utils
-
-DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
-KEYWORDS="amd64 ~hppa x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	>=dev-libs/libmirage-${PV}:=
-	>=media-libs/libao-0.8.0:=
-	sys-apps/dbus
-	>=sys-fs/vhba-20130607"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-pkg_postinst() {
-	elog "You will need to load the vhba module to use cdemu devices:"
-	elog " # modprobe vhba"
-	elog "To automatically load the vhba module at boot time, edit your"
-	elog "/etc/conf.d/modules file."
-
-	if [[ -e "${ROOT}etc/conf.d/cdemud" ]]; then
-		elog
-		elog "${PN} no longer installs an init.d service; instead, it is"
-		elog "automatically activated when needed via dbus."
-		elog "You can therefore remove ${ROOT%/}/etc/conf.d/cdemud"
-	fi
-}
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index 1868942a4c12..735b531cf54c 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,6 +1,3 @@
-AUX cdemu-3.0.0-bash-completion-dir.patch 361 BLAKE2B 10202ce49885d8f8a824589a80f050b228e0bdf73ccc823131f36954b525471a3d10cedd791be56aa462e15526daf6ca3f363871930da9f6e94c10060371b7e5 SHA512 55c2fe9abddf87740126e60d6933431cb433b9420f4e94bb24bb9f80bae170632c5e9f7be4b552efcc748aa0eb97b6d65997cbe5f30f6399c4becb2971d92895
-DIST cdemu-client-3.1.0.tar.bz2 43066 BLAKE2B 97413d06b0466e81dce212c9f621fed2a7b83517c8ef3c70ccf182b48093b9c5f805ee40c81bf23bb88089da758876e80f57094c2ec761d42480a401d3b95114 SHA512 62c0650cfd18c1e8edca8c53a343460bf12aae35909251fce24098f16b48a3b30d083d436f494bf23145c06252f943f75413f024c6744696f5ad75cac0a15509
 DIST cdemu-client-3.2.0.tar.bz2 43588 BLAKE2B 0f75bed1ce2a715bb7acf227ebd3da8b80cf6418e28b0d352f294121c1f67acb8c6bab5f5dc5c768150ad46830b823d66f1940887c66225d20b41827c1377d31 SHA512 778f2ecac828ba278d0ded875c7bab2415f1c1acb62f4030eaf161376869939c48bc16a6d660326d9aacd2af745ef9dc9158f922a72aa8ccbd47f05ce41b8cd7
-EBUILD cdemu-3.1.0.ebuild 1148 BLAKE2B bf3b0903ce07572ea60b1f13dbd5e790cbf36d961f5ed0935ac37109beb4f45a0c0b2dc08032e242bd2d4408e3edfa708e3a85c3978bc81eb41fa38dfdb8e2dd SHA512 91cf3c8c2fc460e0de63dd7d9344142153fdf17f74cf70aee220769a6095a460efcace854ef7f5f5d6ff917011d80755ef55c69b99a9c4351bc24435fac97598
 EBUILD cdemu-3.2.0.ebuild 1092 BLAKE2B 9d47ca65c3b626913da1184f452c6a383123e565398de7492e901928730963aff243e146cfb2aa8d078b4125c02d1754bfed50c4df98ebfca7383ac524aea2f4 SHA512 dbe18fbb6042640a698656c2a9b941e95e3479946b06c2d9c2e7fd73c24dbd586aa4e7ce90c0f4fd65d9e3f688348c955a2f259679c1bab356d69a255cfab41d
 MISC metadata.xml 652 BLAKE2B 6750f0d7abcdba746aa4c2e75c3afc47dd9bebbaa3491cdc3cfccf0e629b944266b467779875ff84f4ba08624b5056c0b2f774020535eb93e85cddb9b228a7d9 SHA512 3c37419e3191ab278fdbb03b26ffafb36c6c00edc93566524a08253cb2deddd3ac61184e6bf0e66a0d18aa30b890c13f2c0946d396ee3835131a722e8bb76f93
diff --git a/app-cdr/cdemu/cdemu-3.1.0.ebuild b/app-cdr/cdemu/cdemu-3.1.0.ebuild
deleted file mode 100644
index aa0b79fa1f1c..000000000000
--- a/app-cdr/cdemu/cdemu-3.1.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit bash-completion-r1 cmake-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Command-line tool for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/cdemu-client-${PV}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
-IUSE="+cdemu-daemon"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	>=sys-devel/gettext-0.18"
-
-S=${WORKDIR}/cdemu-client-${PV}
-
-PATCHES=( "${FILESDIR}/${PN}-3.0.0-bash-completion-dir.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	python_fix_shebang src/cdemu
-}
-
-src_configure() {
-	local DOCS=( AUTHORS README )
-	local mycmakeargs=(
-		-DPOST_INSTALL_HOOKS=OFF
-		-DGENTOO_BASHCOMPDIR="$(get_bashcompdir)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch b/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch
deleted file mode 100644
index 270ce7bb2ba8..000000000000
--- a/app-cdr/cdemu/files/cdemu-3.0.0-bash-completion-dir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/cdemu-client/CMakeLists.txt b/cdemu-client/CMakeLists.txt
-index 99b595e..e4f9b6e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -39,7 +39,8 @@ install (
- 
- install (
-     FILES data/cdemu-bash-completion.sh
--    DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/bash_completion.d
-+    DESTINATION ${GENTOO_BASHCOMPDIR}
-+    RENAME cdemu
- )
- 
- install (
diff --git a/app-cdr/dvdisaster/Manifest b/app-cdr/dvdisaster/Manifest
index dd2b7126877a..eca6789c02b9 100644
--- a/app-cdr/dvdisaster/Manifest
+++ b/app-cdr/dvdisaster/Manifest
@@ -1,5 +1,5 @@
 DIST dvdisaster-0.79.5.tar.bz2 8224726 BLAKE2B 443816b550a627ce1998eae71c6524c17105c7253af1e1591eae06055d342afc4457b847c53bfb857793676fc50ca9c5c7f33dafaf541c92e84f149a2987d632 SHA512 8630d4389983307afc3faa5b4256f531ded370f84ec35d4a363853dc7d79e5e15ee0b81bf64f4b88f57fe6176537df8195f83acf23e770d991c700b7408dd1f5
 DIST dvdisaster_0.72.4.orig.tar.bz2 5097738 BLAKE2B 77027d8f5c329525c69acccb0a1c780edc2abaae577473442259bfc3650a78d1443a30793c3fd9bbefe4d542bd7f77edaaf35f11d5285832405cdfeb9e8c225c SHA512 aa0a9f3040d45b16a9117b2b6756d2423cf55db4a00e8314a164f6dc32863cd4e5a5b5ec009a56782aa2afe6031e3a32954014101abc67291428e9edea1b5272
 EBUILD dvdisaster-0.72.4.ebuild 1787 BLAKE2B ad76b0d46ec89a633409c0c058292f6fd3d0f314d193aeda5aa3b002746b36d2e2e5567af667d52acaf75f393e833bc457a59b069ca3244e18aef36bb4c9c23f SHA512 76413a25bf5acfb4258b7dcf554c743ff96810e1abaec34f0436e0d0ef739cca776d35e16228fc380d1cb54ca641d461365e24d71e40619ca88de1f535473fd4
-EBUILD dvdisaster-0.79.5.ebuild 1759 BLAKE2B a3d136f68cfb576873589059cf9ae15361a8139b11f032be731f7749c6ff8b26f7b426120ac8a3c0f6368fe0b2e7a4dbc6e22f09aca42fc66b08987882d538fd SHA512 b3169cdd55823103abe2958c4653a8c9b71d86b8708174eea0c3d2905c68bdc4241f1e13d4b996803b22fc5909167c680b3b6496725a2489b0c37930ae2a9809
+EBUILD dvdisaster-0.79.5.ebuild 1730 BLAKE2B 2c956468351b47e4a085af56b8edd8b9e3eb265bf5d34588e5953f4403c6fe4a76e59957001d4faf3d8941dc58f205bef58e1d0366da3270965b951a7cf2b42c SHA512 611bf97c02003e0fe6f0a428d93257eee9c6c6269e27ab086b19c8680f439549dbd4926ec3739d0aa10320c8890434d56882d4cb08fa7a0149c1e6c37ed3ce8a
 MISC metadata.xml 533 BLAKE2B 9db837ca6d8d637bd17eec18ae9f395d5217ca63455d90d1615bffe4a8cf858aa502b144ff9132853895d995db4776d2c9f2108ac3dcc0d6c451b0ad7d82e91f SHA512 d554061a440ce135ad7a799cc9717885f22d2da11bab7c7a755654e93aefa9404d80ed628d669473c411d3f6710eec6149ff2716075f02b99e4cc53f219a8716
diff --git a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
index dbc782d73d2a..edda38af4a4a 100644
--- a/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
+++ b/app-cdr/dvdisaster/dvdisaster-0.79.5.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils gnome2-utils toolchain-funcs
+EAPI=6
+inherit desktop gnome2-utils toolchain-funcs
 
 DESCRIPTION="Tool for creating error correction data (ecc) for optical media (DVD, CD, BD)"
 HOMEPAGE="http://dvdisaster.net/"
@@ -10,7 +10,7 @@ SRC_URI="http://dvdisaster.net/downloads/${PN}-${PV}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="debug nls"
 
 dvdi_langs="cs de it pt-BR ru sv"
@@ -19,14 +19,17 @@ for dvdi_lang in ${dvdi_langs}; do
 done
 unset dvdi_lang
 
-RDEPEND=">=dev-libs/glib-2.32
+RDEPEND="
+	>=dev-libs/glib-2.32:2
 	nls? ( virtual/libintl )
 	>=x11-libs/gtk+-2.6:2
-	x11-libs/gdk-pixbuf"
+	x11-libs/gdk-pixbuf
+"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	virtual/os-headers
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 src_configure() {
 	./configure \
@@ -46,8 +49,7 @@ src_compile() {
 }
 
 src_install() {
-	emake install
-	dodoc CHANGELOG CREDITS.en README* TODO *HOWTO
+	DOCS="CHANGELOG CREDITS.en README* TODO *HOWTO" default
 
 	newicon contrib/${PN}48.png ${PN}.png
 	make_desktop_entry ${PN} ${PN} ${PN} 'System;Utility'
@@ -64,12 +66,11 @@ src_install() {
 		use l10n_${dvdi_lang} || rm -rf \
 			${dest}/doc/${PF}/${dvdi_lang/-/_} \
 			${dest}/doc/${PF}/CREDITS.${dvdi_lang/-/_} \
-			${dest}/man/${dvdi_lang/-/_}
+			${dest}/man/${dvdi_lang/-/_} || die
 	done
 
-	rm -f "${D}"usr/bin/*-uninstall.sh
+	rm -f "${D}"usr/bin/*-uninstall.sh || die
 }
 
-pkg_preinst() { gnome2_icon_savelist; }
 pkg_postinst() { gnome2_icon_cache_update; }
 pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index 65bd1017f2b6..836ba3c0e014 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -1,5 +1,3 @@
-DIST gcdemu-3.1.0.tar.bz2 48036 BLAKE2B 4fc14f02a7d006556bab31b82b0cb017efec2b7e3f99854567ac0e5b8211c151583e91cf72e180341077a927430688401c4ecb6112bd6758e7288c7a06e2c4ec SHA512 e3e0369cc443bc47befa52989cc2bc5d62e4c9462bb8de1c3dd8563e1240ba7f59fc8cc54aed2e96bdb23a5f6e2fa11ca36073dfa066409f097a1dca619866fc
 DIST gcdemu-3.2.0.tar.bz2 52144 BLAKE2B f349e4482905b0ac59bce5d6af74000e05ff9b7257c7ec8755106ac8fe316d59d19de8b72705fd9cccfa888d170776667ee07fe90311a81e78f251fee85601ee SHA512 61a1775c874c9c3604ce88758039ef80b262463ae180e791eb545811fa2176e4bf07c4dbcd3be5f17d446fdef92317a0ff64ce8d27f26aeaeee9d8134b6a95ea
-EBUILD gcdemu-3.1.0.ebuild 1213 BLAKE2B 8889f4c6277a8c6b736f0eea76b036d7f9534ccca1c5064d60ad800b40a5653159b63a0feee4a8008d296d0052c0020f3df13974432aa83419cdead3d1d14011 SHA512 95f84316bf0a91f2ba54fd5ed53b75d2d967507d1c14c5fb3c1c1950c83660b0efc40874bd1a6c34a1324c0f1a34ea64decd0379965a0609279405fbd40a206e
 EBUILD gcdemu-3.2.0.ebuild 1129 BLAKE2B 4af93d2a9f88cce37cc032ece75a76b4a6462df0a2226fe5c67c5fddc84351374af74b0b00ee76624af339bb847c178b4e1317355142261722e16fbe90d34814 SHA512 8c5494ce53fd55b5fa97d339ed46840eb7d873fd71e14c255588d5fc038f0f4786cacd865151f8e425cfe48cf3208d6b5d479adb0cf283f22f0144178d5b2897
 MISC metadata.xml 455 BLAKE2B 23500677c263c1b8fc4839698bd6f1c08e9821fe4472a0b1725ad4777cfff385531ab6ec966f32a2335571c315b6f886f973451076745aa9fe4297c3cc436a30 SHA512 51c8d87f3c49c81798e4d2e038f911a2e05bfde742f229939f759c6768c6459cf4aa6829981791c57ef766fd447923194d7c14d4ad16951ae505d3b5a73c3479
diff --git a/app-cdr/gcdemu/gcdemu-3.1.0.ebuild b/app-cdr/gcdemu/gcdemu-3.1.0.ebuild
deleted file mode 100644
index ec901b26bc91..000000000000
--- a/app-cdr/gcdemu/gcdemu-3.1.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
-
-DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
-HOMEPAGE="http://cdemu.org/"
-SRC_URI="mirror://sourceforge/cdemu/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# librsvg for pixbuf-loader
-RDEPEND="${PYTHON_DEPS}
-	app-cdr/cdemu-daemon:0/7
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	gnome-base/librsvg:2
-	x11-libs/gdk-pixbuf[introspection]
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]"
-DEPEND="${COMMON_DEPEND}
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang src/gcdemu
-}
-
-src_configure() {
-	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	GNOME2_ECLASS_GLIB_SCHEMAS=1 \
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	GNOME2_ECLASS_GLIB_SCHEMAS=1 \
-	gnome2_schemas_update
-}