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

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

3 files changed, 36 insertions, 25 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/Manifest b/app-office/lyx/Manifest
index 118bb57795de..b49848cc8f3e 100644
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@@ -12,23 +12,23 @@ EBUILD lyx-1.6.10.ebuild 4120 SHA256 445c2becd493409edac0a36d3d9d55a6e82cb2cd3a6
 EBUILD lyx-2.0.5.1-r1.ebuild 4386 SHA256 c3867c623b87d4172f569c98bfd911700d135a86ae0d7e9ada1142181289c06a SHA512 2c5db5cf0b1216c5d01a184e37e3e01873fe3d1cf2477369ebefcb9fd68a45ccd8f977750798617144a15907fed0fa807da16158cc92a99f92bda45d19c08b22 WHIRLPOOL 197566484a4200fd518f20ad540d0106c6801a3a80595469d3cb633717d31919313a2608973fd5e3044d3376ea95ef3369d3a4e4a926746f35a10e0ca026a8c9
 EBUILD lyx-2.0.5.1.ebuild 4471 SHA256 3d53dc29abe6fb7e96e84a465575ac72203e9b3dc996c6aafb8678ad44f1a134 SHA512 847c6b74eb10cb3fa03aeed33ec9abad7cf60b93edc00a01088240167da6294453b90dd1a8cb8fe83bd3e6a3a2fd809ab8d50f6371f7f9a4e4ce7e5c1eccd1d3 WHIRLPOOL e6adc73392acaa87a18e478dcefe9eb7d003fbdfac20a5256ea30288f9c0baf6aec78739b9f5d137afe0a07d7eef47e88fecad40721441ad7983689974def2c9
 EBUILD lyx-2.0.6.ebuild 4453 SHA256 bfff68cf081d1e2a7b47f6074cd30fe8fbd5b3c9d15b87c139e74f1cf50a8c60 SHA512 75d5c6886265dd6463186ca2a1a407c0e5994ea38cb6b7734c34d686f6cf41c26b109e308eaa0d4a16c3256546a259c8ee38fecd332bf377dff33a5d12cc2892 WHIRLPOOL c75712601b5d15c8a5e7be86247790de9a22d01eab68ecde8ff0c4e2ba7d2fc7b91fa69895b40d954676afd76a37bcfe8b4fac3e3455c7f38801c3a967a8fb7f
-EBUILD lyx-2.0.7.1.ebuild 4458 SHA256 d0eb9f0e9d0aa8f8fe02020d7bde4cf94fd89ff1772d945b29b8d934aa7d2a77 SHA512 853980ecbabc1a8d4fe19f3be72553fb7868395d58b143446b0f135c3054293877fc286568126d7643488ef5ea182bb9e3f893de931bd808eb7626398d95106e WHIRLPOOL e8ce7de273d0b9a3daa37d68e34d0f6ef918c5a40387c19a882a66fe2f797b629d70d5dd73525701983fe5cada0ca9fc4171d40ad365561bb57e7dce521215c4
-MISC ChangeLog 40535 SHA256 b7b04ce2b8cd68684d3473813dded2968cf5d27eac9c9b9f0d2d602d659ae5cd SHA512 2e091fc65a197276b436c2fe9c4e585d16714dc5d1198eb3f7292fa1bef16eee2dc4d73c587ded6b75b36f93829c81db89ae9aa5dcd48795236cee0c0e9b8ad9 WHIRLPOOL 4ff909debc536c1ab3a9a5c85801b4ca4913f8f593deea764251af03ccce28566890a9ab3415214765d5292a56807b014ab75b66ca89cfafc4a4cf9d883a09ef
+EBUILD lyx-2.0.7.1-r1.ebuild 4601 SHA256 ae1de034d09b0715c8afc66188f6a69aae639dac8947f35943a0e425ba187f91 SHA512 fb525b57fa6f406c8da25ff13e0f72b14873231e19c1c1a1ec10748dda6725f805b5436bff008989638039bf7bb52e500479727fa6f257a817e9f54bad09740c WHIRLPOOL 7fb1fd2431dd4def6c53a3fa645d2689475edef682ab58e2df51c8ba9b72c05c88788d7bf944339e4dcf3e206122886a520bc5fd9294fca53a43becc295fa86b
+MISC ChangeLog 40785 SHA256 537d358662b51bcf744f75897f4724c776e96ac0613d947f761bb691083ff09a SHA512 2282bd2bf86cb7887955439e0eac692268776d9744e9262f246ee4fc80c4908486aea4cd936916781f54fbeede81347844e9c4f1030dc176c308c1baec75e03b WHIRLPOOL 81651d9d72f0cdd499dd04a348b47d050a3c8dc3ad6ea0ff57b4d83fe11b51a9e3d589fcdb7ad5b4cfbe13fe25bc99130212fd4a015ca37ee655da47051f04f2
 MISC metadata.xml 1603 SHA256 7dbbadab2a3c848fa945131763e9827be59df650a0e959e0da5334277d57affe SHA512 770f392893880e0ff8fd296d4ab4956832251e50302412fc07757cf4fa9b344e36670bc6ee8feba8ea367c8821c317e3cf68143335d92e7d0a6f90c55ae66bbd WHIRLPOOL 38df97b32e3b99aaf02fc043402428931f6d54a03f264b158b0fdf16d3cc5993384f72b4d2df6078b2ecd81e75da6cbb1616116114e8063098e601c9f19bfbc3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTAARRAAoJEJIMDbyqvv1VAq0P/A62Psb32vwjJRdiH1vwvNYO
