bump to 2.0.7.1-r1, 1) EAPI=5, 2) drop qt4-r2, 3) convert to python*-r1 4) update mime database. thanks floppym, kensington

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0xAABEFD55)

2 files changed, 21 insertions, 10 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index f273cd4bee7c..0b99e4ca717e 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-office/lyx
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.303 2014/02/16 00:20:10 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.304 2014/02/16 22:45:11 dlan Exp $
+
+*lyx-2.0.7.1-r1 (16 Feb 2014)
+
+  16 Feb 2014; Yixun Lan <dlan@gentoo.org> -lyx-2.0.7.1.ebuild,
+  +lyx-2.0.7.1-r1.ebuild:
+  bump to 2.0.7.1-r1, 1) EAPI=5, 2) drop qt4-r2, 3) convert to python*-r1 4)
+  update mime database. thanks floppym, kensington
 
 *lyx-2.0.7.1 (16 Feb 2014)
 
diff --git a/app-office/lyx/lyx-2.0.7.1.ebuild b/app-office/lyx/lyx-2.0.7.1-r1.ebuild
index 5f3307f5305d..9b68a2709083 100644
--- a/app-office/lyx/lyx-2.0.7.1.ebuild
+++ b/app-office/lyx/lyx-2.0.7.1-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.7.1.ebuild,v 1.1 2014/02/16 00:20:10 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-2.0.7.1-r1.ebuild,v 1.1 2014/02/16 22:45:11 dlan Exp $
 
-EAPI=3
+EAPI=5
 
-PYTHON_DEPEND="2"
-
-inherit gnome2-utils qt4-r2 eutils flag-o-matic font python toolchain-funcs
+PYTHON_COMPAT=( python{2_6,2_7} )
+inherit gnome2-utils eutils fdo-mime flag-o-matic font python-single-r1 toolchain-funcs
 
 MY_P="${P/_}"
 
@@ -29,9 +28,12 @@ for X in ${LANGS}; do
 	IUSE="${IUSE} linguas_${X}"
 done
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 COMMONDEPEND="dev-qt/qtgui:4
 	dev-qt/qtcore:4
-	>=dev-libs/boost-1.34"
+	>=dev-libs/boost-1.34
+	${PYTHON_DEPS}"
 
 RDEPEND="${COMMONDEPEND}
 	dev-texlive/texlive-fontsextra
@@ -82,14 +84,14 @@ DEPEND="${COMMONDEPEND}
 	nls? ( sys-devel/gettext )"
 
 pkg_setup() {
-	python_set_active_version 2
+	python-single-r1_pkg_setup
 	font_pkg_setup
 }
 
 src_prepare() {
 	epatch "${FILESDIR}"/2.0-python.patch
 	echo "#!/bin/sh" > config/py-compile
-	sed "s:python -tt:$(PYTHON) -tt:g" -i lib/configure.py || die
+	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
 }
 
 src_configure() {
@@ -135,7 +137,7 @@ src_install() {
 	# fonts needed for proper math display, see also bug #15629
 	font_src_install
 
-	python_convert_shebangs -r 2 "${ED}"/usr/share/${PN}
+	python_fix_shebang "${ED}"/usr/share/${PN}
 
 	if use hunspell ; then
 		dosym /usr/share/myspell /usr/share/lyx/dicts
@@ -150,6 +152,7 @@ pkg_preinst() {
 pkg_postinst() {
 	font_pkg_postinst
 	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
 
 	# fix for bug 91108
 	if use latex ; then
@@ -170,6 +173,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
 
 	if use latex ; then
 		texhash