Fix minor QA issues, fix desktop file categories, wrt bug #463810. Drop old versions, as requested in bug #463128

(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

4 files changed, 16 insertions, 79 deletions

diff --git a/net-misc/qtm/ChangeLog b/net-misc/qtm/ChangeLog
index db57a7b9e599..e90966d951e4 100644
--- a/net-misc/qtm/ChangeLog
+++ b/net-misc/qtm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/qtm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/qtm/ChangeLog,v 1.30 2013/03/30 09:42:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/qtm/ChangeLog,v 1.31 2013/03/30 13:27:59 pinkbyte Exp $
+
+  30 Mar 2013; Sergey Popov <pinkbyte@gentoo.org> -qtm-1.3.10.ebuild,
+  -qtm-1.3.12.ebuild, qtm-1.3.13.ebuild:
+  Fix minor QA issues, fix desktop file categories, wrt bug #463810. Drop old
+  versions, as requested in bug #463128
 
   30 Mar 2013; Agostino Sarubbo <ago@gentoo.org> qtm-1.3.13.ebuild:
   Stable for x86, wrt bug #463128
diff --git a/net-misc/qtm/qtm-1.3.10.ebuild b/net-misc/qtm/qtm-1.3.10.ebuild
deleted file mode 100644
index 55b212de8fd7..000000000000
--- a/net-misc/qtm/qtm-1.3.10.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/qtm/qtm-1.3.10.ebuild,v 1.4 2013/03/02 23:05:44 hwoarang Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="Qt4 blogging client"
-HOMEPAGE="http://qtm.blogistan.co.uk"
-SRC_URI="mirror://sourceforge/catkin/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="dbus debug ssl"
-RESTRICT="strip"
-
-RDEPEND="dev-qt/qtgui:4
-	dbus? ( dev-qt/qtdbus:4 )
-	x11-proto/xproto
-	dev-lang/perl
-	virtual/perl-Digest-MD5"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-DOCS="Changelog README"
-
-src_configure() {
-	mycmakeargs="-DDONT_USE_PTE=FALSE -DINSTALL_MARKDOWN=TRUE
-	$(cmake-utils_use debug QDEBUG)
-	$(cmake-utils_use ssl)"
-	! use dbus && mycmakeargs="${mycmakeargs} -DDONT_USE_DBUS=TRUE"
-	cmake-utils_src_configure
-}
diff --git a/net-misc/qtm/qtm-1.3.12.ebuild b/net-misc/qtm/qtm-1.3.12.ebuild
deleted file mode 100644
index 27bce1287461..000000000000
--- a/net-misc/qtm/qtm-1.3.12.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/qtm/qtm-1.3.12.ebuild,v 1.2 2013/03/02 23:05:44 hwoarang Exp $
-
-EAPI="4"
-
-inherit cmake-utils
-
-DESCRIPTION="Qt4 blogging client"
-HOMEPAGE="http://qtm.blogistan.co.uk"
-SRC_URI="mirror://sourceforge/catkin/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dbus debug ssl"
-RESTRICT="strip"
-
-RDEPEND="dev-qt/qtgui:4
-	dbus? ( dev-qt/qtdbus:4 )
-	x11-proto/xproto
-	dev-lang/perl
-	virtual/perl-Digest-MD5"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CMAKE_IN_SOURCE_BUILD="1"
-
-DOCS="Changelog README"
-
-src_configure() {
-	mycmakeargs="-DDONT_USE_PTE=FALSE -DINSTALL_MARKDOWN=TRUE
-	$(cmake-utils_use debug QDEBUG)
-	$(cmake-utils_use ssl)"
-	! use dbus && mycmakeargs="${mycmakeargs} -DDONT_USE_DBUS=TRUE"
-	cmake-utils_src_configure
-}
diff --git a/net-misc/qtm/qtm-1.3.13.ebuild b/net-misc/qtm/qtm-1.3.13.ebuild
index b4cc1c73f5cb..93c12b366dca 100644
--- a/net-misc/qtm/qtm-1.3.13.ebuild
+++ b/net-misc/qtm/qtm-1.3.13.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/qtm/qtm-1.3.13.ebuild,v 1.4 2013/03/30 09:42:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/qtm/qtm-1.3.13.ebuild,v 1.5 2013/03/30 13:27:59 pinkbyte Exp $
 
 EAPI="4"
 
+CMAKE_IN_SOURCE_BUILD="1"
 inherit cmake-utils
 
 DESCRIPTION="Qt4 blogging client"
@@ -24,12 +25,17 @@ RDEPEND="dev-qt/qtgui:4
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-CMAKE_IN_SOURCE_BUILD="1"
+DOCS=( Changelog README )
 
-DOCS="Changelog README"
+src_prepare() {
+	# bug 463810
+	sed -i -e '/Categories/s/Application;//' qtm-desktop.sh || die 'sed on qtm-desktop.sh failed'
+
+	cmake-utils_src_prepare
+}
 
 src_configure() {
-	mycmakeargs="-DDONT_USE_PTE=FALSE -DINSTALL_MARKDOWN=TRUE
+	local mycmakeargs="-DDONT_USE_PTE=FALSE -DINSTALL_MARKDOWN=TRUE
 	$(cmake-utils_use debug QDEBUG)
 	$(cmake-utils_use ssl)"
 	! use dbus && mycmakeargs="${mycmakeargs} -DDONT_USE_DBUS=TRUE"