summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-10-13 15:49:43 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-10-13 15:49:43 +0000
commit2b56ff0949ff9fd8f8bf33a7882d16a056fb8d2f (patch)
tree817ed36ca4a6ab13377f0f7f3681680b72e79463 /xfce-base/xfce4-settings
parentGentoo Prefix cannot build xorg-server, exclude it from the deps (diff)
downloadhistorical-2b56ff0949ff9fd8f8bf33a7882d16a056fb8d2f.tar.gz
historical-2b56ff0949ff9fd8f8bf33a7882d16a056fb8d2f.tar.bz2
historical-2b56ff0949ff9fd8f8bf33a7882d16a056fb8d2f.zip
Fix previous commit (and bug 262333) in a different way to avoid xorg-server dep.
Package-Manager: portage-2.2_rc46/cvs/Linux x86_64
Diffstat (limited to 'xfce-base/xfce4-settings')
-rw-r--r--xfce-base/xfce4-settings/ChangeLog7
-rw-r--r--xfce-base/xfce4-settings/Manifest4
-rw-r--r--xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild6
3 files changed, 11 insertions, 6 deletions
diff --git a/xfce-base/xfce4-settings/ChangeLog b/xfce-base/xfce4-settings/ChangeLog
index b8acb61b5a33..e8f38fe53769 100644
--- a/xfce-base/xfce4-settings/ChangeLog
+++ b/xfce-base/xfce4-settings/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for xfce-base/xfce4-settings
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.22 2009/10/13 15:28:43 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/ChangeLog,v 1.23 2009/10/13 15:49:43 ssuominen Exp $
+
+ 13 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
+ xfce4-settings-4.6.3.ebuild:
+ Fix previous commit (and bug 262333) in a different way to avoid
+ xorg-server dep.
13 Oct 2009; Jeremy Olexa <darkside@gentoo.org>
xfce4-settings-4.6.3.ebuild:
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index e77a450a582b..b98ba887091e 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,6 +1,6 @@
DIST xfce4-settings-4.6.1.tar.bz2 501587 RMD160 6ecfa08d6ad528d43988c5fe128b2fcd6db6f0d3 SHA1 ab117c3923571e2437095fd165ac4bf392e658e0 SHA256 36dda4d43366fad47ee95ea5d4fa336d0b14f79c524b4f29a2ac1b9ada4abf8d
DIST xfce4-settings-4.6.3.tar.bz2 534204 RMD160 732c19f0e6258a9ea2583eddd57d4953817a206d SHA1 8a7f114ae5cab071668937351a0b3b4be1b9b51c SHA256 f34b896960f7c30c3601b9946b145076a215778da6ab8399d268cd1f2b2b9d34
EBUILD xfce4-settings-4.6.1.ebuild 1323 RMD160 b7e3aad99af7194b5227f8deb19390e54370f24c SHA1 749566c367cae3ee2d676694dd36b6b8dab50124 SHA256 f0b159bb6169a6c92179d82a92bed71705b018c71dae0fd39c8669477fc1b5ee
-EBUILD xfce4-settings-4.6.3.ebuild 1419 RMD160 aa48c6d129fdd0c48d7fcbbcc719a2f3b8a0e5ea SHA1 5804834298ba911ad2d288fd3d9c8b4b95f7ccb0 SHA256 1fdfa785c6f94e7348c3ce3a9128f55ba4813662ed3b35e2818283494887b8d8
-MISC ChangeLog 3348 RMD160 5ff205ec74b9e99113f0f0e45f78f3339d5da02d SHA1 0417e961f6f0ea3da8d86cabb288ebda542dc841 SHA256 ad7130b028d321648c16c8337fdb60046a5200857903b4a829bf38f06b8a55f6
+EBUILD xfce4-settings-4.6.3.ebuild 1407 RMD160 ac03cf7071c3ce10cfaa0ff1f27ca6fbc58693b4 SHA1 522cc2f8808a974550715624909e801b0bef946d SHA256 7fc8082ff6a7d4b4f5f6a796306ca8254fdd5feebb65b877c71b471dca42d9e7
+MISC ChangeLog 3521 RMD160 ecd9f687145b4c968fa5f86f0a0b8bc432ec6ec2 SHA1 b37db0882454ab9f3decbffa82e48a11e53cee80 SHA256 0ef7be3d58f5b1d04feae17b7341844ae6ddb03a5be47553fa48606e7c00d404
MISC metadata.xml 363 RMD160 2f66508d394f9cc14654775f3a0b117bc10d3ef5 SHA1 8a3e6715e41535ea04377624a621c9ada60fd5ff SHA256 2442135d806e37420f1904d5b32e8b7afe94ed212307d25667f363db06c558e3
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild
index 21d139693ccf..1ea06922018d 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 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.6.3.ebuild,v 1.4 2009/10/13 15:28:43 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-settings/xfce4-settings-4.6.3.ebuild,v 1.5 2009/10/13 15:49:43 ssuominen Exp $
EAPI=2
inherit xfconf
@@ -23,14 +23,14 @@ RDEPEND=">=dev-libs/glib-2.12:2
>=x11-libs/libXi-1
>=x11-libs/libXrandr-1.1
>=x11-libs/libwnck-2.12
- !prefix? ( >=x11-base/xorg-server-1.5.3 )
>=xfce-base/libxfce4util-4.6
>=xfce-base/libxfcegui4-4.6
>=xfce-base/xfconf-4.6
>=xfce-base/exo-0.3.100
libnotify? ( >=x11-libs/libnotify-0.1.3 )
keyboard? ( >=x11-libs/libxklavier-0.3 )
- sound? ( media-libs/libcanberra )"
+ sound? ( media-libs/libcanberra )
+ !<x11-base/xorg-server-1.5.3"
DEPEND="${RDEPEND}
dev-util/intltool
sys-devel/gettext