old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

4 files changed, 13 insertions, 97 deletions

diff --git a/xfce-base/xfce4-panel/ChangeLog b/xfce-base/xfce4-panel/ChangeLog
index 271f916dcb76..80d2f970a482 100644
--- a/xfce-base/xfce4-panel/ChangeLog
+++ b/xfce-base/xfce4-panel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce4-panel
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.251 2014/04/19 17:46:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/ChangeLog,v 1.252 2014/04/22 13:48:59 ssuominen Exp $
+
+  22 Apr 2014; Samuli Suominen <ssuominen@gentoo.org>
+  -files/xfce4-panel-4.10.0-icons.patch, -xfce4-panel-4.10.0-r1.ebuild:
+  old
 
   19 Apr 2014; Agostino Sarubbo <ago@gentoo.org> xfce4-panel-4.10.1.ebuild:
   Stable for sparc, wrt bug #507432
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 0b5eec59cde9..8a43cb14abcd 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,29 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xfce4-panel-4.10.0-icons.patch 1356 SHA256 552c67962b78f607513da5eb7a590cd10b0ab09a025f0b1ea0d33d292475a218 SHA512 7f6f8d5e57e371e4e9c361f54b6375ccfa2e4d4de92eca4c8d91df282291bc5da63e558cf091cdb762b1fd6cb657e2ec164fa5ef76f557a9de4f3683effa30c6 WHIRLPOOL 13a10741052d5f130e3f6f884a15ae7b14b4ad9ef46d4c3fc83c87a3e60d3550267892fa6545c0403b86f096067a1b35521a18f8f015af340741408021cbdf88
-DIST xfce4-panel-4.10.0.tar.bz2 1036257 SHA256 3321f998af2bbd14ba68654a8881774f6ea2ec4f1a3544598e7f47d3ed0009b9 SHA512 d37ebeabcb3b532c41199c25b071a518743460e8e2107ab24af67b099ad829fa625599436ff5bb4ce5b0b8e641a1d29d7fd18b35048e15a11cf490eab1ade60e WHIRLPOOL 44acdd49eb3480449f24b8aedc655ccf1da2d527c4edb31f7bc766b2a81d0f2c34e619e4b4f65722d67be65028e0fce9dec0eda045be607f1cda8a5485735081
 DIST xfce4-panel-4.10.1.tar.bz2 1061090 SHA256 573052ed1b65e247415f92df120c8a78f9e4152c2636d38c923f82e32b8475d6 SHA512 0a115fcfa5cdf28158e7d56038a8669849494259c1c6e622614384179015edf868978c4226e13fd8b244ccb6b1a9798577eb38604b71c872bfb9229b87ccc531 WHIRLPOOL 2a27c20eeb7a2f965540997c94bdc2727f816f0956dd995faa1af583ae294152fb77b438e090f13324c69a303e8d90490097e2a1534b143757d31ab096c53c96
 DIST xfce4-panel-4.11.0.tar.bz2 1120711 SHA256 87062803dc7923d8ab21511c89a575ce7af54c19d3bc7ff15093f09852ad2c75 SHA512 ada36d603d0a8ebf403d75ca7ea38ad65b1c1badac05053870445651a2d6dde160991f4bf4f47e822a8dfc4bb339a61411a3ad4041eb87495c3d3216174ea6fe WHIRLPOOL 8baf79cd347af929d5d491941ff1a291f3f266a0f9dc41a65d75431eb3c514df8cbc212632ae352c9af0c6e6153a76d5daaeae0eee6e6a05e28e2c0610994aaf
