Version bump (bug 536656, thanks Andrés Becerra Sandoval, Marius Brehler & Alexander), changed license file (bug 536686), adding myself as co-maintainer.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

5 files changed, 41 insertions, 115 deletions

diff --git a/sci-misc/mendeleydesktop/ChangeLog b/sci-misc/mendeleydesktop/ChangeLog
index 317737c7df8a..fc668d0e8471 100644
--- a/sci-misc/mendeleydesktop/ChangeLog
+++ b/sci-misc/mendeleydesktop/ChangeLog
@@ -1,6 +1,14 @@
 # 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.18 2015/01/08 15:54:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/ChangeLog,v 1.19 2015/01/25 15:37:11 xmw Exp $
+
+*mendeleydesktop-1.13.1 (25 Jan 2015)
+
+  25 Jan 2015; Michael Weber <xmw@gentoo.org>
+  +files/mendeleydesktop-fix-python3.patch, +mendeleydesktop-1.13.1.ebuild,
+  -mendeleydesktop-1.12.1.ebuild, -mendeleydesktop-1.12.4.ebuild, metadata.xml:
+  Version bump (bug 536656, thanks Andrés Becerra Sandoval, Marius Brehler &
+  Alexander), changed license file (bug 536686), adding myself as co-maintainer.
 
 *mendeleydesktop-1.12.4 (08 Jan 2015)
 
