EAPI3, small cleanup, remove old

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 17 insertions, 109 deletions

diff --git a/app-text/kchmviewer/ChangeLog b/app-text/kchmviewer/ChangeLog
index fd4edbb87cb1..5a51518aa8e0 100644
--- a/app-text/kchmviewer/ChangeLog
+++ b/app-text/kchmviewer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/kchmviewer
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.38 2010/10/26 20:58:17 hwoarang Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.39 2011/01/30 12:40:58 tampakrap Exp $
+
+  30 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org> -kchmviewer-5.1.ebuild,
+  kchmviewer-5.2-r1.ebuild:
+  EAPI3, small cleanup, remove old
 
   26 Oct 2010; Markos Chandras <hwoarang@gentoo.org>
   kchmviewer-5.2-r1.ebuild:
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index c0e1067168cd..5738e514abe8 100644
--- a/app-text/kchmviewer/Manifest
+++ b/app-text/kchmviewer/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kchmviewer-5.2-kde-build.patch 509 RMD160 de7f1b389efef08ac5c8f8cff94bcef209c5d7e9 SHA1 a43d9287841903b98b985d51660d5000307357be SHA256 08fa3ff39026e9e2e6b4c55e0d69a2bf15d5c5c584c74e61929eaf915eb75287
-DIST kchmviewer-5.1.tar.gz 263934 RMD160 381f946f58461540f8f87fe4f398e3bd06b8b900 SHA1 465ae7864d7b2f58036043232161a86e80d35350 SHA256 a1ed61f35e35432d23fb98d9d11bf6755ff388d45571436bb3cadb8c08ecb38f
 DIST kchmviewer-5.2.tar.gz 283874 RMD160 596ecd96c94f1a33c180869ec91b5e774e1f5e12 SHA1 bba7c5ff141e224cbbcc306f8c07d08708ec386f SHA256 4b5054baa7dc7a5969c64eb7dec860c335f0e3603bf96688f3b121908a20c947
-EBUILD kchmviewer-5.1.ebuild 1905 RMD160 782beed3b9ad29d083ed77198cbe9722fcd5b713 SHA1 94de1b16da43d020894bddf5d4e3c2ec77fb6567 SHA256 608c20832d82e62a41e81e65500e9a4998c240917062e1f5f627c30f524b2621
-EBUILD kchmviewer-5.2-r1.ebuild 1980 RMD160 6917fa9e374ed54e28b7720b2ad212aed402758b SHA1 48f5f969d71fd741109f63b2ada8119783ef2b54 SHA256 cf609ddb74916101f2f7baa9fb3d78e0211867e3ee8b22944dc3857fd7333401
+EBUILD kchmviewer-5.2-r1.ebuild 1960 RMD160 514b66642f67d66778d1dc37d9f33f256ac7dd56 SHA1 75ac18d7561bc87cd7f554324279246c45d9cc01 SHA256 4bceab0ffeb972d861540f41b4cf12dc11e532fbc5193f631aec322f183aad81
 EBUILD kchmviewer-5.2.ebuild 1973 RMD160 f55475b0e83b541aa11d29862f132c1918763c41 SHA1 e8d2baedf62f77b8c76e6354abe97caa081aacef SHA256 e6916a307ad006a0aaf453998520779612bb234b6798f2119693a93906fccf51
-MISC ChangeLog 11539 RMD160 90f50649b43e4841b50216e30e5804b2abe1b291 SHA1 f6e157dfbd2558710eb75f04395677a83ea41e66 SHA256 74a583874f4a20dc2a25ac7f5faaad5092e3c169b988b853bb7a4ddcab57707f
+MISC ChangeLog 11684 RMD160 53a7dc4e32b7ba1da5cbae733736d46071b49bca SHA1 c8d3bc1c8ac8ef0b0c92d2292008b51b09668986 SHA256 8799e08dcfba6e41ef54638eb9c4543f117c861565e72ff31aca6aefdb50871e
 MISC metadata.xml 897 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 SHA1 f023e57c6fc9e15a961f7e73b251ae4882f32b6f SHA256 8bf8c96465c90869082f2ecf1836c160549e26814d5ec38b7a9d7fe5947d9e1b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkzHQPYACgkQ9/cejkQaxBCWogCfVbPX9JTnfE5LCQgP14t1Bo+e
