ppc stable wrt #338343. Drop old

Package-Manager: portage-2.1.9.25/cvs/Linux ppc64

4 files changed, 9 insertions, 94 deletions

diff --git a/app-text/kchmviewer/ChangeLog b/app-text/kchmviewer/ChangeLog
index a2d4a0091635..442a2fc2b328 100644
--- a/app-text/kchmviewer/ChangeLog
+++ b/app-text/kchmviewer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/kchmviewer
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.40 2011/02/14 15:31:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/ChangeLog,v 1.41 2011/02/15 07:29:55 xarthisius Exp $
+
+  15 Feb 2011; Kacper Kowalik <xarthisius@gentoo.org>
+  -kchmviewer-5.2.ebuild, kchmviewer-5.2-r1.ebuild:
+  ppc stable wrt #338343. Drop old
 
   14 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   kchmviewer-5.2-r1.ebuild:
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
index 7ed0fb7db13a..80fe1fab5ca8 100644
--- a/app-text/kchmviewer/Manifest
+++ b/app-text/kchmviewer/Manifest
@@ -1,6 +1,5 @@
 AUX kchmviewer-5.2-kde-build.patch 509 RMD160 de7f1b389efef08ac5c8f8cff94bcef209c5d7e9 SHA1 a43d9287841903b98b985d51660d5000307357be SHA256 08fa3ff39026e9e2e6b4c55e0d69a2bf15d5c5c584c74e61929eaf915eb75287
 DIST kchmviewer-5.2.tar.gz 283874 RMD160 596ecd96c94f1a33c180869ec91b5e774e1f5e12 SHA1 bba7c5ff141e224cbbcc306f8c07d08708ec386f SHA256 4b5054baa7dc7a5969c64eb7dec860c335f0e3603bf96688f3b121908a20c947
-EBUILD kchmviewer-5.2-r1.ebuild 1962 RMD160 a05b50ef86027595fb7d5a17f4cfa61828e8f32b SHA1 bb35dd171cebc0bfa69c7a9c14dbe1011416a511 SHA256 736f8cd90fc85bebf53ab0c1e181ba10c1f17a375a787539405460efcd99fd41
-EBUILD kchmviewer-5.2.ebuild 1973 RMD160 f55475b0e83b541aa11d29862f132c1918763c41 SHA1 e8d2baedf62f77b8c76e6354abe97caa081aacef SHA256 e6916a307ad006a0aaf453998520779612bb234b6798f2119693a93906fccf51
-MISC ChangeLog 11782 RMD160 d67fefa3a04db6f4f3afc8b46693986b53c8d7cb SHA1 2caaf8f9fdb0e968b24d169433f8422e72bad4a0 SHA256 4e9d9478f8182b68ee63d853cad9a85019c288cdf58aadca07b80a26cbe52fc1
+EBUILD kchmviewer-5.2-r1.ebuild 1962 RMD160 0a4ae2fee56ae4d040b0469952b6e89cff3d5075 SHA1 dca58aaf95b509f86b7f68cbeae6819834451871 SHA256 78bf87b07eb4a26bbabf820a521034c2083ccd147be394aa6eb9ce14b556a72b
+MISC ChangeLog 11925 RMD160 8ed5813a320d36e5594ca7718a8495e7fd4f32f0 SHA1 ee4d8352ce6b1a48b9ff7cc597d55af9166b8f5f SHA256 d9e2283a52a4ff2a2963e48da621bffd46af50ab51cede911fefec7d0dbbd748
 MISC metadata.xml 897 RMD160 7d20769aac85be3dbcdeb662a0e71a67c90413a1 SHA1 f023e57c6fc9e15a961f7e73b251ae4882f32b6f SHA256 8bf8c96465c90869082f2ecf1836c160549e26814d5ec38b7a9d7fe5947d9e1b
diff --git a/app-text/kchmviewer/kchmviewer-5.2-r1.ebuild b/app-text/kchmviewer/kchmviewer-5.2-r1.ebuild
index b2fd4e0636eb..f84d62210958 100644
--- a/app-text/kchmviewer/kchmviewer-5.2-r1.ebuild
+++ b/app-text/kchmviewer/kchmviewer-5.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.5 2011/02/14 15:31:35 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/kchmviewer/kchmviewer-5.2-r1.ebuild,v 1.6 2011/02/15 07:29:55 xarthisius Exp $
 
 EAPI=3
 KDE_REQUIRED="never"
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="kde"
 
 RDEPEND="
diff --git a/app-text/kchmviewer/kchmviewer-5.2.ebuild b/app-text/kchmviewer/kchmviewer-5.2.ebuild
deleted file mode 100644
index b472f7cab8db..000000000000
--- a/app-text/kchmviewer/kchmviewer-5.2.ebuild
+++ /dev/null
@@ -1,88 +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.2.ebuild,v 1.3 2010/10/24 14:14:22 ranger 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}
-
-PATCHES=( "${FILESDIR}/${P}-kde-build.patch" )
-
-pkg_setup() {
-	use kde && kde4-base_pkg_setup
-}
-
-src_prepare() {
-	base_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
-}