Remove KDE3 support.

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

5 files changed, 25 insertions, 182 deletions

diff --git a/app-i18n/xsim/ChangeLog b/app-i18n/xsim/ChangeLog
index aaee31b87f31..b4b2c01ab324 100644
--- a/app-i18n/xsim/ChangeLog
+++ b/app-i18n/xsim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-i18n/xsim
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/ChangeLog,v 1.19 2009/09/23 15:42:40 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/ChangeLog,v 1.20 2009/10/21 15:11:40 ssuominen Exp $
+
+  21 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+  xsim-0.3.9.4-r5.ebuild:
+  Remove KDE3 support.
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> xsim-0.3.9.4-r2.ebuild:
   Remove virtual/libc
diff --git a/app-i18n/xsim/Manifest b/app-i18n/xsim/Manifest
index dc627d36ce43..22bf073225ef 100644
--- a/app-i18n/xsim/Manifest
+++ b/app-i18n/xsim/Manifest
@@ -4,8 +4,6 @@ AUX xsim-0.3.9.4-db3.patch 934 RMD160 7c79ac71464a1409509b2a6cd12d9f9c237c0cb0 S
 AUX xsim-0.3.9.4-gcc-3.4.patch 3163 RMD160 e498e1d08dade34576ea726a5dfb6aa2e8ce0869 SHA1 550a0783b84258322d2d2ad98132d37072d0cbb8 SHA256 cd9cf274c76f123c4dbe7e5f77b0db0f7b54cd28ce0d0a10979cd852422674cc
 AUX xsim-0.3.9.4-gcc-4.3.patch 1692 RMD160 85ae026cc5d6bec03386d0c31bb99ae23f69d1e9 SHA1 00f14d6d7f8bb2ef04199433a195995513c8ae07 SHA256 2357f14808902c7147c6183c074ffdafd64b4c7e23e49eb95e3ca5d669659582
 DIST xsim-0.3.9.4.tar.gz 1025640 RMD160 9b5d0106448a3311047d3fe4a8fad0852ca2dca0 SHA1 a4dc618e0b8c2005415cbdb9504358a860719ab1 SHA256 048f23527543b21c4d52dc98967ec7253c34eb704056767364c6dc5007971b2c
