version bump

Package-Manager: portage-2.2.0_alpha122/cvs/Linux x86_64

5 files changed, 161 insertions, 9 deletions

diff --git a/x11-misc/wbar/ChangeLog b/x11-misc/wbar/ChangeLog
index f32ca2f5de2c..277a1d0be4ce 100644
--- a/x11-misc/wbar/ChangeLog
+++ b/x11-misc/wbar/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/wbar
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.21 2012/07/29 20:16:13 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/ChangeLog,v 1.22 2012/08/26 17:34:29 hasufell Exp $
+
+*wbar-2.3.1 (26 Aug 2012)
+
+  26 Aug 2012; Julian Ospald <hasufell@gentoo.org> +wbar-2.3.1.ebuild,
+  +files/wbar-2.3.1-desktopfile.patch, +files/wbar-2.3.1-nowerror.patch:
+  version bump
 
   29 Jul 2012; Julian Ospald <hasufell@gentoo.org> wbar-2.3.0.ebuild:
   stable for amd64 wrt bug #427658
diff --git a/x11-misc/wbar/Manifest b/x11-misc/wbar/Manifest
index 7ed5218c945a..e3014119be85 100644
--- a/x11-misc/wbar/Manifest
+++ b/x11-misc/wbar/Manifest
@@ -4,22 +4,26 @@ Hash: SHA256
 AUX wbar-1.3.3-Makefile.patch 1508 SHA256 58ca7d843ed96a0fccfb49af0a9f052f3182eadad6383ff9315dfa96d4aeaf1d SHA512 212784d14800e5d5ae312800d524e221019840eb7c99c6ac58e0923f22f183d102230e5f52c5f1b5f29b3886c77a9baadca27a00f9b707a53951078df05baf06 WHIRLPOOL 6cf7c416ddd97124b3be1d13fb03654ab9e4747cdd9b78fa103b044c31705e169b522ba190ee5f6895ba49d7ff01920f31e2a976ec13713494c4fa20b16e48fb
 AUX wbar-1.3.3-gcc43.patch 615 SHA256 5ad3425e4ba870166f1b410499b912daa1e0120e0a88fbd6f5a7f23f96c5d5cf SHA512 5de45076c56153e667c7ee408402349191324fe587b048ea27d8cae36034ba0d77be0d88b9e928be9d380564daa2a49e4e85ca3506f0b0ea6a5d8039075e23c1 WHIRLPOOL 7463abee472ad35307f08f431d4066ea32f73379610d6382ace07ce769a29ed2c7f650e4897c4849dcadfe482c6321a1ce47f61382a2562c79ec97d66f6ae912
 AUX wbar-2.3.0-cfg.patch 350 SHA256 679edc4a4ff5070f84a1ec44b966a70f1835041b6d5256142c6695f4b5de332e SHA512 b8dd48b08c3e91065abc8d3cac1c6c951217a37cb9a4243bfe56ac01985d8d0fa004f27b142ffedf3c908ca42b6d94a050c41dbfe1c322b98bd9da856b4d771e WHIRLPOOL f765fb0fe9380a65dd760875f034c6a608542c44d4a7544dbe790a86d7bbae23c5fdc5affc5b46ea552122335c00db2321f924d8e72e887e7f98ad7af9f84f97
+AUX wbar-2.3.1-desktopfile.patch 2435 SHA256 abf1d7bd4aeddb512707f7a548db97d9794f8599fda235a3bd3980c56811a96f SHA512 835f7a6fdfd39fa93b84e5f40c371d00af4ae785577da78927002c63dc9b4367addf16370d02d57ad8c2bcd08bcef746bde83b59946b02a0fab76d2592d9f4bb WHIRLPOOL 0fa031520b2ca949c1641f95fe5c4a85b4b6e5c94a504c318ea63baf4f4f1b3473d9596f45b51f6837c0e464d2ab1db850ec7f17811f24d635fd755057f9e476
+AUX wbar-2.3.1-nowerror.patch 278 SHA256 cebe7738a85c4471cf82d12696482196fdcab020855dd3cbb1bc8c4619a809ac SHA512 613a80918b5bc650f28c5a3e5b8e83aa9cf5ad209f8556f8b290620cf57428eccb7147af3bc189045b372d6ccb1faeead857b9fbe39b951212a379604ee24364 WHIRLPOOL 6972ad2d8b35209f33a4d5cbd9260c75217a0e6c909b30879fd6c217214056f1ee68b7278c39fdc404e7383f7d20ee1858c3059a5b5ad9bb3c24553cade6f5bf
 DIST wbar-1.3.3.tbz2 429098 SHA256 431c5f7a8b6b065e2fe32a6482476a5ecefdf838aee550cae381ba64cb79eb4b
 DIST wbar-2.2.2.tar.gz 369592 SHA256 0d7ae78d02d52cdb046a47286341ad6ff42dd9aff667f7d389b4f352046d4db0
