Version bump (bug #482610).

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

5 files changed, 23 insertions, 127 deletions

diff --git a/x11-misc/xfe/ChangeLog b/x11-misc/xfe/ChangeLog
index 30268473c6e9..33ff3ea8d9de 100644
--- a/x11-misc/xfe/ChangeLog
+++ b/x11-misc/xfe/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xfe
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/ChangeLog,v 1.94 2013/06/25 10:38:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/ChangeLog,v 1.95 2013/08/27 14:08:53 jer Exp $
+
+*xfe-1.35 (27 Aug 2013)
+
+  27 Aug 2013; Jeroen Roovers <jer@gentoo.org> -xfe-1.33-r1.ebuild,
+  +xfe-1.35.ebuild, -files/xfe-1.33-desktopfile.patch,
+  -files/xfe-1.33-flags.patch:
+  Version bump (bug #482610).
 
   25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> xfe-1.34.ebuild:
   Stable for ppc64, wrt bug #471278
diff --git a/x11-misc/xfe/Manifest b/x11-misc/xfe/Manifest
index 652b104903fc..4714df727595 100644
--- a/x11-misc/xfe/Manifest
+++ b/x11-misc/xfe/Manifest
@@ -1,29 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX xfe-1.32.2-missing_Xlib_h.patch 624 SHA256 7f3d83dc14055be5cb8e7ef0e7254f70c3c6984eea5d7d5a11aafa3f274d9b5a SHA512 870ff01d860660873ca8c3c8f3df8164eb118e934ea64246c51a8bacbcb251d6db654f0d08be657efffcf9243c544c10a0f40efbfeb2033c72ad3cdbb9c7841a WHIRLPOOL 74617a417b68fcb7cc2fce382e8466afeb3eda167f8a33bff4cb7a159297003a072e67cc847c333406571135a3c7fc0c6ac30aaf0bc13d2b6f8df9cbad8e0976
-AUX xfe-1.33-desktopfile.patch 391 SHA256 c95b2e484a0d2965478c8ce4a5c0493e365f907c379e7c8dfae8ff77e12ed201 SHA512 6c43d71942a5e8ff860a3d054460b7adee504d3a5da8c226c298eb9aca95b95b05c9ba96c17b97227e67a1c79e28ee2ed0a4ded6c33c1f193e55446add08ff47 WHIRLPOOL 9fba4ca76f93c295dc458a85f5e2622697df2afbcbb40095f4fdfbbc321590ad65bfe31bdda2a31c3522782bb71f3433400676b4213a20882cf362d32a0a673f
-AUX xfe-1.33-flags.patch 2427 SHA256 2bd56428db5fbbcaab4849deb22cba79c2da55ed63537d0800b8b7fc22041da1 SHA512 52271cdfc7597cbaebbae2bc3e42948d6217de0a6ef70632a0aac343a062937d514e299807bd31b942567b2124fa8d8bf7082a8ba5a8d8973b688cfa819742de WHIRLPOOL 9123fb1ee81529bfa5ce730c77bc01d35e52e68fdeb65034571e1b09f9c89cdb601cbd5b5a369179772b5410f8c3eba3fa0797b4ea4e3b8f4d0a4d8393e1a386
-DIST xfe-1.33.tar.gz 2320451 SHA256 e8a40f259d1b48943460ab53c177c5f570e01d2b605db04c8a78c4a4b20372d0 SHA512 8a03b0cae2a8c8805c4ef021615a83c24e94baab93c3f5d9075bf29c9b6e68dfd3bdc56fcea89a92a5512070012fe38ecb5ce2eda75b1a832743e4ccab2ff5fc WHIRLPOOL ac20724d29a408272583d4f5abb286a5ab813210c2eef436553053796c5c99945745a1e38e6849511308fa5adc81a1017a67c82f18f84f0ce46c90f50b0661e3
 DIST xfe-1.34.tar.gz 2356801 SHA256 5e311b0609349ca5ad2c34d32ccb79863eb48f6b8a9fddcecf37f0dd368acf78 SHA512 7a5e4312a564137efd8f0a0940dd8e60c4ef6090171cc1c6fa3e09154089bc88ca2bb7b06ab01947043ddca30ae83c7a14c8649068daebe4745d1fd59dc1d3d4 WHIRLPOOL 9fd333d99473182450e00f5b9fbe5425659f93f2b393716f2bb4b36fec03d733e52b953420634efc3141911f38ced3d950c7907379a6b53e164868e9b49611e8
-EBUILD xfe-1.33-r1.ebuild 1640 SHA256 1b1fb0380d905e0f1d3f24a205a18a8ea872ac86418e9423319cacd056fce997 SHA512 f66700abcc38d39c85361289c566b3d7e9c0cb44c735df6b4b817adc3268c88dd022f91affee8794759d4a01d9b13f161e447fe3fa78f2d8d4ad0c41f44cadce WHIRLPOOL f414148a0e3ce7dacf23db10d3adeec8fe1d83d6feb1ea144326bb1913634190289283d210c1f7892c6a587e73e3a6f44201760624d11da9e40dd753956ef0f9
+DIST xfe-1.35.tar.gz 2447267 SHA256 9f001cc9c07a9703b2874cd41635b1b2402cd1d7d270ab436d3daf0015369850 SHA512 92d764a266e3f2e44ab1a8c1f6a8869ba8d32180520c40205829e0a46cc2dd553917efa385c61b9e10d53ffb7435dd635d62e238c9c89c054dbfd60741fc0623 WHIRLPOOL fd8485a0fcd09af9f0ffb9760061d5142ccafc437acd9ac036e7a2c67b23de7a413dd7947c305b09e49d5ebbe0fffa43c70e23e20fb9cad7adff74c0e23dfb48
 EBUILD xfe-1.34.ebuild 1568 SHA256 e5e40c6b3c122ba7779694397723b014d008e6236786e86ac59fb4a805e60b05 SHA512 b1fbca38ecabb7b05587fa80bec0f0437a1b74688f8ab067f63d7ae416e4cb8b36493a00a70dfa6f1addad6af751ca7f8a5db018150b176afd25928badcabca4 WHIRLPOOL bbf4dd4bd822913d7975914a36a849dc28275ed3dd9f329408d0b3ee8b24433eca46c8fbd774935863cb9ef6e0ba5a84bc79bccc97b2c349b0ba3f473bb7ab15
-MISC ChangeLog 11484 SHA256 ed977f38a852419d381886ecf49185e4e916316d0bb53ef24668e442ab6c0913 SHA512 0af7250a1b6acba5280266cc04d7bf5c80ed845e08f5ad522f64823f258fa0ff1189c141cce16feeaf18718241aec61c27a0a36df69dc5bd8bc4cf153bf46093 WHIRLPOOL e085c30f904c19b415ae8fda1fc1a72a4c14667da829b318a493c0b045254589db4d8f8dd73743beae7a7be3b4c08188f0b88f6ff0e5561a13a5d91dc83ff0c3
+EBUILD xfe-1.35.ebuild 1650 SHA256 fe7ae93afdf77890aef4d38a9e91632ea8cfed6628bc95320868b578f701945a SHA512 fc97ca11907444e80b69aea440b4440633f5f1c3ed0523add9a2eaaeb58497c66c377905ec13531f4252ae3f5b88e7b290b29520a07442fcfe923606abf5d993 WHIRLPOOL 97cf907e20e773e47f50090677005c457faaec5876e86497e21ccf5e539b5fdde2f57523846a8ed6b94c3fc7ef9d038b3efb53932f72a54f738acebebf421102
+MISC ChangeLog 11694 SHA256 e4a5e5f8fa39a14f380c592f76eb8c2a91ca7069b5e50f876ec05cf64cff4501 SHA512 4546499f620f43b7eac2c2cd5244a5029945cec6ec78b821bee0cb03eb5dc4a7d8030f89d41dba0fd40610da216440b5b188e325a1d2ec2b53fa50d7cdcfac5f WHIRLPOOL 637028cf2c895d684ce54a51962df5d3b5f721b60ced2aaa0bfe66c2f366c921d78718c5b36dd6827c7e2427c2cad14fb3b896f8d620f2f22156923bb05be43d
 MISC metadata.xml 166 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826 SHA512 23980b683f9a89f988407b1dcc27a4465a18912f6e6cf8e1fed46182f00c4023d4802434f36b9482121ba9ffe9bc5d6e91b5d3a4ba9067fcfd8e57799c128fe3 WHIRLPOOL 96d79ff499e108ad89b80507c2e94a09af1e8031e5e2a7f9cecb2dddbf517872361436bdb983dc580660064a62663ad63aa1fad8f49dd3758253f4e378bfd297
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRyXJwAAoJELp701BxlEWftX0P/RYAVHbIdH/jmmAB+ms82R3a
-MTTjzXBFOJNt8V/GEbjqBRlHqnP6o6GUN4CH/LAMlLSdhoxXTiuLE0aLpMP94q1b
-8ZYgOmEts1u/oLjoq72fVh0M1Zd/s+k/lgX+SWWRyTsLjvJU6CzOTbmlCA4VbWA+
-YKao0rrbDNzZsZbXDqYXAZj8yorGlWJGF0O9Ks/fxt0YaLKli8wo54MMGJjiY53A
-XTCUbd+dzCPC0TnxiG7fPLE/NgBXZdBoOrr2Fs4wL4uf6a3XaEOmmaVl/l7Syhlw
-UZi6NEFKLBDX9FsEVj6wT6ZPBzO2n8EzXeqzl/VJHG7OvCnH7orUTcZLpuCzvu7N
-/GDQ20AgzdYAjG6xne72OCke3chgeD+pwrSpFd7MxsCCyZFgzNDmLyQ7SZlw6Lih
-Yi65kMnbQGq4defRkfT/YfuyxX33VXbhfqAai8a4bkitGd99/W5abZbkwaMaNhZp
-SmVob2VNJ3maJ6tNuvq8sOtN5igFdVrfrfrGCMgM/ZRx6w3+YGLkbf+QoHxz96YI
-4kyQ8VnWQZ7Rm9QaDCSGM0Y+08W2Eru2IEexRyZb8U5e0dspEUALOanEOfuxJIX/
-KTV1DXyGV5No4VCyfRwI3iKbKjICop1UlAXWVpv9/nq1yBVfZJr25j9yvs4y0oRs
-rU2n/vgnsgn7hJsUGCu5
-=u+O+
+iEYEAREIAAYFAlIcsvcACgkQVWmRsqeSphMKYACfQyPbWmCYWsBisXRBKgaTSAi0
+tNIAn10VmE2MorUfMUCDkG/L2F7mnd5S
+=my4T
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xfe/files/xfe-1.33-desktopfile.patch b/x11-misc/xfe/files/xfe-1.33-desktopfile.patch
deleted file mode 100644
index e79a494adaf2..000000000000
--- a/x11-misc/xfe/files/xfe-1.33-desktopfile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Dec 25 18:01:35 UTC 2012
-Subject: fix desktop file
-
---- xfe-1.33/xfp.desktop.in.in
-+++ xfe-1.33/xfp.desktop.in.in
-@@ -6,7 +6,6 @@
- Terminal=false
- Type=Application
- StartupNotify=@STARTUPNOTIFY@
--MimeType=text/plain;
- MimeType=application/x-deb;application/x-debian-package;application/x-rpm;
- Icon=xfp
- Categories=Utility;PackageManager;
diff --git a/x11-misc/xfe/files/xfe-1.33-flags.patch b/x11-misc/xfe/files/xfe-1.33-flags.patch
deleted file mode 100644
index ee5f2878d6b7..000000000000
--- a/x11-misc/xfe/files/xfe-1.33-flags.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Tue Dec 25 17:42:56 UTC 2012
-Subject: build system
-
-	add a "--enable-minimal-flags" option to
-	respect system flags
-
---- xfe-1.33/configure.ac
-+++ xfe-1.33/configure.ac
-@@ -5,7 +5,7 @@
- # Initialize
- AC_INIT([xfe], [1.33])
- AC_CONFIG_SRCDIR([src/XFileExplorer.cpp])
--AM_INIT_AUTOMAKE
-+AM_INIT_AUTOMAKE([-Wall])
- AM_CONFIG_HEADER([config.h])
- 
- 
-@@ -177,6 +177,10 @@
- AC_ARG_ENABLE(debug,[  --enable-debug          compile for debugging])
- AC_MSG_RESULT([$enable_debug])
- 
-+# Add debug symbols
-+AC_MSG_CHECKING(minimalflags)
-+AC_ARG_ENABLE(minimalflags,[  --enable-minimalflags        respect system flags as much as possible])
-+AC_MSG_RESULT([$enable_minimalflags])
- 
- # Building for release
- AC_MSG_CHECKING(for release build)
-@@ -184,29 +188,37 @@
- AC_MSG_RESULT([$enable_release])
- 
- 
--# Setting CXXFLAGS
--if test "x$enable_debug" = "xyes" ; then
--	CXXFLAGS="${CXXFLAGS} -Wall -g -DDEBUG"
--elif test "x$enable_release" = "xyes" ; then
--	CXXFLAGS="-DNDEBUG ${CXXFLAGS} "
--	if test "${GXX}" = "yes" ; then
--		CXXFLAGS="-O3 -Wuninitialized -ffast-math -fomit-frame-pointer -fno-strict-aliasing ${CXXFLAGS}"
-+if test "x$enable_minimalflags" = "xyes" ; then
-+	if test "x$enable_debug" = "xyes" ; then
-+		CPPFLAGS="$CPPFLAGS -DDEBUG"
-+	else
-+		CPPFLAGS="$CPPFLAGS -DNDEBUG"
- 	fi
- else
--	CXXFLAGS="-O2 ${CXXFLAGS}"
--fi
-+	# Setting CXXFLAGS
-+	if test "x$enable_debug" = "xyes" ; then
-+		CXXFLAGS="${CXXFLAGS} -g -DDEBUG"
-+	elif test "x$enable_release" = "xyes" ; then
-+		CXXFLAGS="-DNDEBUG ${CXXFLAGS} "
-+		if test "${GXX}" = "yes" ; then
-+			CXXFLAGS="-O3 -Wuninitialized -ffast-math -fomit-frame-pointer -fno-strict-aliasing ${CXXFLAGS}"
-+		fi
-+	else
-+		CXXFLAGS="-O2 ${CXXFLAGS}"
-+	fi
- 
- 
--# Setting CFLAGS
--if test "x$enable_debug" = "xyes" ; then
--	CFLAGS="${CFLAGS} -Wall -g -DDEBUG"
--elif test "x$enable_release" = "xyes" ; then
--	CFLAGS="-DNDEBUG ${CFLAGS}"
--	if test "${GCC}" = "yes" ; then
--		CFLAGS="-O3 -Wuninitialized -ffast-math -fomit-frame-pointer -fno-strict-aliasing ${CFLAGS}"
-+	# Setting CFLAGS
-+	if test "x$enable_debug" = "xyes" ; then
-+		CFLAGS="${CFLAGS} -g -DDEBUG"
-+	elif test "x$enable_release" = "xyes" ; then
-+		CFLAGS="-DNDEBUG ${CFLAGS}"
-+		if test "${GCC}" = "yes" ; then
-+			CFLAGS="-O3 -Wuninitialized -ffast-math -fomit-frame-pointer -fno-strict-aliasing ${CFLAGS}"
-+		fi
-+	else
-+		CFLAGS="-O2 ${CFLAGS}"
- 	fi
--else
--	CFLAGS="-O2 ${CFLAGS}"
- fi
- 
- 
diff --git a/x11-misc/xfe/xfe-1.33-r1.ebuild b/x11-misc/xfe/xfe-1.35.ebuild
index e02c77629938..4a15f2df2b04 100644
--- a/x11-misc/xfe/xfe-1.33-r1.ebuild
+++ b/x11-misc/xfe/xfe-1.35.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-1.33-r1.ebuild,v 1.6 2013/02/14 12:22:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xfe/xfe-1.35.ebuild,v 1.1 2013/08/27 14:08:54 jer Exp $
 
 EAPI=5
 
 PLOCALES="
-	bs ca cs da de el es_AR es fr hu it ja nl no pl pt_BR pt_PT ru sv tr zh_CN
-	zh_TW
+	bs ca cs da de el es_AR es_CO es fr hu it ja nl no pl pt_BR pt_PT ru sv tr
+	zh_CN zh_TW
 "
 inherit autotools base l10n
 
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug nls startup-notification"
 
 RDEPEND="
@@ -36,10 +36,9 @@ DEPEND="
 "
 
 DOCS=( AUTHORS BUGS ChangeLog README TODO )
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.32.2-missing_Xlib_h.patch
-	"${FILESDIR}"/${P}-flags.patch
-	"${FILESDIR}"/${P}-desktopfile.patch
 )
 
 src_prepare() {
@@ -56,13 +55,14 @@ src_prepare() {
 	# malformed LINGUAS file
 	# recent intltool expects newline for every linguas
 	sed -i \
-		-e '/^#/!s/\s\s*/\n/g' \
+		-e '/^#/!s:\s\s*:\n:g' \
 		po/LINGUAS || die
 
 	# remove not selected locales
 	rm_locale() { sed -i -e "/${1}/d" po/LINGUAS || die ;}
 	l10n_for_each_disabled_locale_do rm_locale
 
+	sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
 	eautoreconf
 }