-EBUILD xfce4-panel-4.10.0-r1.ebuild 1202 SHA256 4d17999cdf524b069933803f9b865de63d3cdec53bbca77ab0070e064ba3506c SHA512 6be17fb53dcf17bfa89b9a983efa3a0fdd68ae1e5e8d8f0575f0c5ca8c2d2316f3c07ecc8e55d0ee7daabe84ea44eaf978d380313b1c80e2e60aeb34d5657f37 WHIRLPOOL 553c01cffce548ef5969f4afc9374a0c8b8a582f4e592469cd2fe63a82eb529f4637e5c6be4a045cd48caa5fffd992a71b3e4ef687734accb46c923cdb1e23cb
 EBUILD xfce4-panel-4.10.1.ebuild 1154 SHA256 24d410b64acc96e3282274b2abe107da381e8bbd55c36726ba98ef060d63a56c SHA512 4c205a2a025c71b8f33657d67f259ef06dac47f23611206654e21b159c89fb7a2fb2a47dc4cf594167b412e91f1cc8be848ac2c7df34f604c1a4dd44e8360316 WHIRLPOOL 328940050cf91fb999f19496d058fe9f0f8b5a20de06470a62c292396967cb09e2d4aa99bab562437cc164e531043a801adc6e04e8ae672b34f714fbc0960a37
 EBUILD xfce4-panel-4.11.0.ebuild 1207 SHA256 91718e1b905a0dd09aa510a8a0fbd83a3d252be43a60f2b7b2593b3abb7c6207 SHA512 16e15357cd54d266523289ecd7085c0a2dec9a41784000e32116c2232808d70a940115cd78bd9b3538e235994bdf2bfcd5712884df61b7c3e9ff0cb601ef04ee WHIRLPOOL 1043ecbe6819519f22688e1676f57b310ef52773a5939860d3ef0e0e63ecb88a01e28ae118099d4f59d7dd65ee05679ef4f21b494d68852035dd469870ac70a4
-MISC ChangeLog 31151 SHA256 6ed451c93f0a23ba05b7b56b4df3a5e611591f853c5036a2b391e278e338645c SHA512 efceea14ebc243ec0ab6e104074006acefa401ad81c010710ca9a4bc5716894025c5b296eb46f71945d4ca897e0a2710401de286acb91327d877a3cbc6158f03 WHIRLPOOL 4885cbc718e1d4f09560581a9b7e4d897ed2347a1ab1933cb06a8adc96736d92718416c4eca411a752ae846529d74b6a094914d9b55ae369fbe790f924ff09b6
+MISC ChangeLog 31290 SHA256 d0ca94a3f8d93ee707c9f0aa5d040e7803b5d10da4717f615f9aefe595a4ac1c SHA512 dbeff053a84336a90778097210db206959035e61db2d03ddbe0a9048e01707e1e5e0084e32cc29a79d146a058a0d43bb1b1c2b79e25c5c574f150c654067d746 WHIRLPOOL 5623c6ccb457b7ccd1c92b687e3d1cf5c7a2dc73348bc5a5bcffed74f1ba826598026463dff0664b583054dafcd6265a3f620378df06630a5d9b26fc68ce6336
 MISC metadata.xml 159 SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 SHA512 000eb10e453390fb27843585adf354d725e77d881553d97a1a242bf06578a402ee4a924d9d8205a3fa687a59e2402bc9f3e1c227e448e05026354c196cf0a4f3 WHIRLPOOL 6f01aa01b8124d752be8e6c550ffdfc9093d45b206771c924ce25ce3f0daf006a669721d1385ff1bc803df342322d1c264f2905d3ccc44686c937deae8308ec3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTUrZiAAoJELp701BxlEWfKV4QAKPAX2fmje8UMKPzqxDjb6Sd
