[gentoo-commits] repo/gentoo:master commit in: media-libs/libkate/, media-libs/libkate/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libkate/, media-libs/libkate/files/

[Michał Górny]

commit:     f8bbf15c2299d13475a3e72d70f95830d9721bc1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 21 09:02:32 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 09:29:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8bbf15c

media-libs/libkate: python-single-r1, EAPI=6, pt. 2

 .../libkate/files/libkate-0.3.7-libpng14.patch     |  4 +-
 media-libs/libkate/libkate-0.3.7-r1.ebuild         | 54 ++++++++++++++++++++
 media-libs/libkate/libkate-0.3.7.ebuild            | 58 ----------------------
 3 files changed, 56 insertions(+), 60 deletions(-)

diff --git a/media-libs/libkate/files/libkate-0.3.7-libpng14.patch b/media-libs/libkate/files/libkate-0.3.7-libpng14.patch
index e93ac757b1..cb4e3474a6 100644
--- a/media-libs/libkate/files/libkate-0.3.7-libpng14.patch
+++ b/media-libs/libkate/files/libkate-0.3.7-libpng14.patch
@@ -1,7 +1,7 @@
 http://code.google.com/p/libkate/issues/detail?id=15
 
---- tools/kpng.c
-+++ tools/kpng.c
+--- a/tools/kpng.c
++++ b/tools/kpng.c
 @@ -179,13 +179,13 @@
      }
    }

diff --git a/media-libs/libkate/libkate-0.3.7-r1.ebuild b/media-libs/libkate/libkate-0.3.7-r1.ebuild
new file mode 100644
index 0000000000..7e133b28d3
--- /dev/null
+++ b/media-libs/libkate/libkate-0.3.7-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Codec for karaoke and text encapsulation for Ogg"
+HOMEPAGE="https://code.google.com/p/libkate/"
+SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="doc wxwidgets"
+
+COMMON_DEPEND="media-libs/libogg:=
+	media-libs/libpng:0="
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-devel/flex
+	sys-devel/bison
+	doc? ( app-doc/doxygen )"
+RDEPEND="${COMMON_DEPEND}
+	wxwidgets? (
+		${PYTHON_DEPS}
+		=dev-python/wxpython-2.8*[${PYTHON_USEDEP}]
+		media-libs/liboggz )"
+
+REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libpng14.patch
+)
+
+pkg_setup() {
+	use wxwidgets && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	if ! use wxwidgets; then
+		sed -i -e "s/HAVE_PYTHON=yes/HAVE_PYTHON=no/" configure || die
+	fi
+
+	econf $(use_enable doc)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README
+	use wxwidgets && python_fix_shebang "${D}"
+}

diff --git a/media-libs/libkate/libkate-0.3.7.ebuild b/media-libs/libkate/libkate-0.3.7.ebuild
deleted file mode 100644
index 706fbc12bc..0000000000
--- a/media-libs/libkate/libkate-0.3.7.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-PYTHON_DEPEND="wxwidgets? 2"
-
-inherit eutils python
-
-DESCRIPTION="Codec for karaoke and text encapsulation for Ogg"
-HOMEPAGE="https://code.google.com/p/libkate/"
-SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc wxwidgets"
-
-COMMON_DEPEND="media-libs/libogg
-	media-libs/libpng"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	sys-devel/bison
-	doc? ( app-doc/doxygen )"
-RDEPEND="${COMMON_DEPEND}
-	wxwidgets? ( =dev-python/wxpython-2.8* media-libs/liboggz )"
-
-pkg_setup() {
-	if use wxwidgets; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	use wxwidgets && python_clean_py-compile_files
-	epatch "${FILESDIR}"/${P}-libpng14.patch
-}
-
-src_configure() {
-	use wxwidgets || sed -i -e "s/HAVE_PYTHON=yes/HAVE_PYTHON=no/" configure
-	econf $(use_enable doc) --docdir=/usr/share/doc/${PF}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README
-	use wxwidgets && python_convert_shebangs -r 2 "${D}"
-}
-
-pkg_postinst() {
-	use wxwidgets && python_mod_optimize kdj
-}
-
-pkg_postrm() {
-	use wxwidgets && python_mod_cleanup kdj
-}