-euJfdqLDe9WuipQx6EAkthPfMqirY8uM3cgHkUy1GNeWnkoe2yYBWOfHFpmNQamu
-XnJnapkE+W6HUbrI09IBVerx5D0+v645drV8o0A9VWhActpZrsrIHAq5u4BdDpDn
-/7thiTZ7ZYebHoy13lnhjQSOlctFCotmQjlHw1ITQ0QTbJ6NXDyiGRoiDXOGH9oi
-W3Jr/d0aaJBFWsXpDqt9WZDSlPZHL3+2FNv+abIStnr7JYCW+OiumiKnciQ3PznU
-WH6ucsqemFQZ4M5DX3YcTnG0yNdoCOFur5EYmg5SX3QpKR4/HPB8NIDyx4DR62Bf
-GOZxTQuDOBSrURKHqrfxtW+p/uLm9KoqtqD3AIhkOc7ZEW3DuyUK8o7Lm8bbuKvH
-tKEbYmeurhAHiWSf6RJMD7fEGf4vU6x+uUUvZVofx1y/qLdQmxg/tgUJEU+7j/tP
-l0QV8JmPxn+vVqHmHenYjaSftXHaOKCue4gagQ3e18RkDhIpsMft1ecp2WQGzkV0
-rhDTu4mN18QL0CjjCyqIRnLaEHYOoazYk+6e/0RAtgiJw39oY6tqPOWa7WSg13ob
-AJ0RhpqKH8I7XPRBOKxf6MV5crrHnz5aepr3v7odZ88TH9bybWI8D7iI8efb3wGO
-+xx2ooIYS92lJI27BpT/
-=XAYx
+iQIcBAEBCAAGBQJTAT+GAAoJEJIMDbyqvv1VhxcQAM6n5H7waqCJkoAM1F/vOzaU
+U9b0mof5RzBIMP2Fw/3oiDlzp2ecT8WCq7ZW9G44woJYUcvvTF6NUrT7WGpUrBsj
+YsKuslhWn8Me5Dl4HjAd+hA4oEapjAY+cybj6Y25BHGAEqAd99soFYXdkkYOk2X6
+fyV4sQRzBhwgLMKjWCMImd8QVz/eAYNovI6TTwdssTTJrvkBbU/gusxtnDckL4oB
+6ehxEWWdN5i/pZ/pxRYFcaQGTYJcj2R9iP+HMh/CaHCQ+ysuLH14ZEeVBOHNUV+n
+yxoSZlxRIBAe/CNtuCwBweFXF1OpFT6Kg3Nzp35pMuAPvO3SVkH9bf2SBVIo7l7z
+IXvHXZEXLQJiTY9m9sMpQISKnqSm6nIANJ1BGVGib/k9ALf3a9lEvdc6sQ/BL0fr
+WCo6Y2YK7WEQseG2yr2J2qkvs67bNoGiVZ53hWS0yDdTuZpG+9jxZOFZKvVV5xe4
+cIdxvXulmfnHQB7Ka/8a+srEJI68PSveqypMHee+gjckojmw9sX4tYcvS0L90FdZ
+298WksQcwOflR4p//uRXqp8tMiV1ks4GmfaPFU1h1T01WdM/CRrcBRETGrtqlIuL
+nbN5PrcEhT/XjQjlUt8pUtLt5MXJ/dmiXJ7Bx86rS7C1jXOMw5IiH/UYpg4XdZT1
+lawzWlZU9w2yY+c2S11j
+=+gXL
 -----END PGP SIGNATURE-----
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