version bump, remove old

Package-Manager: portage-2.2.0_alpha195/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

6 files changed, 23 insertions, 115 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/Manifest b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
index f51c9e9ae72c..33df8504ad4f 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/Manifest
+++ b/xfce-extra/xfce4-whiskermenu-plugin/Manifest
@@ -1,23 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xfce4-whiskermenu-plugin-1.0.3-Werror.patch 1207 SHA256 7e4f504141e2f17252e079f416516c7168b88eb402ad484232e9a057532c7bfa SHA512 5bf187c0dfc3ee131331dbadb8f14f6a33ef59e59c93404aec1eb10a39646d41dbc33d533c4513bc9da953837ccd85d57c08042dc1656ef5908f83aed1300326 WHIRLPOOL 7ff61bdfb1493fa8b886b5c9fac85ab1582fd9c9f42f775c45654f69c43a731983087c59e0c0ce6718a1453ca1516aab1155d7ad0d911380cbd10547a5d308c0
-AUX xfce4-whiskermenu-plugin-1.0.3-ldflags.patch 1127 SHA256 b7fb302436892ce949bfc007fa0844479aee0e7d81dcc3d445e5ed007d989cc6 SHA512 1f0ab6524f961afaee47984a4e930029c8218b4ba2161947efff637aaadf9d5e70afe4b44c4ef966a882d03bf588d59baf2520a92b98362bd0b98419fa5e57a4 WHIRLPOOL 09f32041e29b0c5ad8c6cfbb019d08444d4045a82154d2d490aae259f4e3e06c6b2b9a1b7aaa5b6b052b940006bf9e319a0c2ab08f8ac76b1c552a033ecdc4e6
-AUX xfce4-whiskermenu-plugin-1.0.3-reorder-flags.patch 969 SHA256 3bb2cbc19bdc7d90a7ee62d1f896b1551317c8903f81a93b8504cbe63a819936 SHA512 6a6e00325c739a4fd2522c2565e0e04404ad0f7f82a7d1b5f05e1e6ebd88fbcbb989e963ce09b06daf501382528aaf42fb507a3c432bc5a1437937520e9ce8c2 WHIRLPOOL 4f9349d4fddd8a9b3fb830210946bceb02381e2a69966d8e4f281fb415871dd468b434f353a5d2e847e34db4e58c07da99ad5a1f40814cf3e9ecf968fd04f5c3
-DIST xfce4-whiskermenu-plugin-1.0.3-src.tar.bz2 71043 SHA256 50ec9a0d718095ae04b3ac862f36b0a8ea3fdf14f430d14404c56846af730c63 SHA512 ebc362ebe2df1f8516611dc530a44ad7d56b355a21e94e2c526cb72d5ee3489bc29f67ab0a3f83dbb14392c56df9500a2fa4f35e8045cee1d5eb1ae4c3f98c63 WHIRLPOOL 595da98a53cbe83d0fb625c5aff7bc00d71f7fe3d2f32144a01d274a6b45dfe54da6aabae17cde328eea23692ea26762c6ebe35d28b8d1b1ba127af79fed341a
 DIST xfce4-whiskermenu-plugin-1.1.0-src.tar.bz2 88397 SHA256 5b996d9579c767c1a93b955131d07c9ef4109b0114268727be696e06abbb2596 SHA512 9374b48ae2f322052cbd896bf7cd71c63119b0ad8a95ad3c85d818b203fd60d0f1701356794f6ec036595311faece560114608ce588f945a2067f234ce8fbd1f WHIRLPOOL 21feaec5fe9bdab55749e3cf82557b293a2024b4e6cea4cf863a38266f28b76ed2bedbd8faec459ea6de6ba9ab6b181ad3442e5a3a766809519f99dddef82589
-EBUILD xfce4-whiskermenu-plugin-1.0.3.ebuild 1498 SHA256 76cf51a929f728debf215871601e677021333cd9317a3ba74d210699baa00400 SHA512 3c711b29f060cabfe69b7a37382e5eb59286f434d751109945d21a2a03e7b037bdd1d9636983014198c29bb4dbd973c2c25b4df351f4cea3d8c652f6b3429d1c WHIRLPOOL e9be91fe94b5462ceaedae6fb0e8731f55cba833d91a451f7945686e598c88b88066cd80c2b711fbe0c797fa495f5c13f1fd5a252d9869cf5ec01abdd16637e1
+DIST xfce4-whiskermenu-plugin-1.1.1-src.tar.bz2 91002 SHA256 cfb86e9604c58a4657149950bfb693600a364ce4d64e4100c72bda489385dead SHA512 5b98398b7886f1cbf5f3239dab1090eb7739c1e4a85902ab92257a87c74f1967db34154e03c4d6a0e261672b6c58ad4ab10d4729d925c32214389724aa39d56d WHIRLPOOL c6a7adaa1ace131643942acf472b797943c7aedb31c015fec9ce97db758dcf6464fc9ac2b49217e2a9b455891ec8b836ac8445849ba79b40252baf972a1566a7
 EBUILD xfce4-whiskermenu-plugin-1.1.0.ebuild 1343 SHA256 fb0bb255d307d6fa007bc329c58a17ec7ea75fd4df8a16fe48dd2046a1b99b3f SHA512 f968ea57b56a1e1845f4d5c38609b8acfbea897343bbd9c7352a395da3c8bbd6a544c30fc13084f6380e1dbff6fad85630addf9267f77a02214785bad05568fc WHIRLPOOL 5771437b8efc3ffcb9cc5613ff1ccd6b67fcd5e66c0b015275e82dc1d1a8db7232dd5897e50ee71bd3ed99ce91d54affdef841ff88d0fe7af2781be9edecae54
