sci-misc/mendeleydesktop: Add missing python dependency and compatibility handling, #539152

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 41 insertions, 25 deletions

diff --git a/sci-misc/mendeleydesktop/ChangeLog b/sci-misc/mendeleydesktop/ChangeLog
index afe6d5e2189e..eee90af8874f 100644
--- a/sci-misc/mendeleydesktop/ChangeLog
+++ b/sci-misc/mendeleydesktop/ChangeLog
@@ -1,10 +1,10 @@
 # ChangeLog for sci-misc/mendeleydesktop
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/ChangeLog,v 1.21 2015/02/03 12:35:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/ChangeLog,v 1.22 2015/02/07 11:07:44 jlec Exp $
 
-  03 Feb 2015; Justin Lecher <jlec@gentoo.org> -mendeleydesktop-1.13.1.ebuild,
-  +mendeleydesktop-1.13.3.ebuild:
-  Version BUmp
+  07 Feb 2015; Justin Lecher <jlec@gentoo.org> mendeleydesktop-1.13.3.ebuild,
+  metadata.xml:
+  Add missing python dependency and compatibility handling, #539152
 
 *mendeleydesktop-1.13.3 (03 Feb 2015)
 
diff --git a/sci-misc/mendeleydesktop/Manifest b/sci-misc/mendeleydesktop/Manifest
index 494ddac5167d..5740c2d3bc20 100644
--- a/sci-misc/mendeleydesktop/Manifest
+++ b/sci-misc/mendeleydesktop/Manifest
@@ -5,25 +5,25 @@ AUX mendeleydesktop 83 SHA256 7c715d67b8ebfc6556ef21b1cd214596823342718a712bc889
 AUX mendeleydesktop-fix-python3.patch 749 SHA256 0d9f6273ea290403155e36556f425f9d21e72a8ae076576613ecf1f2c4715037 SHA512 7df514790557dcd230453cf9934047a9ed0f34fb2af985442e42b7690ef8338fd9d3bf24ad4367bfa759602600dcb678fa70ae07b930b779478beed48de6f3eb WHIRLPOOL 3f99e6815d1abdeba728a3f610c3558a9a96ad825970eeffbf86e527ef3fe7ab9738ecb2efb083d98de0846351f30016c2519578ddb52531fec15c2c1958fdf6
 DIST mendeleydesktop-1.13.3-linux-i486.tar.bz2 32928361 SHA256 b11c6e3d7414d769640b34da584653b1f306959ebd4d89f4c75c980891b4f7ea SHA512 d752a650e81f44049e2d8374ddc08b820d07248131ac7525c5419d6199504fcb28e74cf3652202e3dee427de2a2206049aa8d5994c5fc75b2f76333182d245fd WHIRLPOOL 1294a8ebd3326b6bcd64e7294633a6996a817b01011b39be2f1f44be552fbab051d4cb013126bb810d6ad789c55f0afc7d2eb09d4667cb8e465532cd044d8b1c
 DIST mendeleydesktop-1.13.3-linux-x86_64.tar.bz2 32658166 SHA256 70c413f5dec0fb49231acb39abb423f3f9b6948b06cf070d27db519e47fe2146 SHA512 ee54f4b2835f8b70d564bdcdc9a69e4cbe8b99e38be605063033922667ff40d6ebd03fa1598b9a98ac6988e3758f6f9b0ce1efd9791300ed62fee8866a2deaff WHIRLPOOL 7c0b53692419763db07a6d4c6bc837f1d75a3b06dcaafb112c226d939427a45f4658824f0d22d0271e235b054756d577541a5f3ba8d571680bf5088a790ab89d
