gentoo resync : 15.12.2019

4 files changed, 126 insertions, 18 deletions

diff --git a/media-video/imagination/Manifest b/media-video/imagination/Manifest
index cf4b095d7477..a724e728a197 100644
--- a/media-video/imagination/Manifest
+++ b/media-video/imagination/Manifest
@@ -1,4 +1,6 @@
 AUX imagination-3.0-cflags.patch 834 BLAKE2B 7f3a995282a4e6fb0c505a6ad6fd1cb813a550c3a43ac131498ab38487a9c286b19518898f87cd11b51bf846a409ce15890c08b4cd466fe76f76f83e89d4bf38 SHA512 0afdeb7b3b4b25c08180eabe74631d3689a7eeff8a4f8ca930d6c093d75c29ae8e6c31fc82dcac65ba4dd5efaff21e64114ef8e7218e379845c8dd72aaa93369
+AUX imagination-3.0-enable-translations.patch 231 BLAKE2B 210deeb69fdc4d9236519f0eec6571789236c4ff2e8a9379312a11f0c8792e3d1ec4e078d805c91ebc21265e5fa90737ef2d3643904829425712da52cd77a5c8 SHA512 5c086aaf8fc28494250c08655b4f6a05f16efd853d42c47cef503e2e846bec2665a6ec339660aad63de47d094aa29cafddcb4ac0e46e24f2fd27660fd2dc417a
+AUX imagination-3.0-fix-htmldir.patch 2198 BLAKE2B bca0f907f386ebde1ec46db6c5c5a7952557fa3ef9a16984f133c175c5ee70897bfa88204c00250f9c243dc5e157ef370478a1fe94e53fb03a9a4ffecdb31b24 SHA512 e7537354418f71ffa50666a197cc9dc46a3b4a8441ee75bd3b31b1e8b5636e7f304b8b9df6a1df4012ac31b9538a2c73a26b888e02850c2d6fbda8ae1531ffad
 DIST imagination-3.0.tar.gz 3327784 BLAKE2B 0322a68ab6c44e2b0d47bb89de6522249ca3507808ee3733f2f195923c4269591c2225271ef27b24c648cb6784a5c85bd6ca97142072e52641bdf7f80b9a9bc7 SHA512 0780ab572d8f4fc1e728befef79f974169438d723f67205e677c06cbe0dac06745868936e7d3eab5fc42728902f6b06eb5f9d7e836532c289df005ddab2104b8
-EBUILD imagination-3.0-r1.ebuild 877 BLAKE2B aba9416246dd074a8d0f3266e1e5c3813209d8902ed4a133b92bce3b6ac2ffc55b90418e79fe7c06680edb07a8f6af1c5221cffd9d49506873e35fc47c12d2a3 SHA512 bd905ef216979793e05121bb0fefff215d1e25cfffb8bfffcb13e255ef31e410bc912f0f92b12a8c39c8dcf89781eca5e1fb8751d28b57ef0d828bf8c140f952
+EBUILD imagination-3.0-r1.ebuild 755 BLAKE2B b891b9d212085e971cf000ef79499c0db65da7d511c316ed62d12efd2ce0561de434ed0938b09601cf91c58e3ed17b81edb25d650d405c847939fcf77fa59d39 SHA512 5e4369fea43a47dc348d03c53f26d34bd5bfcb792f0cf4671ba3399827ac82428b8d908a4146e26b2c46c567979bd8cbb4dea93d7687b5c768bb933c932c529f
 MISC metadata.xml 248 BLAKE2B 3ab98ae1a4ef9f5b48116280f559a78a05aff568f1464a23c3ffd8c25e0f788481c046c094d2b76a8cb8e9198c1caadc4234efcda268ec4517d53f4d86df9838 SHA512 edb9d1136a99fbf3a5340bcd6957639bbd0b75a8772a319f60ce6505404cacd90d4fc6aabd06c3529c87f7471a3dce7f96a6e11b2fe1a6c6913164bad7ac04fd