-EBUILD xsim-0.3.9.4-r2.ebuild 1731 RMD160 f5c03a2cdc442c4c31f9d1c2e8b77853579649a0 SHA1 8fdb0ac92d0bdbbaa07dc3fc848feb9b7c38d9ff SHA256 4a3d808efb52f867466eb5c2eec3383e20ff848b91e8e54a56820d76b202eef3
-EBUILD xsim-0.3.9.4-r4.ebuild 2105 RMD160 62230b373dc29b01acd8889b90f771988c9b7a54 SHA1 053fb31e7f8705962511c0c5a1e3ff26ca6cea8f SHA256 aff34a68940855b45ab525d2d6a07c8d5c1cb23ab3bfc12461eeff66f13a7937
-EBUILD xsim-0.3.9.4-r5.ebuild 2167 RMD160 d566d9faa64a46b6d4ee453aaba158f2d57387be SHA1 f3460a34beea2976cedbc7181ea3f39d6c84ea40 SHA256 abfee396d2a969b9e346baf3a2d591e593d89bf4e55281cd36bff7f564f0c682
-MISC ChangeLog 2564 RMD160 767cbcd17ff3306fbc0d1db414d5c3a4640a7989 SHA1 bba03516728d991467a3298ca89e3ab7b80c995e SHA256 88bf7c3478ddaf57f017fdcab79f59d8b1b4d0d3d6e5a30b1d5a60e354cb43a9
+EBUILD xsim-0.3.9.4-r5.ebuild 1915 RMD160 c61a3b846dea91726c068f7b9a8bcf52724dcd0e SHA1 9461d793cd7d521cf4cd41bc17115b654def9135 SHA256 acaa87713c77edd4c7c7f261b30f939c7384010fa5ec27a9fc7c0d25f9add38c
+MISC ChangeLog 2670 RMD160 d77708086e037537e6561230499053d4f823a23b SHA1 08e8e0f3eba7b7a2781c355c2c4b85c0a7ab1fc4 SHA256 c8580dccefc94cdabda80c4f0dfbc0f92c1bf6fd1a638230d754748a87049217
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/app-i18n/xsim/xsim-0.3.9.4-r2.ebuild b/app-i18n/xsim/xsim-0.3.9.4-r2.ebuild
deleted file mode 100644
index fcfcbf4ed9da..000000000000
--- a/app-i18n/xsim/xsim-0.3.9.4-r2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/xsim-0.3.9.4-r2.ebuild,v 1.13 2009/09/23 15:42:40 patrick Exp $
-
-EAPI="1"
-inherit kde-functions eutils
-
-DESCRIPTION="A simple and fast GB and BIG5 Chinese XIM server"
-HOMEPAGE="http://developer.berlios.de/projects/xsim/"
-SRC_URI="mirror://berlios/xsim/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="kde"
-
-DEPEND=">=sys-libs/db-3
-	>=sys-apps/sed-4
-	kde? ( kde-base/kdelibs:3.5 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${P}-compile-fix.patch
-
-	einfo "Patching ./configure to respect CFLAGS .."
-	sed -i -e "s/\(CFLAGS.*\)-O2/\1${CFLAGS}/" configure
-}
-
-src_compile() {
-	local myconf
-
-	if use kde; then
-		set-qtdir 3
-		set-kdedir 3
-		myconf="${myconf}
-			--with-kde3=${KDEDIR} \
-			--with-qt3=${QTDIR} \
-			--enable-status-kde3"
-	fi
-
-	econf ${myconf} || die "configure failed"
-	emake xsim_etcp=/etc || die "make failed"
-}
-
-src_install() {
-	einstall xsim_datp=${D}/usr/lib/xsim/dat \
-			xsim_libp=${D}/usr/lib/xsim/plugins \
-			xsim_binp=${D}/usr/bin \
-			xsim_etcp=${D}/etc \
-			install-data install || die "install failed"
-
-	sed -i -e "s#DICT_LOCAL\(.*\)/usr/dat#DICT_LOCAL\1/usr/lib/xsim/dat#" \
-		-e "s#PLUGIN_LOCAL\(.*\)/usr/plugins#PLUGIN_LOCAL\1/usr/lib/xsim/plugins#" \
-		${D}/etc/xsimrc
-
-	dodoc ChangeLog COPYING INSTALL README* TODO
-}
-
-pkg_postinst() {
-	elog "XSIM needs write access to /usr/lib/xsim/dat/chardb, so if you"
-	elog "not running it as root, you need to do the following:"
-	elog
-	elog "	cp -r /usr/lib/xsim/dat \${HOME}/.xsim"
-	elog "	sed -i \"s#DICT_LOCAL.*#DICT_LOCAL \${HOME}/.xsim#\" > \${HOME}/.xsim/xsimrc"
-	echo
-}
diff --git a/app-i18n/xsim/xsim-0.3.9.4-r4.ebuild b/app-i18n/xsim/xsim-0.3.9.4-r4.ebuild
deleted file mode 100644
index 8b54efd174ae..000000000000
--- a/app-i18n/xsim/xsim-0.3.9.4-r4.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/xsim-0.3.9.4-r4.ebuild,v 1.2 2008/05/04 15:06:48 matsuu Exp $
-
-inherit db-use eutils flag-o-matic kde-functions multilib
-
-DESCRIPTION="A simple and fast GB and BIG5 Chinese XIM server"
-HOMEPAGE="http://developer.berlios.de/projects/xsim/"
-SRC_URI="mirror://berlios/xsim/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug kde"
-
-DEPEND=">=sys-libs/db-4.1
-	>=sys-apps/sed-4
-	kde? ( >=kde-base/kdelibs-3 )"
-
-src_unpack() {
-	local dbver
-
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-compile-fix.patch
-	epatch "${FILESDIR}"/${P}-gcc-3.4.patch
-	epatch "${FILESDIR}"/${P}-64bit.patch
-
-	append-flags -DPIC -fPIC -fno-strict-aliasing
-
-	dbver="$(db_findver sys-libs/db)"
-	sed -i -e "s/\(CFLAGS.*\)-O2/\1${CFLAGS}/" \
-		-e "s/libdb_cxx.so/libdb_cxx-${dbver}.so/" \
-		-e "s/bdblib=\"db_cxx\"/bdblib=\"db_cxx-${dbver}\"/" configure* || die
-
-	find . -name '*.in' | xargs sed -i \
-		-e "s#\(@prefix@/\)\(dat\|plugins\)#\1$(get_libdir)/xsim/\2#" \
-		-e "s#@prefix@/etc#/etc#" || die
-}
-
-src_compile() {
-	local myconf
-
-	if use kde; then
-		set-qtdir 3
-		set-kdedir 3
-		myconf="${myconf}
-			--with-kde3=${KDEDIR} \
-			--with-qt3=${QTDIR} \
-			--enable-status-kde3"
-	fi
-
-	myconf="${myconf} --with-bdb-includes=$(db_includedir)"
-
-	use debug && myconf="${myconf} --enable-debug"
-
-	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	emake \
-		xsim_datp="${D}"/usr/$(get_libdir)/xsim/dat \
-		xsim_libp="${D}"usr/$(get_libdir)/xsim/plugins \
-		xsim_binp="${D}"/usr/bin \
-		xsim_etcp="${D}"/etc \
-		install-data install || die "install failed"
-
-	dodoc ChangeLog KNOWNBUG README* TODO
-}
-
-pkg_postinst() {
-	elog "XSIM needs write access to /usr/$(get_libdir)/xsim/dat/chardb, so if you"
-	elog "not running it as root, you need to do the following:"
-	elog
-	elog "	cp -r /usr/$(get_libdir)/xsim/dat \${HOME}/.xsim"
-	elog "	sed -i \"s#DICT_LOCAL.*#DICT_LOCAL \${HOME}/.xsim#\" > \${HOME}/.xsim/xsimrc"
-	echo
-}
diff --git a/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild b/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild
index a3b6a757c1c7..98226b1ff7ae 100644
--- a/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild
+++ b/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild,v 1.2 2008/11/05 20:06:31 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/xsim/xsim-0.3.9.4-r5.ebuild,v 1.3 2009/10/21 15:11:40 ssuominen Exp $
 
