[gentoo-commits] repo/gentoo:master commit in: media-video/imagination/files/, media-video/imagination/

[gentoo-commits] repo/gentoo:master commit in: media-video/imagination/files/, media-video/imagination/

[David Seifert]

commit:     c63882d1c4d3502c25bf90c20a69d2fb3e9c4d89
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 13:20:40 2019 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 13:20:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c63882d1

media-video/imagination: Port to EAPI 7

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../imagination-3.0-enable-translations.patch      | 11 +++
 .../files/imagination-3.0-fix-htmldir.patch        | 95 ++++++++++++++++++++++
 media-video/imagination/imagination-3.0-r1.ebuild  | 34 ++++----
 3 files changed, 123 insertions(+), 17 deletions(-)

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 00000000000..d829129d8c7
--- /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 00000000000..14e6f3a508f
--- /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 030aa01ae12..dbf5d971be6 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
 }