-UyieTwg0VqXyG6OdBgWCjsUYsrKVfMjp3IKV5IsIXt75wtMK/btJL0aBQr9LOoo5
-7SvZpjNi8MdXAkiLbqWFRfCDFTGZz6OjV2f5aouAktqyn7hGPomt8ZnQ1wMRMD1E
-GNiIyxB9ApTy7RQ5JdhQ15KyXd3SKBTY/XoU+k2gNOygJJCtU0hee358cckK9XNn
-mvYiyKawrI1PRTjkftKyeuOfBUnijLIdvOUYrvlTy8HK89Drw3PMUuhDxbAw4N57
-//OiaXT1LwGCRiTpRTmBH7CorWSrE7p9VTjH1q8XzAaF5yBeiIpOP/BPsc1zzdtK
-jCAkv6b/yb0BVssR8lpLB9Fsz8FdUaCGdRgIts+vD65/qa5J2K3VMXJLMMJ7RbXn
-GVwjTWJpzUYqQGCCsoQNTuFGm3P7DppYixSK21U6bj1wC30gXmyKO0fPfdV2M6L/
-vEAxNtd6XwYeamDvvaRmD1HDy4iMb9lCXbWmittxUKppsW2CPP9MllNCDe3yqyKu
-QvjBdVZPBZ8qesEXKCfRJ5N6gdxzvFkYCQmQvO1qzuNLy4dPo1kDGHp73FlbFgUW
-fx5Mw5Npxrehj/rdsZHpljKsHhDvOHaXUvhnPgXb5pZKxN7qFJJd55dGjYrN5UQ6
-39VVzt8OvZcWL00Z+I8L
-=InZo
+iQEcBAEBCAAGBQJTVnNLAAoJEEdUh39IaPFNG7AIAJmcCxu1g9scpOm3o43ECMPF
+pz9pr4Q/DePA1mMW4YoOfIfqEja/rANEqidYheGiKZYq6YLcoI3izwtxP9lOAMts
+bRkprT82tdPw5Ad3HFRTSLnJ5bDX5Cxy7/Pu1/9wEpfcM480+N6f9KwoCk9f1IIL
+nlEsipp5OnUmVgJsP+lhfWk8Iu3JtAgwLUzQLaZXP6VS3SiMdzz6bjJxJV0yUlwH
+XHrMDB88xpGvKi2E2SdVsLZO0h+x27ipvVusOlk5hU2Gm6JrCOODSt1LFf5QkkoD
+f3MvFJ+gsKdg5lJLlTzbo/5ouEkoUvZisOy9ZU+enj0FBY0YajRatwh9KjFkXNk=
+=v9/F
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-panel/files/xfce4-panel-4.10.0-icons.patch b/xfce-base/xfce4-panel/files/xfce4-panel-4.10.0-icons.patch
deleted file mode 100644
index 0bc7d0f6b36e..000000000000
--- a/xfce-base/xfce4-panel/files/xfce4-panel-4.10.0-icons.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-http://bugs.gentoo.org/447182
-http://bugzilla.xfce.org/show_bug.cgi?id=9615
-
-From 48e1016394fa6bdb1d708823a23a12641482a561 Mon Sep 17 00:00:00 2001
-From: Carlos Silva <r3pek@r3pek.org>
-Date: Fri, 14 Dec 2012 01:14:36 +0000
-Subject: Fix icons not probably resizing when requested.
-
-Looks like gdk_pixbuf_new_from_file_at_scale and gdk_pixbuf_new_from_file_at_size really don't scale the image leaving the image loaded with its original size. So, just load the file without any scale and let the scale be done later on the function.
-
-Signed-off-by: Carlos Silva <r3pek@r3pek.org>
----
-diff --git a/libxfce4panel/xfce-panel-convenience.c b/libxfce4panel/xfce-panel-convenience.c
-index 19c51bb..a3f3be1 100644
---- a/libxfce4panel/xfce-panel-convenience.c
-+++ b/libxfce4panel/xfce-panel-convenience.c
-@@ -170,15 +170,13 @@ xfce_panel_pixbuf_from_source_at_size (const gchar  *source,
- 
-   if (G_UNLIKELY (g_path_is_absolute (source)))
-     {
--      pixbuf = gdk_pixbuf_new_from_file_at_scale (source, dest_width, dest_height, TRUE, &error);
-+      pixbuf = gdk_pixbuf_new_from_file (source, &error);
-       if (G_UNLIKELY (pixbuf == NULL))
-         {
-           g_message ("Failed to load image \"%s\": %s",
-                      source, error->message);
-           g_error_free (error);
-         }
--
--      return pixbuf;
-     }
-   else
-     {
---
-cgit v0.9.0.3
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.10.0-r1.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.10.0-r1.ebuild
deleted file mode 100644
index 3c0c0f7c094a..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.10.0-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-panel/xfce4-panel-4.10.0-r1.ebuild,v 1.10 2013/04/13 07:21:13 ago Exp $
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
-	>=dev-libs/glib-2.24
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	>=x11-libs/libwnck-2.31:1
-	>=xfce-base/exo-0.8
-	>=xfce-base/garcon-0.2
-	>=xfce-base/libxfce4ui-4.10
-	>=xfce-base/libxfce4util-4.10
-	>=xfce-base/xfconf-4.10"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	PATCHES=( "${FILESDIR}"/${P}-icons.patch )
-
-	XFCONF=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(xfconf_use_debug)
-		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS THANKS )
-}