Fix FORTIFY_SOURCE=2 issues. Add kde4 support. Use cmake-utils for now. Remove old buggy. Bugs #257495 and #261276.

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

8 files changed, 110 insertions, 253 deletions

diff --git a/kde-misc/kgtk/ChangeLog b/kde-misc/kgtk/ChangeLog
index 784e24a6b040..519b8508a398 100644
--- a/kde-misc/kgtk/ChangeLog
+++ b/kde-misc/kgtk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-misc/kgtk
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/ChangeLog,v 1.16 2008/08/23 12:14:12 carlo Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/ChangeLog,v 1.17 2009/03/11 21:58:58 scarabeus Exp $
+
+*kgtk-0.10.0-r1 (11 Mar 2009)
+
+  11 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
+  +files/0.10.0-kde4.patch, +files/0.10.0-open_mode.patch,
+  -kgtk-0.9.1-r1.ebuild, -kgtk-0.9.4.ebuild, -kgtk-0.9.5.ebuild,
+  -kgtk-0.10.0.ebuild, +kgtk-0.10.0-r1.ebuild:
+  Fix FORTIFY_SOURCE=2 issues. Add kde4 support. Use cmake-utils for now.
+  Remove old buggy. Bugs #261276 and #257495.
 
   23 Aug 2008; Carsten Lohrke <carlo@gentoo.org> kgtk-0.10.0.ebuild:
   Adjust CMake dependency, bug #233300.
