version bump, remove old

(Portage version: 2.2.0_alpha195/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

5 files changed, 13 insertions, 102 deletions

diff --git a/xfce-extra/xfce4-whiskermenu-plugin/ChangeLog b/xfce-extra/xfce4-whiskermenu-plugin/ChangeLog
index 7a5cd2d3c0c6..a0a93a7e259e 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/ChangeLog
+++ b/xfce-extra/xfce4-whiskermenu-plugin/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for xfce-extra/xfce4-whiskermenu-plugin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-whiskermenu-plugin/ChangeLog,v 1.2 2013/07/28 08:51:15 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-whiskermenu-plugin/ChangeLog,v 1.3 2013/08/08 19:37:40 hasufell Exp $
+
+*xfce4-whiskermenu-plugin-1.1.1 (08 Aug 2013)
+
+  08 Aug 2013; Julian Ospald <hasufell@gentoo.org>
+  -xfce4-whiskermenu-plugin-1.0.3.ebuild,
+  -files/xfce4-whiskermenu-plugin-1.0.3-Werror.patch,
+  -files/xfce4-whiskermenu-plugin-1.0.3-ldflags.patch,
+  -files/xfce4-whiskermenu-plugin-1.0.3-reorder-flags.patch,
+  +xfce4-whiskermenu-plugin-1.1.1.ebuild:
+  version bump, remove old
 
 *xfce4-whiskermenu-plugin-1.1.0 (28 Jul 2013)
 
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/files/xfce4-whiskermenu-plugin-1.0.3-Werror.patch b/xfce-extra/xfce4-whiskermenu-plugin/files/xfce4-whiskermenu-plugin-1.0.3-Werror.patch
deleted file mode 100644
index 619bb198988c..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/files/xfce4-whiskermenu-plugin-1.0.3-Werror.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-commit 51c0306de3640777fe9d5c6ab492d923c769310d
-Author: hasufell <hasufell@gentoo.org>
-Date:   Thu Jul 18 13:56:22 2013 +0200
-
-    BUILD: make -Werror optional
-    
-    "-Werror" can break the build in so many ways that it
-    should only be used for development or if it's a specific
-    "-Werror=foo" flag.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0c4f5c..d52a46c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -5,6 +5,9 @@ endif()
- 
- project(whiskermenu)
- 
-+# options
-+option(ENABLE_WERROR "Enable -Werror flag for development" OFF)
-+
- if(NOT DEFINED LIB_INSTALL_DIR)
-     if (DEFINED CMAKE_INSTALL_LIBDIR)
-         set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index bcc2a97..26972af 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,4 +1,7 @@
--set(WHISKERMENU_FLAGS "-Wall -Wextra -Werror")
-+set(WHISKERMENU_FLAGS "-Wall -Wextra")
-+if(ENABLE_WERROR)
-+	set(WHISKERMENU_FLAGS "${WHISKERMENU_FLAGS} -Werror")
-+endif()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WHISKERMENU_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -std=c++0x ${WHISKERMENU_FLAGS}")
- set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed")
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/files/xfce4-whiskermenu-plugin-1.0.3-ldflags.patch b/xfce-extra/xfce4-whiskermenu-plugin/files/xfce4-whiskermenu-plugin-1.0.3-ldflags.patch
deleted file mode 100644
index e816ea000c03..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/files/xfce4-whiskermenu-plugin-1.0.3-ldflags.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit b5d340799db947dc096f4d56c3ea6edb1f453782
-Author: hasufell <hasufell@gentoo.org>
-Date:   Thu Jul 18 13:58:22 2013 +0200
-
-    BUILD: don't overwrite env ldflags and make as-needed optional
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d52a46c..0d375ec 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,6 +7,7 @@ project(whiskermenu)
- 
- # options
- option(ENABLE_WERROR "Enable -Werror flag for development" OFF)
-+option(ENABLE_AS_NEEDED "Enable -Wl,--as-needed for the linker" ON)
- 
- if(NOT DEFINED LIB_INSTALL_DIR)
-     if (DEFINED CMAKE_INSTALL_LIBDIR)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 26972af..dc563c0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -4,7 +4,9 @@ if(ENABLE_WERROR)
- endif()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WHISKERMENU_FLAGS}")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -std=c++0x ${WHISKERMENU_FLAGS}")
--set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed")
-+if(ENABLE_AS_NEEDED)
-+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
-+endif()
- 
- find_package(GTK2 REQUIRED)
- find_package(PkgConfig REQUIRED)
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/files/xfce4-whiskermenu-plugin-1.0.3-reorder-flags.patch b/xfce-extra/xfce4-whiskermenu-plugin/files/xfce4-whiskermenu-plugin-1.0.3-reorder-flags.patch
deleted file mode 100644
index 426766682a88..000000000000
--- a/xfce-extra/xfce4-whiskermenu-plugin/files/xfce4-whiskermenu-plugin-1.0.3-reorder-flags.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 3d9a07845ffca3f5c5ae542d58912f3970542b61
-Author: hasufell <hasufell@gentoo.org>
-Date:   Thu Jul 18 14:03:48 2013 +0200
-
-    BUILD: reorder flags
-    
-    This enables environment overrides without the need
-    for patching such as "-fno-visibility=hidden".
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index dc563c0..f75d8ab 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -3,9 +3,9 @@ if(ENABLE_WERROR)
- 	set(WHISKERMENU_FLAGS "${WHISKERMENU_FLAGS} -Werror")
- endif()
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WHISKERMENU_FLAGS}")
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -std=c++0x ${WHISKERMENU_FLAGS}")
-+set(CMAKE_CXX_FLAGS "-fvisibility=hidden -std=c++0x ${WHISKERMENU_FLAGS} ${CMAKE_CXX_FLAGS}")
- if(ENABLE_AS_NEEDED)
--	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
-+	set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed ${CMAKE_SHARED_LINKER_FLAGS}")
- endif()
- 
- find_package(GTK2 REQUIRED)
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.0.3.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.1.1.ebuild
index fc5fbb26e9b3..824e7a201348 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.0.3.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.0.3.ebuild,v 1.1 2013/07/18 12:56:08 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.1.1.ebuild,v 1.1 2013/08/08 19:37:40 hasufell Exp $
 
 EAPI=5
 
-inherit eutils gnome2-utils cmake-utils
+inherit gnome2-utils cmake-utils
 
 DESCRIPTION="Alternate application launcher for Xfce"
 HOMEPAGE="http://gottcode.org/xfce4-whiskermenu-plugin/"
@@ -28,10 +28,6 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext"
 
 src_prepare() {
-	# merged upstream
-	# https://github.com/gottcode/xfce4-whiskermenu-plugin/pull/18
-	epatch "${FILESDIR}"/${P}-{Werror,ldflags,reorder-flags}.patch
-
 	local i
 	if [[ -n "${LINGUAS+x}" ]] ; then
 		for i in $(grep add_subdirectory po/CMakeLists.txt | sed 's/add_subdirectory(//;s/)$//') ; do