-EBUILD mendeleydesktop-1.13.3.ebuild 2655 SHA256 72e9ec00b8baeb34433c6ea697d165c37f07226bb7c40ed208117bda5cd79c7c SHA512 f80058b645dc87178185b50598bd1dc3142e88a1ae35cb89e3b1f8aa528fe5bde22d2ee3b61aed561dbe83f73f68322ffa645ffed99347937695f16ac9a2d0b0 WHIRLPOOL 10dd42dcc002a0a52a4022f450b30b6d2826c329d4dc48103a74ad47b3511b218a3a5fd7944dfd70946755cdf75d8b9790182ed4c06d4a1fd31358ba1e0a3b49
-MISC ChangeLog 3785 SHA256 2d90626a030747142819dfc1d06bd78c8d1a44158dbd4efef04ba86ebbd1a7ea SHA512 84a1f0a9629ffddb16ac213c6c6a7375b3bedf5c0ec7610f892d590589e565b2b5c68dd3143cb8d6b885270a938ea3e58f9e4b414fb9b96a9b242dd10a0223af WHIRLPOOL 2fee7f8c125c2c94215b1edcb40459328d64cd0998d86bb781528cc8d94875e8f10b82ae95b90772089be01f5c4879b8ca780765ec55f46bcda3ead1abec24ad
-MISC metadata.xml 554 SHA256 cf8a90d3d49fc11617494d006d171b91d5b383462d60cd7a0ee9efde001f71f4 SHA512 83449c01c91aafa448212898e4e8eb0a4030e1d7abee3a61690d7b707e2bf350613611098a6a9415550ff437f8e6e5440dfbe5ea9112930878fb02e144514693 WHIRLPOOL 77c2dcc37d2e6609ad2a26d5af188811b5717ff3f6af2f2627c638d2b1f322e907052e507522098573787efb3a004c89e328ba11c669fd182810f101fa472095
+EBUILD mendeleydesktop-1.13.3.ebuild 2803 SHA256 b849a8c834067bb53ec382aef3059b6cc6534b723ddcee824d443dcc6e797e78 SHA512 603df404528ff29a798dcba035db814115a87c83b9886bb43115c7073c84dcdf5922e1f92165a05a0a0ee8edaeea116e70d5773451aa9f5ca926b93f6d589de2 WHIRLPOOL 3bb75e0059ec859dd2bdbcc6fe155981c32f6151744de7627bb7a9b05cf14d310887a0ea79ea4409a2e71520a448c1b0ea008d3308f3a8c1d94e3cacf3795aa8
+MISC ChangeLog 3819 SHA256 72698531c8ca600fd2048e0b203bc08675e973345824a5565f17fd8ebb67d65d SHA512 1cfdac25a42c7953f14981ed5dff19ce5a50bc6c77f1977b42a0ef595336d22372511ca271579846881b4a66b43adc2f9d9200d1a2dbcd8ddf63d177707c3af1 WHIRLPOOL e693a42f2b7dd8d8b71a25a2eae3948cc28ca4b1581d70c91a3a3688fedefd7cd71f13938f80d316adc889470963ccc5f68f3e4a2ffcc0bfed70f84e5db2c731
+MISC metadata.xml 806 SHA256 6435de9cbf55bbcd14f7aeee292d7208ce6da414e3c109966d078176c5024d9b SHA512 ab185456f20b1d15683bfda3dfafa65924fd55ec7a775dc48b348ef2d8e39c4792a6981a2deca0b1f6a5fcdd83771300281513065af8372cee875b3603ab1ef7 WHIRLPOOL 2af1723e513bd9ab10c4dfbb1842f5ac29d42b4c7d27d94f4aba4a9a4aa4361d7b6cd987e1ba3434fc312b9ed40d3436786d3e4eb2ee265669603880216a86e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJU0MCQXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJU1fMNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirArsP/Ry72PFFLpJd6Ls0JrM0s2DD
-0AIqUBIzAsnR+QCGLTHTtq5TEJ9Tvlve+XCnZQbM70hrsj1WQvxE3gQRhgcfai2H
-iC20lwlV1bCxTqWvT0nDWLj8xKJmCZWJSoJ8Kh/qZ4EXGB4YKnxGQ7h7pnnbaCiE
-PMHbMsPwgg3AWxNkvrRyOztwwgCn1E6kqtiqU/VJK9xlLtnQH35T0Sqp1HZVOZzN
-52tihdccvPvpUzMcXPs5nQ4bm5AzkyJkPlVNip1F9QZG7Bmd9+lkEoElit8N8e4o
-u5SDzI+KjK5Avv+COV7SFI4cKmmpw6JZPNOfPECOCmMcLYTpGtSA0LpYY+KkAJbF
-XfNORcTrD2K6Q4oGbu9JkoFKC7Fy3IQpldtm3po8qsqz5NaCqwChg0sGb2I6u0jg
-OMVYgOlzQ9ju/sNwVn3lNJYnx6NJbRZfHVPgUMBS5an5TXbVSaICuaGTHj8WgP8+
-qYJX6b7GEUCbic2uq7rIsFmd9P5URf8uXSqFy14lt9eKxgkzbcbcQCEXC7DCMDbD
-WOSSdA0eTRrDCW/UnDzG12/Jk4EKZtfXep0at+lp+wotizFLKQ7V4HL32p6hDQFA
-9wMOJj/9XSzFX9FP9v8o+8IkoBPY0pa5a2VsyUooooz6Cyl/ouKyPw9Qm3rMKMKX
-aNi8p8YXbOwdUUHI3kn+
-=l9HB
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir0XAP/jue4dIof7GX7+us7gHKLif8
+xw1F2XZulaEfTfesz6GhHE8DOkGIwYBh0E4acjqnzVgYMlDdOmBUFSasr8Jz+oKw
+tUBG3GD0ehCm+Yx8oIP2ufGDXn72UZ32ecRPGGWFOYefR/W7GhUuGqlX+RIe8rpu
+9M1H0TuBQ7yh8w7cBFcdGTgcYNy85NVFcBCBQ5Sh14NlZKJrj+wVljcTC4lrkW8T
+3+wztjYAkPBU8Mz3uOlbV8EIY3lwlpoLms63dNuqmyAXcjv85zlx8Qq2Smk+DIrm
+DrqG3JxLe/o/+bxXUuldGqpqwnCgftvYGTXrPjnr3bkLvTpyH2MtIh373xVM/2fM
+KS9Kzvz0yI47KZK2ln4X1L4pqLQYUz6C33dkWAoNYBGJ91iv7pIOH8pmsyO8mAe9
+Ef3d16k8dJhf2GTOPp52jPEI9cYg1/jdbqopyIqQIv6DxFitc7CB2px1scikOPlt
+goRiZmACxKhIN7KLb3Kldtfsj18U6ZN/fWjJAITNxXu7T0JpqDVSLkZC3u2o3DUS
+AwSosEitB3W7PJOpvWeh2Ajv/dC9OMpi3fLWwX3qtuKgPk27eVrCQyDOIaR8TjFh
+5MBvKA303aaYwk+JOFKB8ZByyWJE9HiI+eLWL0NutJYSIMMnnqRyVxO6hPmFZin7
+Wsjjx6H1dHe2LJLXD43m
+=vYKL
 -----END PGP SIGNATURE-----
diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.13.3.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.13.3.ebuild
index aa2a2fb5ece6..dca323ed6cc3 100644
--- a/sci-misc/mendeleydesktop/mendeleydesktop-1.13.3.ebuild
+++ b/sci-misc/mendeleydesktop/mendeleydesktop-1.13.3.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/mendeleydesktop-1.13.3.ebuild,v 1.1 2015/02/03 12:35:27 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/mendeleydesktop-1.13.3.ebuild,v 1.2 2015/02/07 11:07:44 jlec Exp $
 
 EAPI=5
 
-inherit eutils fdo-mime multilib
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils fdo-mime multilib python-single-r1
 
 MY_P_AMD64="${P}-linux-x86_64"
 MY_P_X86="${P}-linux-i486"
@@ -21,15 +23,19 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
 RESTRICT="fetch"
 
 DEPEND=""
-RDEPEND="
+RDEPEND="${PYTHON_DEPS}
 	dev-qt/qtcore:4
 	dev-qt/qtgui:4
 	dev-qt/qtsvg:4
 	dev-qt/qtwebkit:4
-	dev-qt/qtxmlpatterns:4"
+	dev-qt/qtxmlpatterns:4
+	x11-libs/libX11
+	"
 
 QA_PREBUILT="/opt/mendeleydesktop/.*"
 
@@ -84,6 +90,7 @@ src_install() {
 	dodoc share/doc/${PN}/Readme.txt
 
 	# install binary
+	python_fix_shebang bin/${PN}
 	into /opt/${PN}
 	dobin bin/*
 
diff --git a/sci-misc/mendeleydesktop/metadata.xml b/sci-misc/mendeleydesktop/metadata.xml
index f414e22ecdc6..b896b3ebe0a0 100644
--- a/sci-misc/mendeleydesktop/metadata.xml
+++ b/sci-misc/mendeleydesktop/metadata.xml
@@ -9,6 +9,15 @@
     <email>xmw@gentoo.org</email>
     <name>Michael Weber</name>
   </maintainer>
+  <maintainer>
+    <email>marbre@linux.sungazer.de</email>
+    <name>Marius Brehler</name>
+  </maintainer>
+  <maintainer>
+    <email>jlec@gentoo.org</email>
+    <name>Justin Lecher</name>
+    <description>proxy for Marius</description>
+  </maintainer>
   <longdescription>
 Mendeley(TM) is a free reference manager and academic social network that can 
 help you organize your research, collaborate with others online, and discover