-LxgAn2ke7B0LoqSS/940gHMTqPPqo8KR
-=oeXI
------END PGP SIGNATURE-----
diff --git a/app-text/kchmviewer/kchmviewer-5.1.ebuild b/app-text/kchmviewer/kchmviewer-5.1.ebuild
deleted file mode 100644
index 0505650a9546..000000000000
--- a/app-text/kchmviewer/kchmviewer-5.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-5.1.ebuild,v 1.3 2010/04/11 12:05:14 nixnut Exp $
-
-EAPI="2"
-KDE_REQUIRED="never"
-inherit fdo-mime qt4 kde4-base
-
-DESCRIPTION="KchmViewer is a feature rich chm file viewer, based on Qt."
-HOMEPAGE="http://www.kchmviewer.net/"
-SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="kde"
-
-RDEPEND="dev-libs/chmlib
-	>=x11-libs/qt-dbus-4.5:4
-	>=x11-libs/qt-webkit-4.5:4
-	!kde? ( >=x11-libs/qt-gui-4.5:4 )
-	kde? ( >=kde-base/kdelibs-4.1
-			!kde-base/okular[chm] )"
-DEPEND="${RDEPEND}
-		kde? ( dev-util/cmake )"
-
-S=${WORKDIR}/build-${PV}
-
-pkg_setup() {
-	use kde && kde4-base_pkg_setup
-}
-
-src_prepare() {
-	sed -e "s:KDE4_SERVICES_INSTALL_DIR:SERVICES_INSTALL_DIR:" \
-			-i lib/kio-msits/CMakeLists.txt
-	sed -e "s:KDE4_ICON_INSTALL_DIR:ICON_INSTALL_DIR:" \
-		-e "s:KDE4_XDG_APPS_INSTALL_DIR:XDG_APPS_INSTALL_DIR:" \
-			-i packages/CMakeLists.txt
-	sed -e "s:KDE4_BIN_INSTALL_DIR:BIN_INSTALL_DIR:" \
-			-i src/CMakeLists.txt
-	echo "CONFIG += ordered" >> kchmviewer.pro # parallel build fix #281954
-}
-
-src_configure() {
-	if use kde; then
-		kde4-base_src_configure
-	else
-		eqmake4
-	fi
-}
-
-src_compile() {
-	if use kde; then
-		kde4-base_src_compile
-	else
-		emake || die
-	fi
-}
-
-src_test() {
-	einfo "No tests exist."
-}
-
-src_install() {
-	if use kde; then
-		kde4-base_src_install
-	else
-		dobin bin/kchmviewer || die "dobin kchmviewer failed"
-		domenu packages/kchmviewer.desktop || die
-		dodoc ChangeLog README || die
-	fi
-	insinto /usr/share/pixmaps/
-	doins packages/kchmviewer.png || die
-	dodoc DBUS-bindings FAQ || die
-}
-
-pkg_postinst() {
-	use kde && kde4-base_pkg_postinst
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	use kde && kde4-base_pkg_postrm
-	fdo-mime_desktop_database_update
-}
diff --git a/app-text/kchmviewer/kchmviewer-5.2-r1.ebuild b/app-text/kchmviewer/kchmviewer-5.2-r1.ebuild
index 1da0f2ff0061..48ae5d3d11b4 100644
--- a/app-text/kchmviewer/kchmviewer-5.2-r1.ebuild
+++ b/app-text/kchmviewer/kchmviewer-5.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-5.2-r1.ebuild,v 1.3 2010/10/26 20:58:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-5.2-r1.ebuild,v 1.4 2011/01/30 12:40:58 tampakrap Exp $
 
-EAPI="2"
+EAPI=3
 KDE_REQUIRED="never"
 inherit fdo-mime qt4-r2 kde4-base
 
@@ -15,14 +15,15 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="kde"
 
-RDEPEND="dev-libs/chmlib
+RDEPEND="
+	dev-libs/chmlib
 	>=x11-libs/qt-dbus-4.5:4
 	>=x11-libs/qt-webkit-4.5:4
 	!kde? ( >=x11-libs/qt-gui-4.5:4 )
-	kde? ( >=kde-base/kdelibs-4.1
-			!kde-base/okular[chm] )"
-DEPEND="${RDEPEND}
-		kde? ( dev-util/cmake )"
+	kde? ( $(add_kdebase_dep kdelibs)
+			!kde-base/okular[chm] )
+"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/build-${PV}