diff --git a/media-video/imagination/files/imagination-3.0-enable-translations.patch b/media-video/imagination/files/imagination-3.0-enable-translations.patch
new file mode 100644
index 000000000000..d829129d8c77
--- /dev/null
+++ b/media-video/imagination/files/imagination-3.0-enable-translations.patch
@@ -0,0 +1,11 @@
+--- a/src/support.h
++++ b/src/support.h
+@@ -20,7 +20,7 @@
+ #ifndef __IMAGINATION_SUPPORT_H
+ #define __IMAGINATION_SUPPORT_H
+ 
+-#define PLUGINS_INSTALLED 0
++#define PLUGINS_INSTALLED 1
+ 
+ #ifdef HAVE_CONFIG_H
+ #  include <config.h>
diff --git a/media-video/imagination/files/imagination-3.0-fix-htmldir.patch b/media-video/imagination/files/imagination-3.0-fix-htmldir.patch
new file mode 100644
index 000000000000..14e6f3a508fa
--- /dev/null
+++ b/media-video/imagination/files/imagination-3.0-fix-htmldir.patch
@@ -0,0 +1,95 @@
+--- a/doc/en/images/Makefile.am
++++ b/doc/en/images/Makefile.am
+@@ -1,6 +1,6 @@
+ # $Id$
+ 
+-imagesdir = $(datadir)/doc/imagination/html/en/images
++imagesdir = $(htmldir)/en/images
+ images_DATA = \
+ 				imagination_window.png \
+ 				side_panel_video.png   \
+--- a/doc/en/Makefile.am
++++ b/doc/en/Makefile.am
+@@ -3,7 +3,7 @@
+ SUBDIRS =								\
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/imagination/html/en
++TARGET_DIR = $(htmldir)/en
+ STYLESHEET = ../imagination.xsl
+ DOCUMENT = imagination.xml
+ 
+--- a/doc/es/images/Makefile.am
++++ b/doc/es/images/Makefile.am
+@@ -1,6 +1,6 @@
+ # $Id$
+ 
+-imagesdir = $(datadir)/doc/imagination/html/es/images
++imagesdir = $(htmldir)/es/images
+ images_DATA = \
+ 				imagination_window.png \
+ 				side_panel_video.png   \
+--- a/doc/es/Makefile.am
++++ b/doc/es/Makefile.am
+@@ -3,7 +3,7 @@
+ SUBDIRS =								\
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/imagination/html/es
++TARGET_DIR = $(htmldir)/es
+ STYLESHEET = ../imagination.xsl
+ DOCUMENT = imagination.xml
+ 
+--- a/doc/fr/images/Makefile.am
++++ b/doc/fr/images/Makefile.am
+@@ -1,6 +1,6 @@
+ # $Id$
+ 
+-imagesdir = $(datadir)/doc/imagination/html/fr/images
++imagesdir = $(htmldir)/fr/images
+ images_DATA = \
+ 				imagination_window.png \
+ 				side_panel_video.png   \
+--- a/doc/fr/Makefile.am
++++ b/doc/fr/Makefile.am
+@@ -3,7 +3,7 @@
+ SUBDIRS =								\
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/imagination/html/fr
++TARGET_DIR = $(htmldir)/fr
+ STYLESHEET = ../imagination.xsl
+ DOCUMENT = imagination.xml
+ 
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,7 +1,7 @@
+ SUBDIRS =							\
+ 	en es fr pt_BR
+ 
+-cssdir = $(datadir)/doc/imagination/html
++cssdir = $(htmldir)
+ css_DATA =							\
+ 	imagination.css
+ 	
+--- a/doc/pt_BR/images/Makefile.am
++++ b/doc/pt_BR/images/Makefile.am
+@@ -1,6 +1,6 @@
+ # $Id$
+ 
+-imagesdir = $(datadir)/doc/imagination/html/pt_BR/images
++imagesdir = $(htmldir)/pt_BR/images
+ images_DATA = \
+ 				imagination_window.png \
+ 				side_panel_video.png   \
+--- a/doc/pt_BR/Makefile.am
++++ b/doc/pt_BR/Makefile.am
+@@ -3,7 +3,7 @@
+ SUBDIRS =								\
+ 	images
+ 
+-TARGET_DIR = $(datadir)/doc/imagination/html/pt_BR
++TARGET_DIR = $(htmldir)/pt_BR
+ STYLESHEET = ../imagination.xsl
+ DOCUMENT = imagination.xml
+ 
diff --git a/media-video/imagination/imagination-3.0-r1.ebuild b/media-video/imagination/imagination-3.0-r1.ebuild
index 030aa01ae125..dbf5d971be68 100644
--- a/media-video/imagination/imagination-3.0-r1.ebuild
+++ b/media-video/imagination/imagination-3.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit autotools eutils
+inherit autotools desktop
 
 DESCRIPTION="Simple DVD slideshow maker"
 HOMEPAGE="http://imagination.sourceforge.net/"
@@ -13,29 +13,29 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="x11-libs/gtk+:2
-	media-sound/sox"
+DEPEND="
+	media-sound/sox:=
+	x11-libs/cairo:=
+	x11-libs/gtk+:2"
 RDEPEND="${DEPEND}
 	virtual/ffmpeg"
 
-LANGS="cs de en_GB fr it pt_BR sv zh_CN zh_TW"
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-enable-translations.patch
+	"${FILESDIR}"/${P}-fix-htmldir.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
-	# enable translations. Bug #380011
-	sed -i -e "/#define PLUGINS_INSTALLED/s:0:1:" "${S}"/src/support.h || die
-	rm "${S}"/po/LINGUAS
-	for x in ${LANGS}; do
-		if ! has ${x} ${LINGUAS}; then
-			rm "${S}"/po/${x}.po || die
-		else
-			echo -n "${x} " >> "${S}"/po/LINGUAS
-		fi
-	done
+	default
+	mv configure.{in,ac} || die
 	eautoreconf
 }
 
 src_install() {
 	default
 	doicon icons/48x48/${PN}.png
+
+	# only plugins
+	find "${D}" -name '*.la' -delete || die
 }