+DIST wbar-2.3.1.orig.tgz 70646 SHA256 da227e4bc0c37ba34be73080dbd49f4687eb088927518c27178e9c188b676b8d SHA512 ba808e593f4812447289b1dbba3ddeb9fc663be83294897c4363a982a241d6a0b5b2b08f40218fa91edb2c154147728fe2e3c295822280907b75b6748042d539 WHIRLPOOL 7a18b45c482e3c33f4f91382190d99d2bd55f6f06b44ddb8673393df13ffc4c753ee26a94132987d6b7ff7b7f3bf531353d28518884b5d6200123c1e57fa65bc
 DIST wbar_2.3.0.orig.tar.gz 375206 SHA256 1a192f150eae92d1c92b86050e4f8046de960a2452c48190187dd6b7a89df63b SHA512 f775b0800a9e3d3fe3104798c973b9584b71eca7e12469af7081378d3f49bb10dbc379117513060e71e2f2d2731e02a73a9edd64e06f5c3416abea4a276e26ca WHIRLPOOL 780d5bb3b92bb9fbe78176dc9a63c9b6b806617be6cf51686d372d0392ba32aa90094e76f2f4ea71133eee4a030ce95513742ccb55fd5d2814fe84e30181583e
 EBUILD wbar-1.3.3.ebuild 914 SHA256 850aaacde34f32017067b52a5a6fd2bce1ffa53dfeec0ba95c6cf77df8cfe4e4 SHA512 48954ed47a4dbae3c70f61e03f112b3ed7a30addecb405ad116d22a052efbab54b6ebd8955dab84004f58e08507355a1b95b5c6178be8d3ce721014766c3ca0a WHIRLPOOL 36f77f101e221f6a93bbbfc0494bd462d3cc00f65471ffb730b43d75162a89a60bd46a21b6c53921d6c15fef0056fdf45c981a4bab189026880e5f4eec88e2db
 EBUILD wbar-2.2.2.ebuild 1029 SHA256 d14ab007228fcd684da6e97a50e4585521e075fa1da6264ef609f342c9f374c9 SHA512 9bb47696ce37fbd4e83ba94e328ad3e20207daeef20dd7b57c0050e884d3e962bbeed352a653d162e5d9697db2618ca9bdeeec0907e56c86f0d5e4c11384fae2 WHIRLPOOL 2ab83539a9d9c1ab531f9a47cef7899563ac186e9418c49e95360a6f927b0e72b682623136327d9c72ae5557a42ac439cf034d792aa90995acabc679cfc13f41
 EBUILD wbar-2.3.0.ebuild 862 SHA256 0a65a21aa8dad5269cacf34e0de71f975350f5d5723c3cbcf1883da97dc2023a SHA512 c1d6fb8b1bf8e819256de6c2018198ddf78cd518a6a3319f6271c690d67c3a4df381bc0e7b79c42b52fc288c9f4417854032541e5d2c4d236ec712495f7e1c56 WHIRLPOOL 3bde3450758ff09f9430a56cba2d20424b0e79aa4bba8811645401e8ebe1f96c0e49c523a845abb3bfaaf269cbefe6d6d8d50aa4a02414ae36dcfb46fec00232