diff --git a/kde-misc/kgtk/files/0.10.0-kde4.patch b/kde-misc/kgtk/files/0.10.0-kde4.patch
new file mode 100644
index 000000000000..2f8ea36e3527
--- /dev/null
+++ b/kde-misc/kgtk/files/0.10.0-kde4.patch
@@ -0,0 +1,11 @@
+--- kdialogd4/kdialogd.cpp.orig	2009-02-03 19:49:03.000000000 +0500
++++ kdialogd4/kdialogd.cpp	2009-02-03 19:49:17.000000000 +0500
+@@ -391,7 +391,7 @@
+     // * the dir select dialog doesnt seem to set the QDialog result parameter
+     //   when it is accepted - so for this reason if ok is clicked we store an
+     //   'accepted' value there, and check for that after the dialog is finished.
+-    kDebug() << "finished " << (int)itsDlg << itsAccepted << (itsDlg ? QDialog::Accepted==itsDlg->result() : false);
++    kDebug() << "finished " << itsDlg << itsAccepted << (itsDlg ? QDialog::Accepted==itsDlg->result() : false);
+ 
+     if(itsDlg && !(itsAccepted || QDialog::Accepted==itsDlg->result()))
+         cancel();
diff --git a/kde-misc/kgtk/files/0.10.0-open_mode.patch b/kde-misc/kgtk/files/0.10.0-open_mode.patch
new file mode 100644
index 000000000000..1c351e731fb6
--- /dev/null
+++ b/kde-misc/kgtk/files/0.10.0-open_mode.patch
@@ -0,0 +1,11 @@
+--- common/common.h	2008-07-08 12:58:27.000000000 +0000
++++ common/common.h	2009-03-11 21:35:23.000000000 +0000
+@@ -205,7 +205,7 @@
+ {
+     do
+     {
+-        lockFd=open(getLockName(), O_WRONLY | O_CREAT | O_EXCL);
++        lockFd=open(getLockName(), O_WRONLY | O_CREAT | O_EXCL, 0644);
+         if (lockFd<0 && errno==EEXIST)
+         {
+             /* Hmm, lock file already exists. Is it stale? */
diff --git a/kde-misc/kgtk/kgtk-0.10.0-r1.ebuild b/kde-misc/kgtk/kgtk-0.10.0-r1.ebuild
new file mode 100644
index 000000000000..bcc61a9b8668
--- /dev/null
+++ b/kde-misc/kgtk/kgtk-0.10.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/kgtk-0.10.0-r1.ebuild,v 1.1 2009/03/11 21:58:58 scarabeus Exp $
+
+EAPI="2"
+
+NEED_KDE="none"
+inherit kde4-base
+
+DESCRIPTION="Allows *some* Gtk, Qt3, and Qt4 applications to use KDE's file dialogs when run under KDE"
+HOMEPAGE="http://www.kde-apps.org/content/show.php?content=36077"
+SRC_URI="http://home.freeuk.com/cpdrummond/KGtk-${PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="qt3 +qt4"
+
+DEPEND="
+	x11-libs/gtk+:2
+	qt4? (
+		x11-libs/qt-gui:4
+		>=kde-base/kdebase-startkde-4.2.0
+	)
+	qt3? (
+		x11-libs/qt:3
+		|| ( kde-base/kdebase:3.5  kde-base/kdebase-startkde:3.5 )
+	)
+	!qt3? (
+		x11-libs/qt-gui:4
+		>=kde-base/kdebase-startkde-4.2.0
+	)
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/KGtk-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PV}-open_mode.patch"
+	"${FILESDIR}/${PV}-kde4.patch"
+)
+
+src_configure() {
+	if use qt3 && use qt4 ; then
+		elog "You enabled both qt3 and qt4 useflags. Please pick only one you want."
+		elog "qt3 flag will be suppressed in favor of qt4."
+	fi
+	if use qt3 ; then
+		if ! use qt4 ; then
+			einfo "Building kgtk with KDE3 support."
+			# override prefix (dont let kdeprefix handle it)
+			PREFIX="/usr"
+			mycmakeargs="-DKGTK_KDE3=true -DKGTK_QT3=true -DKGTK_GTK2=true"
+		fi
+	fi
+	if use qt4 ; then
+		einfo "Buiding kgtk with KDE4 support."
+		mycmakeargs="-DKGTK_KDE4=true -DKGTK_QT4=true -DKGTK_GTK2=true"
+	elif ! use qt3 ; then
+		einfo "Buiding kgtk with KDE4 support."
+		mycmakeargs="-DKGTK_KDE4=true -DKGTK_QT4=true -DKGTK_GTK2=true"
+	fi
+	kde4-base_src_configure
+}
+
+src_install() {
+	dodoc ${S}/{AUTHORS,ChangeLog,TODO,README}
+}
+
+pkg_postinst() {
+	elog "To see the kde-file-selector in a gtk-application, just do:"
+	elog "cd /usr/local/bin"
+	elog "ln -s /usr/bin/kgtk-wrapper application(eg. firefox)"
+	elog "Make sure that /usr/local/bin is before /usr/bin in your \$PATH"
+	elog
+	elog "You need to restart kde and be sure to change your symlinks to non-.sh"
+}
diff --git a/kde-misc/kgtk/kgtk-0.10.0.ebuild b/kde-misc/kgtk/kgtk-0.10.0.ebuild
deleted file mode 100644
index 44c76cc08bba..000000000000
--- a/kde-misc/kgtk/kgtk-0.10.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/kgtk-0.10.0.ebuild,v 1.2 2008/08/23 12:14:12 carlo Exp $
-
-ARTS_REQUIRED="never"
-EAPI="1"
-inherit kde
-
-DESCRIPTION="Allows *some* Gtk, Qt3, and Qt4 applications to use KDE's file dialogs when run under KDE"
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=36077"
-SRC_URI="http://home.freeuk.com/cpdrummond/KGtk-${PV}.tar.bz2"
-S=$WORKDIR/KGtk-$PV
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="qt4"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	qt4? ( || ( x11-libs/qt-gui:4 x11-libs/qt:4 ) )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.8"
-need-kde 3.5
-
-src_compile() {
-	mkdir -p "${S}/build" && cd "${S}/build"
-	cmake \
-		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-		.. || die "cmake (configure) failed"
-	emake || die "emake failed"
-
-	if use qt4; then
-		mkdir -p "${S}/build4" && cd "${S}/build4"
-		cmake \
-			-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-			-DKGTK_QT4=true -DKGTK_GTK2=false \
-			.. || die "cmake (configure) failed"
-		emake || die "emake failed"
-
-	fi
-}
-
-src_install() {
-	cd "${S}/build"
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	if use qt4; then
-		cd "${S}/build4"
-		emake install DESTDIR="${D}" || die "make install failed"
-	fi
-
-	dodoc ../{AUTHORS,ChangeLog,TODO,README}
-}
-
-pkg_postinst() {
-	elog "To see the kde-file-selector in a gtk-application, just do:"
-	elog "cd /usr/local/bin"
-	elog "ln -s /usr/bin/kgtk-wrapper application(eg. firefox)"
-	elog "Make sure that /usr/local/bin is before /usr/bin in your \$PATH"
-	elog
-	elog "You need to restart kde and be sure to change your symlinks to non-.sh"
-}
diff --git a/kde-misc/kgtk/kgtk-0.9.1-r1.ebuild b/kde-misc/kgtk/kgtk-0.9.1-r1.ebuild
deleted file mode 100644
index 615d92869b81..000000000000
--- a/kde-misc/kgtk/kgtk-0.9.1-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/kgtk-0.9.1-r1.ebuild,v 1.3 2008/05/27 01:04:02 halcy0n Exp $
-
-ARTS_REQUIRED="never"
-inherit kde
-
-DESCRIPTION="Allows *some* Gtk, Qt3, and Qt4 applications to use KDE's file dialogs when run under KDE"
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=36077"
-SRC_URI="http://home.freeuk.com/cpdrummond/KGtk-${PV}.tar.bz2"
-S=$WORKDIR/KGtk-$PV
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="qt4"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	qt4? ( =x11-libs/qt-4* )"
-
-DEPEND="${RDEPEND}
-	dev-util/cmake"
-need-kde 3.4
-
-src_compile() {
-	mkdir -p "${S}/build" && cd "${S}/build"
-	cmake \
-		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-		.. || die "cmake (configure) failed"
-	emake || die "emake failed"
-
-	if use qt4; then
-		mkdir -p "${S}/build4" && cd "${S}/build4"
-		cmake \
-			-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-			-DKGTK_QT4=true -DKGTK_GTK2=false \
-			.. || die "cmake (configure) failed"
-		emake || die "emake failed"
-
-	fi
-}
-
-src_install() {
-	cd "${S}/build"
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	if use qt4; then
-		cd "${S}/build4"
-		emake install DESTDIR="${D}" || die "make install failed"
-	fi
-
-	dodoc ../{AUTHORS,ChangeLog,TODO,README}
-}
-
-pkg_postinst() {
-	elog "To see the kde-file-selector in a gtk-application, just do:"
-	elog "cd /usr/local/bin"
-	elog "ln -s /usr/bin/kgtk-wrapper application(eg. firefox)"
-	elog "Make sure that /usr/local/bin is before /usr/bin in your \$PATH"
-	elog
-	elog "You need to restart kde and be sure to change your symlinks to non-.sh"
-}
diff --git a/kde-misc/kgtk/kgtk-0.9.4.ebuild b/kde-misc/kgtk/kgtk-0.9.4.ebuild
deleted file mode 100644
index 40528127e630..000000000000
--- a/kde-misc/kgtk/kgtk-0.9.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/kgtk-0.9.4.ebuild,v 1.3 2008/05/27 01:04:02 halcy0n Exp $
-
-ARTS_REQUIRED="never"
-EAPI="1"
-inherit kde
-
-DESCRIPTION="Allows *some* Gtk, Qt3, and Qt4 applications to use KDE's file dialogs when run under KDE"
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=36077"
-SRC_URI="http://home.freeuk.com/cpdrummond/KGtk-${PV}.tar.bz2"
-S=$WORKDIR/KGtk-$PV
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="qt4"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	qt4? ( || ( x11-libs/qt-gui:4 x11-libs/qt:4 ) )"
-
-DEPEND="${RDEPEND}
-	dev-util/cmake"
-need-kde 3.4
-
-src_compile() {
-	mkdir -p "${S}/build" && cd "${S}/build"
-	cmake \
-		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-		.. || die "cmake (configure) failed"
-	emake || die "emake failed"
-
-	if use qt4; then
-		mkdir -p "${S}/build4" && cd "${S}/build4"
-		cmake \
-			-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-			-DKGTK_QT4=true -DKGTK_GTK2=false \
-			.. || die "cmake (configure) failed"
-		emake || die "emake failed"
-
-	fi
-}
-
-src_install() {
-	cd "${S}/build"
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	if use qt4; then
-		cd "${S}/build4"
-		emake install DESTDIR="${D}" || die "make install failed"
-	fi
-
-	dodoc ../{AUTHORS,ChangeLog,TODO,README}
-}
-
-pkg_postinst() {
-	elog "To see the kde-file-selector in a gtk-application, just do:"
-	elog "cd /usr/local/bin"
-	elog "ln -s /usr/bin/kgtk-wrapper application(eg. firefox)"
-	elog "Make sure that /usr/local/bin is before /usr/bin in your \$PATH"
-	elog
-	elog "You need to restart kde and be sure to change your symlinks to non-.sh"
-}
diff --git a/kde-misc/kgtk/kgtk-0.9.5.ebuild b/kde-misc/kgtk/kgtk-0.9.5.ebuild
deleted file mode 100644
index 16f0ac7da1a5..000000000000
--- a/kde-misc/kgtk/kgtk-0.9.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/kgtk-0.9.5.ebuild,v 1.1 2008/06/08 23:50:30 carlo Exp $
-
-ARTS_REQUIRED="never"
-EAPI="1"
-inherit kde
-
-DESCRIPTION="Allows *some* Gtk, Qt3, and Qt4 applications to use KDE's file dialogs when run under KDE"
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=36077"
-SRC_URI="http://home.freeuk.com/cpdrummond/KGtk-${PV}.tar.bz2"
-S=$WORKDIR/KGtk-$PV
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="qt4"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	qt4? ( || ( x11-libs/qt-gui:4 x11-libs/qt:4 ) )"
-
-DEPEND="${RDEPEND}
-	dev-util/cmake"
-need-kde 3.4
-
-src_compile() {
-	mkdir -p "${S}/build" && cd "${S}/build"
-	cmake \
-		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-		.. || die "cmake (configure) failed"
-	emake || die "emake failed"
-
-	if use qt4; then
-		mkdir -p "${S}/build4" && cd "${S}/build4"
-		cmake \
-			-DCMAKE_INSTALL_PREFIX:PATH=/usr \
-			-DKGTK_QT4=true -DKGTK_GTK2=false \
-			.. || die "cmake (configure) failed"
-		emake || die "emake failed"
-
-	fi
-}
-
-src_install() {
-	cd "${S}/build"
-	emake install DESTDIR="${D}" || die "make install failed"
-
-	if use qt4; then
-		cd "${S}/build4"
-		emake install DESTDIR="${D}" || die "make install failed"
-	fi
-
-	dodoc ../{AUTHORS,ChangeLog,TODO,README}
-}
-
-pkg_postinst() {
-	elog "To see the kde-file-selector in a gtk-application, just do:"
-	elog "cd /usr/local/bin"
-	elog "ln -s /usr/bin/kgtk-wrapper application(eg. firefox)"
-	elog "Make sure that /usr/local/bin is before /usr/bin in your \$PATH"
-	elog
-	elog "You need to restart kde and be sure to change your symlinks to non-.sh"
-}