-MISC ChangeLog 756 SHA256 217543157f9285e8b86c9d231d1f639442cbb471c7f9537f8ec7f7548d159ae2 SHA512 9c9116ce7035302b21534d7e192d0b5b339a1822ef6d708d6d491873d6434596410db8e9513a39240adf11b975be29949967b9cd84a51064d19192877b183afd WHIRLPOOL 5c729874752551ed71d92ac5f2311f8b051a75b843e8ae56c756488dfcafb6dc088d04db5f2fb6b20a67c98813f85039dbd687b96dbd2d822161d2b9d49a5434
+EBUILD xfce4-whiskermenu-plugin-1.1.1.ebuild 1343 SHA256 59a90f273e711d3428367411c3d658c1b19090a799838fcd695f4286a08083a8 SHA512 06bf0a784805280a6e49a6981b34b2fa480ce7a32b9aa19677cb281c69f0ea264b4ded2776959ab855da2c3b60ad4ed60433311d7f9800c1bf4ca4b3dca1d36e WHIRLPOOL a2e4d09a11c53ab29aef8cd7bbb4d6599dc1ee4ba048d1efb6aef4f913bf57694393acb19dc871a41a458252932ffeed67bcb7ec9a787464b769a1e466da5fe2
+MISC ChangeLog 1136 SHA256 ca8ab87cabb2842ec5739f854e29b2a5a73b0c45b879c1d64dd7868034661ce6 SHA512 5ff323c4cbfe64b7aef60fcbf17f8444d584cdf8dea525a6c888083572912dfd8cc0da8c86b0a5c2ebc4446c2f1770fd1c7f0f668d8ad2fede76c391eff3a53e WHIRLPOOL 98da1c40c0a922780464500ff97657f3fe06b26b602d488486cfe2094bfa0e5918140104f3e4433195ead3be4e6c910f53a0d9b16c23fa9c77cadb687ee56337
 MISC metadata.xml 1879 SHA256 18746465151db9381360076e6542159802db3b37e2151f7b2bc21dd4fe67e16d SHA512 ed25416c25ffa9219ee91ddfb918fcda49b869042e788300da365342054449ee14d542e5ceb07089d5bc03a366fcbd299d394ab129ea8ce8ae41ae892c748bc6 WHIRLPOOL 4413a6d7444cd1840b35618fce375c85f3622e1872dfeafe476bc867d8e57161dccd2d18722f13eb787bb512a7dd9b05049f1140d981d1a9ea9a72245963bf45
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR9OmRAAoJEFpvPKfnPDWzHXoH/1oUWM5O6hGGCZsX6fyyhn2X
-nnN4cy9WDa0bSKLvvn618agnTKpIFAG7tdKMVMsIop+k9dhWHHM0mM7oSO5gBtPP
-/DOlgYNo3GD1rKvOBmfSIeonCSsM9iY8m6lArB9h18gTPRL4djtghPT9ENACjaHM
-5A4mmWfIgP8+5XronJP3/tl3w/kHXbmsZVbu1Rl6P4rDz5WFWgEyCILbmMOlKQt5
-K+m/XOW/dUqVReorNDVtVqoDY3zCKIG0VgNFaf2YKnMjNGtfqHVR7y9lHIO+7T4F
-J2CU5ICm4YFcVIRneDK+9H3GEhIlaO+j6yWuN2/gYBLc1qXNeC3MFw6xqCfpWgI=
-=Ohag
+iQEcBAEBCAAGBQJSA/OIAAoJEFpvPKfnPDWzz9gH/1KhcFoTWweRuIN5gWb9ATCo
+SItjQWklmGM41H0EEeI+eQ9UazjuryhuECL5+iAYI1bMIHQTa6DPFt/6SIPg5PUK
+QiX1y4VjTJYJfs1JrCQoIcTKkvANctLJTDeE83+FPokQcqsPj8apyTBtdXh3KiDz
+U8E0Y30H15DStaTjhoawcvoOIrVCRiB/MRFfea/tsSC+JCjTqYXWeAt2HEH86iCQ
+/6B0Isbc2fpmA2Pa8+4maFJPjW+L8+LoWPhBu/WhX/yA1ka1t71JcU/ngVOHibkE
++YMcLrPyIcbVn4b0K55vN6mRQe4XNnXXQjIIf/pA0IsQmRmm1EI5ttcCBsbbXrc=
+=Qvqg
 -----END PGP SIGNATURE-----
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