old

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

3 files changed, 13 insertions, 69 deletions

diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index 33b5f5c554bb..b0544a66500e 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for xfce-base/xfce4-settings
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.91 2012/03/30 20:49:51 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.92 2012/03/30 20:50:47 ssuominen Exp $
+
+  30 Mar 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -xfce4-settings-4.9.2.ebuild:
+  old
 
 *xfce4-settings-4.9.3 (30 Mar 2012)
 
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index f94d1387c1c1..ca135f35d475 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -2,21 +2,19 @@
 Hash: SHA1
 
 DIST xfce4-settings-4.8.3.tar.bz2 672266 RMD160 37ee15874322b038948e496a0ff9ad25c7e6b219 SHA1 98431633ba3ec2a4a10182bc7266904d9256949b SHA256 d878cc474e1e677e9607279b9a1007cb90ed35ff078de180259a8b2b8d06bc2e
-DIST xfce4-settings-4.9.2.tar.bz2 740384 RMD160 50c18f8337b5cf172a3799f9321ee97feadfbf0b SHA1 8718ee62d03ac68757b4d1eb8a8a675cd8412750 SHA256 3bd057f14ebcd29ae6741363d6082c281e4d3b4c0a63e81ee9b5dc696407e2fb
 DIST xfce4-settings-4.9.3.tar.bz2 755844 RMD160 5d7fb3ab57c2df09f6e48de3b99104f09bdbbe77 SHA1 aabcb798cff6bba35cfe777d72340be844f8362d SHA256 61ed21775d0b7a7c585c82ca4edd24f160f5f991795b6c0c2ab450313c80d196
 EBUILD xfce4-settings-4.8.3.ebuild 1733 RMD160 1b153992b4287f08e020f69444f1c6d019ab7c23 SHA1 9c2f813579c184e38177747b2725e52af575798c SHA256 39510688a7391d367d9c247edf427c725c6c290bee0841a939befcfbe7b3d1ce
-EBUILD xfce4-settings-4.9.2.ebuild 1727 RMD160 7c77f092af11c6db4bcf47cdbf9b7c3e3618c4eb SHA1 852348e3f731eaf838981db73e381179417f1dc7 SHA256 f9466a4b9267d346b8d0090b64a121c2c208a9f821cf4dbb2cd93fc2df7590db
 EBUILD xfce4-settings-4.9.3.ebuild 1739 RMD160 3410a9c634dfe2037767d90b592f1a9ac7f8ecc1 SHA1 1e0f1830791fd56e657af896b034988c3813f961 SHA256 744186e722eae77cf8dd64578e93dd1e653ca8ac7cd3d4973852e4fd953fbfcd
-MISC ChangeLog 12134 RMD160 e18f3a94fd6af5cc7fdf368a538c2c62cddbb656 SHA1 1c406f832df9cadf1372083b1274280f61b56b40 SHA256 eda11cad8ce574898565b712658fd256223ae8029916d48a806e448b5d29f135
+MISC ChangeLog 12227 RMD160 455225aad6e24517a68f8f97e10a705ada8d3642 SHA1 d4f37a447ff56a3f9359bc8914743190bb5452b6 SHA256 6c9812191c02bc1ffb77e81979e343f93d215b484e35dfae0cf332d105750982
 MISC metadata.xml 391 RMD160 b281d2622300ce119f47945cc1c8ab91f57c2087 SHA1 44b496f42b7cc7e3924f58f16a63d52d9450b338 SHA256 e12aab743d09d93de0374287e05add71330871ddafb70f9af31707241e1e2815
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPdhxmAAoJEEdUh39IaPFNvfgH/jG69LSsBGB9a6izbNn6Kt7a
-wHGQMwxdDKOGrf1Vac5vfD7w0FPvYcgyp3puFtUiwMA23xm3210XtifDioY5pXkb
-tUPBvbLc+O194jLUWnnbL1tVb4aZ/9Y4I3j65Faxk95c9d/szUfZWGmKhgSvl2nY
-lrUxqaM6qjLVQ4uiSIMP7nQCS3Bf0ru1QinOyUtsimDsD+AfoZIMjFnFawBTids4
-tR0M8XX6/ZKRqzXEn+q96hAFebBTZ9sHhx1kVrMZWi4tp1HQNlvtOMwJ+JKt5ygw
-vMY67Hgbq9aVZI9Bww63znfbD2uYS5zrY9OlL693Yydt0n1x7pLXE9pskgr3dYg=
-=y8ad
+iQEcBAEBAgAGBQJPdhycAAoJEEdUh39IaPFNUykH/RLbbHtcmuBa54dOe0BRoLSe
+f/WFjsW7QqnakWO2doH6y3yENvQjIm/IR4hT1CjTCi0uthKF5DlzVcjvU17t7D4P
+6MccqH53iDOJlhoTajt7icgc7XvQLR7MxU7cQgwFmuLeIEAf/XYLRcXWmTBcF782
+0TfHY0I1U2ILVxkzr1CiDE2Nwk55i54RclceKeO8gwtigvslL1LfnqeG0HzYIRUQ
+SJXPd+Nnk/DBWbeYd6DM08Kozm3PAvgrJylLtyZL32LLa1AT7ZhyIEtRNfwJNrOY
+FL4lashvTjlDauklZvXAp5zuDjQBCBg0oAyZjwPu2+y4Vl64L2g4hNpDYDnXVd0=
+=Ahhl
 -----END PGP SIGNATURE-----
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.9.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.9.2.ebuild
deleted file mode 100644
index 46185dd1cddf..000000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.9.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.9.2.ebuild,v 1.2 2012/03/23 21:27:03 angelos Exp $
-
-EAPI=4
-inherit xfconf
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="http://www.xfce.org/projects/xfce4-settings/"
-SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
-IUSE="debug libcanberra libnotify +xklavier"
-
-RDEPEND=">=dev-libs/dbus-glib-0.92
-	>=dev-libs/glib-2.24:2
-	media-libs/fontconfig
-	>=x11-libs/gtk+-2.20:2
-	x11-libs/libX11
-	>=x11-libs/libXcursor-1.1
-	>=x11-libs/libXi-1.3
-	>=x11-libs/libXrandr-1.2
-	>=xfce-base/exo-0.7.1
-	>=xfce-base/libxfce4ui-4.9
-	>=xfce-base/libxfce4util-4.8
-	>=xfce-base/xfconf-4.8
-	libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
-	libnotify? ( >=x11-libs/libnotify-0.7 )
-	xklavier? ( >=x11-libs/libxklavier-5 )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	sys-devel/gettext
-	>=x11-proto/inputproto-1.4
-	x11-proto/xproto"
-
-pkg_setup() {
-	XFCONF=(
-		$(use_enable libnotify)
-		$(use_enable xklavier libxklavier)
-		$(use_enable libcanberra sound-settings)
-		$(xfconf_use_debug)
-		)
-
-	DOCS=( AUTHORS ChangeLog NEWS TODO )
-}
-
-src_prepare() {
-	local theme=Hicolor
-	has_version x11-themes/tango-icon-theme && theme=Tango
-	has_version x11-themes/gnome-icon-theme && theme=GNOME
-	has_version x11-themes/faenza-icon-theme && theme=Faenza
-	sed -i -e "/IconThemeName/s:Rodent:${theme}:" xfsettingsd/xsettings.xml || die
-
-	xfconf_src_prepare
-}