-MISC ChangeLog 3561 SHA256 27af12f1bc0017667991becc28162d609e94e4ca7aed10188f6e6a5c8df97f5b SHA512 73e11a38436bf3697b9291f9556813a3f365017eb461e067e6c8574883fa5f2e5d0281fb4d548df3f9aa350f53eb25fbfd0114a019c0d9d85c166fd118c6c6a7 WHIRLPOOL 89fe567bf1cf70bed51b92dcfac708700a74e6192d284d3d3173984830d1a05e2a9c6ba764f799cd5e1ae0bdef56a64b61a56233c0c8603f3f3dabb261d3e347
+EBUILD wbar-2.3.1.ebuild 902 SHA256 4621e9342f8a1a27a73edf41c8f10d4e88051df0098aa1b0a4cac533b28cffc2 SHA512 0bce8ecfbef863d8532ad3abf2eae2cacc3a68c4fee9426056104065c30c48b5289c91bc191c4fa6acb9c7f53cd1a9190b625e8269b78c0f79fa8a5d90b858d9 WHIRLPOOL af0a636f81330d36bc9266baad1bcee385ff81e6d465c93c16506e3bd88cb58976480fdc16cf43d3a8d5692cc191f780e71afc805e8138da3f3455b311a7039e
+MISC ChangeLog 3748 SHA256 b5efd7c8e3b51a217980a804299e414ee32b850ca1ac68282661ba9e20674b7e SHA512 b429b2fcf5a2c84d637a31762c3af1f49d46289bf55f2a6d16b6a4bd7c5b3a660dc786d7db14ea28962427531ba07f475bb250c31c072dd68246beba3c750df1 WHIRLPOOL 5fd57ba15815448db9f559f78a0a2e024eb9e8e59f9b77761ed25731403b5253224b74c06a31d9b055b95343b5e1137e25b106b919d2e093d4ee11af299c4519
 MISC metadata.xml 414 SHA256 76488e3434ec332ff752665dba1bc307f7f6173de12b3018be80dfa2045c7334 SHA512 8226e176da44146e35315530fa95bd5c5c7e989cd836ecf21c08729a036290b5c1ff9bd40288e3b13744c8e28e94163c118cd4b3245b9ecc8a802e9ae114b91f WHIRLPOOL ad96e6bcb89e9c429515698281f2f52801002ce2fee3c0bf5cd8a98539c91b85d518f82d1bcac5ba0bb36f5a41b570349c82167eb14edbfb52281aadc032e136
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQFZkSAAoJEFpvPKfnPDWzWCAIAJiKYKu7QHhDuZ33fTjPTc+p
-2jQ4WHPcy1xck9s8FrmuTym0ChFbyJPCHz51Uk4q287tl3Xsy5E4UoI7mRFY4eav
-Hy2lueXYjIXhRNnJk7Me43m/UrFsmiS5rCiCv0KOYHsEZcYJEZLlQFQWOfCi5NY5
-H+BcGe12SqOZlLaUOAQlLBE847kLGCbwmtD86ysEMnxbGpa+73BYrsSqe1GrCta8
-NYqNckI8vA9qfl2UmLzAFrw3dzeDOxCAH7mx7T6lOohxbpWSYcuPq2HOW4ORJGb5
-LW/qYHJOWII7/Z1KFuZx0Q64dAz8AtKXydiDz6MRTevRLPB2n1brKYrIGXa1sV8=
-=8z/E
+iQEcBAEBCAAGBQJQOl4uAAoJEFpvPKfnPDWzyyYH+gKL4TzHR5QdkhDfUQlBV/uD
+UzxG3t5XToJQG82CAtji65AsPgDfGc18Rog+mLvHbs/TxkSf9GUg+wBmw5M39VAF
+BR6bjWiwOUVrJV4zG+d0CZZw1C5olg2zXG/6/GdX36lST+UygGA63fvcLbP7MMZd
+eFkn+5jLlAfGeK2v4/WDNeASP9A8yTTO4rLvNuN55X31Yp0hub5sPg6aKEgLkZaN
+6/lHD6wA8HNT/V0wNaJVZlnbrpysmx6h3k43FW4CvnpGLIXlrMRKMLL2w9eaVEvk
+UBbsw8+qlrETPnThm6ftLEoo1KYgibp3okmtokp50gwqUhVFZNI9d77DA9Ld4HQ=
+=TzbX
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/wbar/files/wbar-2.3.1-desktopfile.patch b/x11-misc/wbar/files/wbar-2.3.1-desktopfile.patch
new file mode 100644
index 000000000000..c42f6498e156
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.1-desktopfile.patch
@@ -0,0 +1,89 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Aug 26 16:34:39 UTC 2012
+Subject: fix desktop file destination and QA issues
+
+diff --git a/configure.ac b/configure.ac
+index 0fc821c..2db7c02 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,6 +83,7 @@ AC_DEFINE_UNQUOTED(PIDOF_BIN, "$PIDOF_BIN ", [ program to retreive wbar pid ])
+ 
+ AC_CONFIG_FILES([Makefile \
+ share/Makefile \
++share/wbar.desktop.in \
+ etc/Makefile \
+ etc/wbar.cfg \
+ etc/wbar.desktop.in \
+diff --git a/etc/Makefile.am b/etc/Makefile.am
+index 1bcb238..a433e0c 100644
+--- a/etc/Makefile.am
++++ b/etc/Makefile.am
+@@ -3,7 +3,7 @@ CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop)
+ defaultdir = @DEFAULT_CONFIGDIR@
+ default_DATA = $(wbarcfg:.cfg.in=.cfg)
+ 
+-autostartdir = @DEFAULT_CONFIGDIR@
++autostartdir = $(sysconfdir)/xdg/autostart
+ autostart_DATA = $(wbardesktop:.desktop.in.in=.desktop)
+ 
+ @INTLTOOL_DESKTOP_RULE@
+diff --git a/po/POTFILES.in b/po/POTFILES.in
+index 8472c3c..8ed7725 100644
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -1,4 +1,5 @@
+ etc/wbar.desktop.in
++share/wbar.desktop.in
+ share/wbar.glade
+ src/config/Functions.cc
+ src/config/Functions.h
+diff --git a/po/POTFILES.skip b/po/POTFILES.skip
+index 327f139..a9fbd01 100644
+--- a/po/POTFILES.skip
++++ b/po/POTFILES.skip
+@@ -1,2 +1,2 @@
+ etc/wbar.desktop.in.in
+-
++share/wbar.desktop.in.in
+diff --git a/share/Makefile.am b/share/Makefile.am
+index 87c736b..091935c 100644
+--- a/share/Makefile.am
++++ b/share/Makefile.am
+@@ -1,8 +1,16 @@
+-CLEANFILES = *~
++CLEANFILES = *~ $(wbardesktop:.desktop.in.in=.desktop)
+ 
+ gladedir = @GLADE_PACKAGE_DIR@
+ glade_DATA = @PACKAGE@.glade
+ 
+-EXTRA_DIST = \
+-$(glade_DATA)
++desktopfilesdir = $(prefix)/share/applications
++desktopfiles_DATA = $(wbardesktop:.desktop.in.in=.desktop)
++
++@INTLTOOL_DESKTOP_RULE@
+ 
++wbardesktop = wbar.desktop.in.in
++
++EXTRA_DIST = \
++$(glade_DATA) \
++$(wbardesktop) \
++$(wbardesktop:.desktop.in.in=.desktop.in)
+diff --git a/share/wbar.desktop.in.in b/share/wbar.desktop.in.in
+new file mode 100644
+index 0000000..48fc33c
+--- /dev/null
++++ b/share/wbar.desktop.in.in
+@@ -0,0 +1,12 @@
++[Desktop Entry]
++_Name=Warlock Bar
++Type=Application
++Exec=@BINDIR@/@PACKAGE_NAME@
++Terminal=false
++Icon=@PIXMAPDIR@/@PACKAGE_NAME@.png
++_Comment=A light and fast launch bar.
++Categories=Utility;
++X-GNOME-Bugzilla-Bugzilla=GNOME
++X-GNOME-Bugzilla-Product=@PACKAGE_NAME@
++X-GNOME-Bugzilla-Component=general
++X-Ubuntu-Gettext-Domain=@PACKAGE_NAME@
diff --git a/x11-misc/wbar/files/wbar-2.3.1-nowerror.patch b/x11-misc/wbar/files/wbar-2.3.1-nowerror.patch
new file mode 100644
index 000000000000..1958f2b5c549
--- /dev/null
+++ b/x11-misc/wbar/files/wbar-2.3.1-nowerror.patch
@@ -0,0 +1,14 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Aug 26 17:18:37 UTC 2012
+Subject: remove Werror
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -8,7 +8,6 @@
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+ 	-Wall \
+ 	-Wunused \
+-	-Werror \
+ 	-I$(top_srcdir)/src/utils
+ 
+ if WBAR_CONFIG
diff --git a/x11-misc/wbar/wbar-2.3.1.ebuild b/x11-misc/wbar/wbar-2.3.1.ebuild
new file mode 100644
index 000000000000..081ba43bb63a
--- /dev/null
+++ b/x11-misc/wbar/wbar-2.3.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/wbar/wbar-2.3.1.ebuild,v 1.1 2012/08/26 17:34:29 hasufell Exp $
+
+EAPI=4
+
+inherit autotools eutils
+
+DESCRIPTION="A fast, lightweight quick launch bar"
+HOMEPAGE="http://code.google.com/p/wbar/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.orig.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk"
+
+RDEPEND="media-libs/imlib2[X]
+	virtual/init
+	x11-libs/libX11
+	gtk? ( gnome-base/libglade
+		media-libs/freetype:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	use gtk || epatch "${FILESDIR}"/${PN}-2.3.0-cfg.patch
+	epatch "${FILESDIR}"/${P}-{desktopfile,nowerror}.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable gtk wbar-config)
+}