From 315a6f8f2c07788a77684919af1f4757a96443c1 Mon Sep 17 00:00:00 2001 From: Tomas Chvatal Date: Fri, 15 May 2009 11:28:23 +0000 Subject: Revbump to fix bug #269860. Remove not needed patch. Remove old. (Portage version: 2.2_rc33/cvs/Linux x86_64) --- kde-misc/krusader/ChangeLog | 10 +++- kde-misc/krusader/files/actionproperty-qt45.patch | 9 ---- kde-misc/krusader/krusader-1.90.0-r1.ebuild | 60 +++++++++++++++++++++++ kde-misc/krusader/krusader-2.0.0-r1.ebuild | 43 ++++++++++++++++ kde-misc/krusader/krusader-2.0.0.ebuild | 45 ----------------- 5 files changed, 112 insertions(+), 55 deletions(-) delete mode 100644 kde-misc/krusader/files/actionproperty-qt45.patch create mode 100644 kde-misc/krusader/krusader-1.90.0-r1.ebuild create mode 100644 kde-misc/krusader/krusader-2.0.0-r1.ebuild delete mode 100644 kde-misc/krusader/krusader-2.0.0.ebuild (limited to 'kde-misc/krusader') diff --git a/kde-misc/krusader/ChangeLog b/kde-misc/krusader/ChangeLog index 82215ba12dd2..534da09f9b65 100644 --- a/kde-misc/krusader/ChangeLog +++ b/kde-misc/krusader/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-misc/krusader # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/ChangeLog,v 1.82 2009/04/15 18:51:07 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/ChangeLog,v 1.83 2009/05/15 11:28:22 scarabeus Exp $ + +*krusader-2.0.0-r1 (15 May 2009) +*krusader-1.90.0-r1 (15 May 2009) + + 15 May 2009; Tomas Chvatal + -files/actionproperty-qt45.patch, +krusader-1.90.0-r1.ebuild, + -krusader-2.0.0.ebuild, +krusader-2.0.0-r1.ebuild: + Revbump to fix bug #269860. Remove not needed patch. Remove old. 15 Apr 2009; Brent Baude krusader-2.0.0.ebuild: Marking krusader-2.0.0 ~ppc and ~ppc64 as requested by scarabeus diff --git a/kde-misc/krusader/files/actionproperty-qt45.patch b/kde-misc/krusader/files/actionproperty-qt45.patch deleted file mode 100644 index 0c5f8ade7d03..000000000000 --- a/kde-misc/krusader/files/actionproperty-qt45.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- krusader/ActionMan/actionproperty.ui.orig 2009-02-23 14:41:17.000000000 +0100 -+++ krusader/ActionMan/actionproperty.ui 2009-02-23 14:41:22.000000000 +0100 -@@ -1,6 +1,5 @@ - - ActionProperty -- QWidget - - - diff --git a/kde-misc/krusader/krusader-1.90.0-r1.ebuild b/kde-misc/krusader/krusader-1.90.0-r1.ebuild new file mode 100644 index 000000000000..2e3866a5b007 --- /dev/null +++ b/kde-misc/krusader/krusader-1.90.0-r1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-1.90.0-r1.ebuild,v 1.1 2009/05/15 11:28:22 scarabeus Exp $ + +EAPI=1 +inherit kde + +MY_P="${P/_/-}" +S="${WORKDIR}/${MY_P}" + +DESCRIPTION="An advanced twin-panel (commander-style) file-manager for KDE with many extras." +HOMEPAGE="http://krusader.sourceforge.net/" +SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.gz + mirror://gentoo/kde-admindir-3.5.3.tar.bz2" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="javascript kde" + +DEPEND=" + kde? ( + kde-base/libkonq:3.5 + kde-base/kdebase-kioslaves:3.5 + ) + javascript? ( kde-base/kjsembed:3.5 )" +RDEPEND="${DEPEND}" + +need-kde 3.5 + +pkg_postinst() { + echo + elog "For information about additional features and tools such as remote file access, packers," + elog "etc. you may want to use, see \"external-tools\" in /usr/share/doc/${PF}." + echo +} + +src_unpack() { + # Don't use kde_src_unpack or the new admindir updating code + # will reset admindir before the configure.in.bot change is fixed. + unpack ${A} + + # Stupid thing to do, but upstream did it + mv "${S}/admin/configure.in.bot.end" "${S}/configure.in.bot" + + rm -rf "${S}/admin" "${S}/configure" + ln -s "${WORKDIR}/admin" "${S}/admin" +} + +src_compile() { + local myconf="$(use_with kde konqueror) $(use_with javascript) --with-kiotar" + kde_src_compile +} + +src_install() { + kde_src_install + dodoc "${FILESDIR}/external-tools" || die "Installing docs failed." + # remove collisions + rm -rf "${D}/${KDEDIR}/"{$(get_libdir)/kde3/kio_tar.{so,la},share/services/{ar,tar,zip}.protocol} +} diff --git a/kde-misc/krusader/krusader-2.0.0-r1.ebuild b/kde-misc/krusader/krusader-2.0.0-r1.ebuild new file mode 100644 index 000000000000..72d96a5387a1 --- /dev/null +++ b/kde-misc/krusader/krusader-2.0.0-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-2.0.0-r1.ebuild,v 1.1 2009/05/15 11:28:22 scarabeus Exp $ + +EAPI="2" + +KDE_LINGUAS="bg bs ca cs da de el es fr hu it ja ko lt nl pl pt pt_BR ru sk sl +sr sv tr uk zh_CN" +inherit kde4-base + +MY_P="${P/_/-}" + +DESCRIPTION="An advanced twin-panel (commander-style) file-manager for KDE with many extras." +HOMEPAGE="http://krusader.sourceforge.net/" +SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.gz" +LICENSE="GPL-2" + +SLOT="2" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +IUSE="debug doc" + +RDEPEND="" +DEPEND="${RDEPEND} + sys-devel/gettext +" + +PATCHES=( + "${FILESDIR}/2.0.0_beta2-gcc44.patch" +) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + if ! use doc; then + sed -i \ + -e "s:^add_subdirectory([[:space:]]doc[[:space:]]):#nodoc:g" \ + CMakeLists.txt || die "removing docs failed" + fi + sed -i \ + -e "s:set(CMAKE_VERBOSE_MAKEFILE[[:space:]]ON):#NADA:g" \ + CMakeLists.txt # non fatal sed :] + kde4-base_src_prepare +} diff --git a/kde-misc/krusader/krusader-2.0.0.ebuild b/kde-misc/krusader/krusader-2.0.0.ebuild deleted file mode 100644 index 116167ee8032..000000000000 --- a/kde-misc/krusader/krusader-2.0.0.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/krusader/krusader-2.0.0.ebuild,v 1.2 2009/04/15 18:51:07 ranger Exp $ - -EAPI="2" - -KDE_LINGUAS="bg bs ca cs da de el es fr hu it ja ko lt nl pl pt pt_BR ru sk sl -sr sv tr uk zh_CN" -inherit kde4-base - -MY_P="${P/_/-}" - -DESCRIPTION="An advanced twin-panel (commander-style) file-manager for KDE with many extras." -HOMEPAGE="http://krusader.sourceforge.net/" -SRC_URI="mirror://sourceforge/krusader/${MY_P}.tar.gz" -LICENSE="GPL-2" - -SLOT="2" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="debug doc" - -RDEPEND=" - !kde-misc/krusader:0 -" -DEPEND="${RDEPEND} - sys-devel/gettext -" - -PATCHES=( - "${FILESDIR}/2.0.0_beta2-gcc44.patch" -) - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - if ! use doc; then - sed -i \ - -e "s:^add_subdirectory([[:space:]]doc[[:space:]]):#nodoc:g" \ - CMakeLists.txt || die "removing docs failed" - fi - sed -i \ - -e "s:set(CMAKE_VERBOSE_MAKEFILE[[:space:]]ON):#NADA:g" \ - CMakeLists.txt # non fatal sed :] - kde4-base_src_prepare -} -- cgit v1.2.3-65-gdbad