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

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

9 files changed, 114 insertions, 261 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/Manifest b/kde-misc/kgtk/Manifest
index 828aafee9428..880f8625554c 100644
--- a/kde-misc/kgtk/Manifest
+++ b/kde-misc/kgtk/Manifest
@@ -1,10 +1,6 @@
+AUX 0.10.0-kde4.patch 719 RMD160 48ef1796cb872b30f1d0632518f26e929410503d SHA1 88d363437f18a980eedaa878345eb317100573a0 SHA256 b5c7e3e6cf0232aa3fa0ca148e25c45ee0ed324cbf8bafac3a750fd3546f1e6b
+AUX 0.10.0-open_mode.patch 402 RMD160 e0ffb46cd825dc55a836439eff7beec7660683c8 SHA1 9d0f9e12a8e10e3139fe73f98658421d0ed51e51 SHA256 d098dba0b4ceff3e69a5edd1f9ca6140788715a48f1904bf726153fd225d968a
 DIST KGtk-0.10.0.tar.bz2 44139 RMD160 56c2c5f90927277d911391beb8d6197f517e5d47 SHA1 6dd77aa3177aeaf8ed32c62a38dca8db9d9b6c0f SHA256 a47dc15ab18526536b9fa2401ab2b5a08412580c367af720896311a4a98318b0
-DIST KGtk-0.9.1.tar.bz2 38889 RMD160 153148af1a86b1fc3df77089026fb8ba6e9df63a SHA1 96f64e233fbc4c1d9114cf8eb08093a255afb202 SHA256 90ffbd4bbd74b82b5a11a9414a1f0cb921a1f51149527b843f746432f5609b40
-DIST KGtk-0.9.4.tar.bz2 42300 RMD160 b5efa09047b1e8fdd18121b86e78fa749df656c0 SHA1 f9aaa174a2ec923e06f8c259da595cec5ff16eb0 SHA256 2de639a711aad962aac6eb55b6e974c34fa9c68971a825c0c2c6b1d020bc777f
-DIST KGtk-0.9.5.tar.bz2 43622 RMD160 e71b6565f387d98f1892d758af91ed065d35e007 SHA1 7086ea569389776794a8fcdef5cbc5596ed86ddf SHA256 2b825dd59191343bc02fe6624d2346363495d52255ebec5a15263a47766898ed
-EBUILD kgtk-0.10.0.ebuild 1687 RMD160 2e53bcfdcd0d28247765539f199a1a3d499710b0 SHA1 b44fb3bb41bb689fdce6ff3df454dc1275091849 SHA256 fdf1769731ab690c23ab1dca4aacc6066362df41a5916297205d77a3451d082d
-EBUILD kgtk-0.9.1-r1.ebuild 1651 RMD160 7177af257871a2e5a93fcb303fe319d098f6d2cd SHA1 eb679fee81e40e02a53f1ef5ee48ebfac2fd0586 SHA256 cdcf6c975581f1ce85a25029b4543bf5f7fceabef47600797485e740ebf2cf9a
-EBUILD kgtk-0.9.4.ebuild 1680 RMD160 766bfec19d10666b4d12500b1634e16973d2fd6d SHA1 9f763d3781784bd4140c1723b8c0efd904da192a SHA256 c265cdc47fee717e6272eb3287a821619942d4f607c8fd19774001d0b7d623df
-EBUILD kgtk-0.9.5.ebuild 1678 RMD160 fb9a04a7e5f5905f67a37d5e2dbe7bec6246a523 SHA1 51958cc3d54892de169cd97e906ff16b1fddc735 SHA256 528688ecde129944658e16f9e6ed3e40b7d4ad8992d9e3e540bab5c323245af2
-MISC ChangeLog 2597 RMD160 6b0fa89f25d382f59d3638388f95584843163bb9 SHA1 8f5607626a6a2ba4fc970c51330fd896c381e22f SHA256 62956bf220dee4fc7ffbd440e529f45a946b132b10d17ade881fdd5de7423537
+EBUILD kgtk-0.10.0-r1.ebuild 2050 RMD160 1ec7565c97c8172a3b834ebac2c5109b07c4507f SHA1 95b3408fdf6dc6b57d2299a83d6ad42f8d5272ce SHA256 69bdf3dca4be3b336bd1c31af6118912f22bb318090676aa28e40ff87b19df4e
+MISC ChangeLog 2976 RMD160 3f230b50914a00bc62e03f2e4ca6bbd6036881e2 SHA1 b439ca87746316571f52152516e9dae31f11879a SHA256 04bf8543006d031fd5ca9221c1868ee0ca9b15e7ede29b2ac2ba252900ce7763
 MISC metadata.xml 227 RMD160 8f1a760375a8e55689e5bc336684eb2a0a1359ed SHA1 dc84bfe01b6e845c77d5f26b9bc588904315b161 SHA256 e082e24d9d4d2f8a5a431ae131f9521749796f3888329160e106c456f257bc36
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"
-}