Version bump. Remove old. Use sed magic for CFLAGS cleanup and dump the patch.

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

6 files changed, 23 insertions, 123 deletions

diff --git a/gnome-extra/file-browser-applet/ChangeLog b/gnome-extra/file-browser-applet/ChangeLog
index 4106ea89736b..fd145a4e7cf4 100644
--- a/gnome-extra/file-browser-applet/ChangeLog
+++ b/gnome-extra/file-browser-applet/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-extra/file-browser-applet
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/file-browser-applet/ChangeLog,v 1.16 2010/02/13 15:49:21 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/file-browser-applet/ChangeLog,v 1.17 2010/04/02 04:33:41 serkan Exp $
+
+*file-browser-applet-0.6.6 (02 Apr 2010)
+
+  02 Apr 2010; Serkan Kaba <serkan@gentoo.org
+  -file-browser-applet-0.6.0-r1.ebuild,
+  -files/file-browser-applet-0.6.0-fixautomagic-gtkhotkey.patch,
+  -file-browser-applet-0.6.4.ebuild, file-browser-applet-0.6.5.ebuild,
+  -files/file-browser-applet-0.6.5-cflags.patch,
+  +file-browser-applet-0.6.6.ebuild:
+  Version bump. Remove old. Use sed magic for CFLAGS cleanup and dump the
+  patch.
 
 *file-browser-applet-0.6.5 (13 Feb 2010)
 