-EAPI="1"
-inherit db-use eutils flag-o-matic kde-functions multilib
+EAPI=2
+inherit db-use eutils flag-o-matic multilib
 
 DESCRIPTION="A simple and fast GB and BIG5 Chinese XIM server"
 HOMEPAGE="http://developer.berlios.de/projects/xsim/"
@@ -12,18 +12,15 @@ SRC_URI="mirror://berlios/xsim/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="debug kde"
+IUSE="debug"
 
-DEPEND=">=sys-libs/db-4.1
-	>=sys-apps/sed-4
-	kde? ( kde-base/kdelibs:3.5 )"
+RDEPEND=">=sys-libs/db-4.1"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4"
 
-src_unpack() {
+src_prepare() {
 	local dbver
 
-	unpack ${A}
-	cd "${S}"
-
 	epatch "${FILESDIR}"/${P}-compile-fix.patch
 	epatch "${FILESDIR}"/${P}-gcc-3.4.patch
 	epatch "${FILESDIR}"/${P}-64bit.patch
@@ -42,24 +39,16 @@ src_unpack() {
 		-e "s#@prefix@/etc#/etc#" || die
 }
 
-src_compile() {
-	local myconf
-
-	if use kde; then
-		set-qtdir 3
-		set-kdedir 3
-		myconf="${myconf}
-			--with-kde3=${KDEDIR} \
-			--with-qt3=${QTDIR} \
-			--enable-status-kde3"
-	fi
-
-	myconf="${myconf} --with-bdb-includes=$(db_includedir)"
+src_configure() {
+	local myconf=""
 
-	use debug && myconf="${myconf} --enable-debug"
+	use debug && myconf="--enable-debug"
 
-	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
+	econf \
+		--with-bdb-includes=$(db_includedir) \
+		--without-qt3 \
+		--without-kde3 \
+		${myconf}
 }
 
 src_install() {
@@ -68,7 +57,7 @@ src_install() {
 		xsim_libp="${D}"usr/$(get_libdir)/xsim/plugins \
 		xsim_binp="${D}"/usr/bin \
 		xsim_etcp="${D}"/etc \
-		install-data install || die "install failed"
+		install-data install || die
 
 	dodoc ChangeLog KNOWNBUG README* TODO
 }