diff --git a/sci-misc/mendeleydesktop/files/mendeleydesktop-fix-python3.patch b/sci-misc/mendeleydesktop/files/mendeleydesktop-fix-python3.patch
new file mode 100644
index 000000000000..e1b1abc00857
--- /dev/null
+++ b/sci-misc/mendeleydesktop/files/mendeleydesktop-fix-python3.patch
@@ -0,0 +1,16 @@
+--- mendeleydesktop-1.13.1/bin/mendeleydesktop.orig 2015-01-15 15:49:15.589870680 +0100
++++ mendeleydesktop-1.13.1/bin/mendeleydesktop 2015-01-15 15:46:49.308954069 +0100
+@@ -95,11 +95,11 @@
+ 		# Both version components are non-numeric, treat
+ 		# them as equal
+ 		return False
+-	elif (version_part_a and version_part_b is None):
++	elif (type(version_part_a) is int and version_part_b is None):
+ 		# Left version component is numeric, right component is not.
+ 		# Treat the numeric part as greater
+ 		return False
+-	elif (version_part_b and version_part_a is None):
++	elif (type(version_part_b) is int and version_part_a is None):
+ 		# Right version component is numeric, left component is not.
+ 		# Treat the numeric part as greater
+ 		return True
diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.12.1.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.12.1.ebuild
deleted file mode 100644
index 091ce9eafa50..000000000000
--- a/sci-misc/mendeleydesktop/mendeleydesktop-1.12.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/mendeleydesktop-1.12.1.ebuild,v 1.1 2014/08/29 11:40:55 xmw Exp $
-
-EAPI="4"
-
-inherit eutils multilib
-
-MY_P_AMD64="${P}-linux-x86_64"
-MY_P_X86="${P}-linux-i486"
-
-DESCRIPTION="A free research management tool for desktop and web"
-HOMEPAGE="http://www.mendeley.com/"
-SRC_URI="amd64? ( ${MY_P_AMD64}.tar.bz2 )
-	x86? ( ${MY_P_X86}.tar.bz2 )
-	amd64-linux? ( ${MY_P_AMD64}.tar.bz2 )
-	x86-linux? ( ${MY_P_X86}.tar.bz2 )"
-
-LICENSE="Mendeley-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RESTRICT="fetch"
-
-DEPEND=""
-RDEPEND=">=dev-qt/qtcore-4.6:4
-	>=dev-qt/qtgui-4.6:4
-	>=dev-qt/qtsvg-4.6:4
-	>=dev-qt/qtwebkit-4.6:4
-	>=dev-qt/qtxmlpatterns-4.6:4"
-
-QA_PRESTRIPPED="
-	/opt/mendeleydesktop/$(get_libdir)/mendeleydesktop/libexec/.*
-	/opt/mendeleydesktop/$(get_libdir)/lib.*so.*"
-
-pkg_nofetch() {
-	elog "Please download ${A} from:"
-	elog "http://www.mendeley.com/download-mendeley-desktop/"
-	elog "and move it to ${DISTDIR}"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${WORKDIR}"
-
-	if use amd64 || use amd64-linux ; then
-		mv -f "${MY_P_AMD64}" "${P}"
-	else
-		mv -f "${MY_P_X86}" "${P}"
-	fi
-}
-
-src_prepare() {
-	# remove bundled Qt libraries
-	rm -rf lib/mendeleydesktop/plugins \
-		|| die "failed to remove plugin directory"
-	rm -rf lib/qt || die "failed to remove qt libraries"
-
-	# force use of system Qt libraries
-	sed -i "s:sys\.argv\.count(\"--force-system-qt\") > 0:True:" \
-		bin/mendeleydesktop || die "failed to patch startup script"
-
-	# fix library paths
-	sed -i \
-		-e "s:lib/mendeleydesktop:$(get_libdir)/mendeleydesktop:g" \
-		-e "s:MENDELEY_BASE_PATH + \"/lib/\":MENDELEY_BASE_PATH + \"/$(get_libdir)/\":g" \
-		bin/mendeleydesktop || die "failed to patch library path"
-}
-
-src_install() {
-	# install menu
-	domenu share/applications/${PN}.desktop
-
-	# install application icons
-	insinto /usr/share/icons
-	doins -r share/icons/hicolor
-
-	# install default icon
-	insinto /usr/share/pixmaps
-	doins share/icons/hicolor/48x48/apps/${PN}.png
-
-	# install documentation, but no license file
-	dodoc share/doc/${PN}/Readme.txt
-
-	# install binary
-	into /opt/${PN}
-	dobin bin/*
-
-	# install libraries
-	dolib.so lib/lib*.so*
-
-	# install programs
-	exeinto /opt/mendeleydesktop/$(get_libdir)/mendeleydesktop/libexec
-	doexe lib/mendeleydesktop/libexec/*
-
-	# install shared files
-	insinto /opt/${PN}/share
-	doins -r share/mendeleydesktop
-
-	# install launch script
-	exeinto /opt/bin
-	doexe "${FILESDIR}"/${PN}
-}
diff --git a/sci-misc/mendeleydesktop/mendeleydesktop-1.12.4.ebuild b/sci-misc/mendeleydesktop/mendeleydesktop-1.13.1.ebuild
index e749204e429c..f86da48f6d07 100644
--- a/sci-misc/mendeleydesktop/mendeleydesktop-1.12.4.ebuild
+++ b/sci-misc/mendeleydesktop/mendeleydesktop-1.13.1.ebuild
@@ -1,6 +1,6 @@
 # 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.12.4.ebuild,v 1.1 2015/01/08 15:54:10 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/mendeleydesktop/mendeleydesktop-1.13.1.ebuild,v 1.1 2015/01/25 15:37:11 xmw Exp $
 
 EAPI=5
 
@@ -16,7 +16,7 @@ SRC_URI="amd64? ( ${MY_P_AMD64}.tar.bz2 )
 	amd64-linux? ( ${MY_P_AMD64}.tar.bz2 )
 	x86-linux? ( ${MY_P_X86}.tar.bz2 )"
 
-LICENSE="Mendeley-EULA"
+LICENSE="Mendeley-terms"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
@@ -25,11 +25,11 @@ RESTRICT="fetch"
 
 DEPEND=""
 RDEPEND="
-	>=dev-qt/qtcore-4.6:4
-	>=dev-qt/qtgui-4.6:4
-	>=dev-qt/qtsvg-4.6:4
-	>=dev-qt/qtwebkit-4.6:4
-	>=dev-qt/qtxmlpatterns-4.6:4"
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtsvg:4
+	dev-qt/qtwebkit:4
+	dev-qt/qtxmlpatterns:4"
 
 QA_PREBUILT="/opt/mendeleydesktop/.*"
 
@@ -53,9 +53,9 @@ src_unpack() {
 
 src_prepare() {
 	# remove bundled Qt libraries
-	rm -rf lib/mendeleydesktop/plugins \
+	rm -r lib/mendeleydesktop/plugins \
 		|| die "failed to remove plugin directory"
-	rm -rf lib/qt || die "failed to remove qt libraries"
+	rm -r lib/qt || die "failed to remove qt libraries"
 
 	# force use of system Qt libraries
 	sed -i "s:sys\.argv\.count(\"--force-system-qt\") > 0:True:" \
@@ -66,6 +66,9 @@ src_prepare() {
 		-e "s:lib/mendeleydesktop:$(get_libdir)/mendeleydesktop:g" \
 		-e "s:MENDELEY_BASE_PATH + \"/lib/\":MENDELEY_BASE_PATH + \"/$(get_libdir)/\":g" \
 		bin/mendeleydesktop || die "failed to patch library path"
+
+	# patch for python3
+	epatch "${FILESDIR}/mendeleydesktop-fix-python3.patch"
 }
 
 src_install() {
diff --git a/sci-misc/mendeleydesktop/metadata.xml b/sci-misc/mendeleydesktop/metadata.xml
index cdfdbe0441da..f414e22ecdc6 100644
--- a/sci-misc/mendeleydesktop/metadata.xml
+++ b/sci-misc/mendeleydesktop/metadata.xml
@@ -5,6 +5,10 @@
     <email>miknix@gentoo.org</email>
     <name>Angelo Arrifano</name>
   </maintainer>
+  <maintainer>
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </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