Revision bump: EAPI 5, utilize l10n eclass for locale handling, fix desktop file, minor cosmetic fixes. Add Qt herd to metadata. Drop old version

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

4 files changed, 65 insertions, 38 deletions

diff --git a/x11-misc/qcomicbook/ChangeLog b/x11-misc/qcomicbook/ChangeLog
index c9a4e812dac9..71ea6a9dba65 100644
--- a/x11-misc/qcomicbook/ChangeLog
+++ b/x11-misc/qcomicbook/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/qcomicbook
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/ChangeLog,v 1.51 2014/02/09 13:24:35 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/ChangeLog,v 1.52 2014/02/09 13:37:22 pinkbyte Exp $
+
+*qcomicbook-0.9.0-r1 (09 Feb 2014)
+
+  09 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> -qcomicbook-0.8.2.ebuild,
+  +qcomicbook-0.9.0-r1.ebuild, metadata.xml:
+  Revision bump: EAPI 5, utilize l10n eclass for locale handling, fix desktop
+  file, minor cosmetic fixes. Add Qt herd to metadata. Drop old version
 
   09 Feb 2014; Sergey Popov <pinkbyte@gentoo.org> qcomicbook-0.9.0.ebuild:
   Stable on amd64 and x86, wrt bug #437170
diff --git a/x11-misc/qcomicbook/metadata.xml b/x11-misc/qcomicbook/metadata.xml
index 540f810e069d..baccd90af55a 100644
--- a/x11-misc/qcomicbook/metadata.xml
+++ b/x11-misc/qcomicbook/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>desktop-misc</herd>
+	<herd>desktop-misc</herd>
+	<herd>qt</herd>
 </pkgmetadata>
diff --git a/x11-misc/qcomicbook/qcomicbook-0.8.2.ebuild b/x11-misc/qcomicbook/qcomicbook-0.8.2.ebuild
deleted file mode 100644
index efc5aa4d7a9d..000000000000
--- a/x11-misc/qcomicbook/qcomicbook-0.8.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/qcomicbook-0.8.2.ebuild,v 1.5 2013/03/02 23:51:19 hwoarang Exp $
-
-EAPI=4
-
-CMAKE_IN_SOURCE_BUILD=1
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="A viewer for comic book archives containing jpeg/png images."
-HOMEPAGE="http://qcomicbook.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="debug"
-
-DEPEND="dev-qt/qtgui:4
-	app-text/poppler[qt4]"
-RDEPEND="${DEPEND}"
-
-DOCS="AUTHORS ChangeLog NEWS README THANKS TODO"
-
-src_configure() {
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "For using QComicBook with compressed archives you may want to install:"
-	elog "    app-arch/p7zip"
-	elog "    app-arch/unace"
-	elog "    app-arch/unrar or app-arch/rar"
-	elog "    app-arch/unzip"
-}
diff --git a/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild b/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..2fb7f3ebad60
--- /dev/null
+++ b/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild,v 1.1 2014/02/09 13:37:22 pinkbyte Exp $
+
+EAPI=5
+
+CMAKE_IN_SOURCE_BUILD=1
+PLOCALES="cs_CZ de_DE es_ES fi_FI fr_CA fr_FR it_IT ko_KR nl_NL pl_PL pt_BR ru_RU uk_UA zh_CN"
+inherit cmake-utils flag-o-matic l10n
+
+DESCRIPTION="A viewer for comic book archives containing jpeg/png images"
+HOMEPAGE="http://qcomicbook.org/"
+SRC_URI="http://qcomicbook.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug"
+
+DEPEND="dev-qt/qtgui:4
+	app-text/poppler[qt4]"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+src_prepare() {
+	rm_loc() {
+	        rm "i18n/${PN}_${1}.ts" || die "removing ${1} locale failed"
+	}
+	rm "i18n/${PN}_en_EN.ts" || die 'removing redundant english locale failed'
+	l10n_find_plocales_changes "i18n" "${PN}_" ".ts"
+	l10n_for_each_disabled_locale_do rm_loc
+
+	# fix desktop file
+	sed -i \
+		-e '/^Encoding/d' \
+		-e '/^Icon/s/.png//' \
+		-e '/^Categories/s/Application;//' \
+		"data/${PN}.desktop" || die 'sed on desktop file failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "For using QComicBook with compressed archives you may want to install:"
+	elog "    app-arch/p7zip"
+	elog "    app-arch/unace"
+	elog "    app-arch/unrar or app-arch/rar"
+	elog "    app-arch/unzip"
+}