diff --git a/gnome-extra/file-browser-applet/file-browser-applet-0.6.0-r1.ebuild b/gnome-extra/file-browser-applet/file-browser-applet-0.6.0-r1.ebuild
deleted file mode 100644
index 091f2115e74e..000000000000
--- a/gnome-extra/file-browser-applet/file-browser-applet-0.6.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/file-browser-applet/file-browser-applet-0.6.0-r1.ebuild,v 1.5 2009/04/20 20:30:48 maekke Exp $
-
-inherit gnome2 cmake-utils
-
-DESCRIPTION="Browse and open files in your home directory from the GNOME panel."
-HOMEPAGE="http://code.google.com/p/gnome-menu-file-browser-applet/"
-SRC_URI="http://gnome-menu-file-browser-applet.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="gtkhotkey"
-
-RDEPEND=">=x11-libs/gtk+-2.14
-	>=gnome-base/gnome-panel-2.0
-	>=gnome-base/libglade-2.0
-	>=dev-libs/glib-2.16
-	gtkhotkey? ( x11-libs/gtkhotkey )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/cmake-2.4.8"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}" || die
-	epatch "${FILESDIR}"/${P}-fixautomagic-gtkhotkey.patch
-	#Move to src_prepare when portage-2.2 is stable.
-}
-
-src_compile() {
-	mycmakeargs="${mycmakeargs} -DCMAKE_INSTALL_GCONF_SCHEMA_DIR=/etc/gconf/schemas"
-	use gtkhotkey || mycmakeargs="${mycmakeargs} -DDISABLE_GTK_HOTKEY=true"
-	cmake-utils_src_compile
-}
-
-src_install() {
-	export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1"
-	cmake-utils_src_install
-	unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-	dodoc HISTORY README || die "dodoc failed"
-}
diff --git a/gnome-extra/file-browser-applet/file-browser-applet-0.6.5.ebuild b/gnome-extra/file-browser-applet/file-browser-applet-0.6.5.ebuild
index b4dde12803d6..6ece9c0c3e8e 100644
--- a/gnome-extra/file-browser-applet/file-browser-applet-0.6.5.ebuild
+++ b/gnome-extra/file-browser-applet/file-browser-applet-0.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/file-browser-applet/file-browser-applet-0.6.5.ebuild,v 1.1 2010/02/13 15:49:21 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/file-browser-applet/file-browser-applet-0.6.5.ebuild,v 1.2 2010/04/02 04:33:41 serkan Exp $
 
 EAPI="2"
 
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.4.8"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-cflags.patch
+	sed -i -e "s/-O3 -g//g" CMakeLists.txt
 }
 
 src_compile() {
diff --git a/gnome-extra/file-browser-applet/file-browser-applet-0.6.4.ebuild b/gnome-extra/file-browser-applet/file-browser-applet-0.6.6.ebuild
index f55df8e3f794..89767afa1890 100644
--- a/gnome-extra/file-browser-applet/file-browser-applet-0.6.4.ebuild
+++ b/gnome-extra/file-browser-applet/file-browser-applet-0.6.6.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/file-browser-applet/file-browser-applet-0.6.4.ebuild,v 1.1 2009/07/02 03:26:54 serkan Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/file-browser-applet/file-browser-applet-0.6.6.ebuild,v 1.1 2010/04/02 04:33:41 serkan Exp $
+
+EAPI="2"
 
 inherit gnome2 cmake-utils
 
-DESCRIPTION="Browse and open files in your home directory from the GNOME panel."
+DESCRIPTION="Browse, open and manage files in your computer directly from the GNOME panel."
 HOMEPAGE="http://code.google.com/p/gnome-menu-file-browser-applet/"
 SRC_URI="http://gnome-menu-file-browser-applet.googlecode.com/files/${P}.tar.gz"
 
@@ -22,6 +24,10 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/cmake-2.4.8"
 
+src_prepare() {
+	sed -i -e "s/-O3 -g//g" CMakeLists.txt
+}
+
 src_compile() {
 	mycmakeargs="${mycmakeargs} -DCMAKE_INSTALL_GCONF_SCHEMA_DIR=/etc/gconf/schemas"
 	mycmakeargs="${mycmakeargs} $(cmake-utils_use_enable gtkhotkey GTK_HOTKEY)"
diff --git a/gnome-extra/file-browser-applet/files/file-browser-applet-0.6.0-fixautomagic-gtkhotkey.patch b/gnome-extra/file-browser-applet/files/file-browser-applet-0.6.0-fixautomagic-gtkhotkey.patch
deleted file mode 100644
index 047d99b53c6d..000000000000
--- a/gnome-extra/file-browser-applet/files/file-browser-applet-0.6.0-fixautomagic-gtkhotkey.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: INSTALL
-===================================================================
---- INSTALL	(revision 159)
-+++ INSTALL	(revision 160)
-@@ -22,13 +22,14 @@
- 
- Configuration
- *************
--There are 5 configuration options available:
-+There are 6 configuration options available:
- 	* CMAKE_INSTALL_PREFIX
- 	* CMAKE_INSTALL_LIB_PREFIX
- 	* CMAKE_INSTALL_LIB_EXEC_DIR
- 	* CMAKE_INSTALL_BONOBO_DIR
- 	* CMAKE_INSTALL_GCONF_SCHEMA_DIR
- 	* CMAKE_INSTALL_GLADEUI_DIR
-+	* DISABLE_GTK_HOTKEY
- 
- CMAKE_INSTALL_PREFIX specifies the base installation prefix. The following
- other specific installation paths depend on this prefix:
-@@ -56,6 +57,9 @@
- CMAKE_INSTALL_BONOBO_DIR specifies the installation bonobo Server file. The
- default is CMAKE_INSTALL_LIB_PREFIX/bonobo/servers
- 
-+DISABLE_GTK_HOTKEY disables the use of libgtkhotkey even if it found by cmake.
-+The default value is false, meaning that if libgtkhotkey is found it will be used.
-+
- To configure using the defaults, run the following command at the project root folder:
- 'cmake .'
- 
-Index: src/CMakeLists.txt
-===================================================================
---- src/CMakeLists.txt	(revision 159)
-+++ src/CMakeLists.txt	(revision 160)
-@@ -1,8 +1,16 @@
- INCLUDE (FindPkgConfig)
- 
- PKG_CHECK_MODULES (DEPS REQUIRED gtk+-2.0>=2.14 gio-unix-2.0 libpanelapplet-2.0 libglade-2.0)
--PKG_CHECK_MODULES (LIBGTKHOTKEY gtkhotkey-1.0)
- 
-+
-+# Clear the cached value of LIBGTKHOTKEY_FOUND
-+SET (LIBGTKHOTKEY_FOUND false)
-+IF (DISABLE_GTK_HOTKEY)
-+	MESSAGE ("\n-- libgtkhotkey disabled.")
-+ELSE (DISABLE_GTK_HOTKEY)
-+	PKG_CHECK_MODULES (LIBGTKHOTKEY gtkhotkey-1.0)
-+ENDIF (DISABLE_GTK_HOTKEY)
-+
- INCLUDE_DIRECTORIES (${DEPS_INCLUDE_DIRS})
- LINK_DIRECTORIES (${DEPS_LIBRARY_DIRS})
- SET (LIBS ${DEPS_LIBRARIES})
-@@ -35,3 +43,8 @@
- TARGET_LINK_LIBRARIES (${EXEC} ${LIBS})
- 
- INSTALL (TARGETS ${EXEC} DESTINATION "${CMAKE_INSTALL_LIB_EXEC_DIR}")
-+
-+# Clear DISABLE_GTK_HOTKEY in the cache so it is reevaluated every time. Sigh!
-+# Have to do it twice or it doesn't work
-+SET (DISABLE_GTK_HOTKEY false CACHE INTERNAL "sigh!")
-+SET (DISABLE_GTK_HOTKEY false CACHE INTERNAL "sigh!")
diff --git a/gnome-extra/file-browser-applet/files/file-browser-applet-0.6.5-cflags.patch b/gnome-extra/file-browser-applet/files/file-browser-applet-0.6.5-cflags.patch
deleted file mode 100644
index f6e0ef1053d1..000000000000
--- a/gnome-extra/file-browser-applet/files/file-browser-applet-0.6.5-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur file-browser-applet-0.6.5/CMakeLists.txt file-browser-applet-0.6.5_patched/CMakeLists.txt
---- file-browser-applet-0.6.5/CMakeLists.txt	2009-12-21 19:42:30.000000000 +0200
-+++ file-browser-applet-0.6.5_patched/CMakeLists.txt	2010-02-13 17:40:46.000000000 +0200
-@@ -3,7 +3,7 @@
- PROJECT (FILE_BROWSER_APPLET C)
- 
- #compiler flags
--SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -g -Wall -ansi")
-+SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -ansi")
- SET (EXEC file-browser-applet)
- 
- #install path options