Remove KDE3 support.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

4 files changed, 23 insertions, 178 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/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
 }