From cd88edf0b418ff361cc59d9e48916974fca0fa34 Mon Sep 17 00:00:00 2001 From: Peter Weller Date: Tue, 23 Jan 2007 18:31:48 +0000 Subject: [PATCH] Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups. Package-Manager: portage-2.1.2-r1 --- xfce-base/xfwm4/ChangeLog | 5 ++++- xfce-base/xfwm4/Manifest | 16 ++++++++-------- xfce-base/xfwm4/xfwm4-4.4.0.ebuild | 23 ++++++++++------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/xfce-base/xfwm4/ChangeLog b/xfce-base/xfwm4/ChangeLog index af312dfee978..43ddfc8948f9 100644 --- a/xfce-base/xfwm4/ChangeLog +++ b/xfce-base/xfwm4/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/xfwm4 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.75 2007/01/22 02:13:38 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/ChangeLog,v 1.76 2007/01/23 18:31:48 welp Exp $ + + 23 Jan 2007; Peter Weller xfwm4-4.4.0.ebuild: + Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups. *xfwm4-4.4.0 (22 Jan 2007) diff --git a/xfce-base/xfwm4/Manifest b/xfce-base/xfwm4/Manifest index 4a8681e16798..f5cec9bb668f 100644 --- a/xfce-base/xfwm4/Manifest +++ b/xfce-base/xfwm4/Manifest @@ -13,14 +13,14 @@ EBUILD xfwm4-4.3.99.2.ebuild 1124 RMD160 c1770edbb3891c19157d86e68d60d68914433a8 MD5 bf5cb7269165211e6fc97599ca820cd7 xfwm4-4.3.99.2.ebuild 1124 RMD160 c1770edbb3891c19157d86e68d60d68914433a8d xfwm4-4.3.99.2.ebuild 1124 SHA256 dedd0dca5c23884ffa03b58096bd664cdd4a5f9c2d54732d5791e179a1d5d3ab xfwm4-4.3.99.2.ebuild 1124 -EBUILD xfwm4-4.4.0.ebuild 1138 RMD160 781748ed4ebb3903ac7be6029146c366ec3d075c SHA1 2e3710375270b9c7ab9f170ade0fd51f12f09820 SHA256 df5b953d0f72320a71448c36be3495e384cd94601ea1d0e41618635654d2b47c -MD5 a6741278ce1cc8f1db071817527ebc58 xfwm4-4.4.0.ebuild 1138 -RMD160 781748ed4ebb3903ac7be6029146c366ec3d075c xfwm4-4.4.0.ebuild 1138 -SHA256 df5b953d0f72320a71448c36be3495e384cd94601ea1d0e41618635654d2b47c xfwm4-4.4.0.ebuild 1138 -MISC ChangeLog 8742 RMD160 d4188ca39c5d52cbd191ae91f0643a432f814409 SHA1 c21c0f375d5c3501364b899dc4670ab877e91b6f SHA256 7ec381920e6b6a0b5d99dd17ef421a862969f76585763dc595940773455facce -MD5 c78e47d079f65e53dad053d5f9b6ff0c ChangeLog 8742 -RMD160 d4188ca39c5d52cbd191ae91f0643a432f814409 ChangeLog 8742 -SHA256 7ec381920e6b6a0b5d99dd17ef421a862969f76585763dc595940773455facce ChangeLog 8742 +EBUILD xfwm4-4.4.0.ebuild 1131 RMD160 91e05efea0d64cc8d4a8e60eaa698ac25b31f25a SHA1 d82635749ad4bfc3a5bf60cf199f2471cbac6b4b SHA256 20f2cc31500761e36c07fdd6b49a204d3279c173aa09d85713be4ede6280682a +MD5 162fff3faf3ace85b57bab4382c8c09d xfwm4-4.4.0.ebuild 1131 +RMD160 91e05efea0d64cc8d4a8e60eaa698ac25b31f25a xfwm4-4.4.0.ebuild 1131 +SHA256 20f2cc31500761e36c07fdd6b49a204d3279c173aa09d85713be4ede6280682a xfwm4-4.4.0.ebuild 1131 +MISC ChangeLog 8885 RMD160 df19bfa216fda61d4d8c30faf13156957ccc1783 SHA1 01f4acf7f79a5ae72dc0f5434a9925196a35efc7 SHA256 f2ad2c2ccbe4c2ae0228693b223d8ac360bcd1fe6d181bfd989d79dc4de2fab3 +MD5 77d0a5d9d558651cb3e76a414b9db495 ChangeLog 8885 +RMD160 df19bfa216fda61d4d8c30faf13156957ccc1783 ChangeLog 8885 +SHA256 f2ad2c2ccbe4c2ae0228693b223d8ac360bcd1fe6d181bfd989d79dc4de2fab3 ChangeLog 8885 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157 diff --git a/xfce-base/xfwm4/xfwm4-4.4.0.ebuild b/xfce-base/xfwm4/xfwm4-4.4.0.ebuild index 1866af41268d..7a3c98e75bb0 100644 --- a/xfce-base/xfwm4/xfwm4-4.4.0.ebuild +++ b/xfce-base/xfwm4/xfwm4-4.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.4.0.ebuild,v 1.1 2007/01/22 02:13:38 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfwm4/xfwm4-4.4.0.ebuild,v 1.2 2007/01/23 18:31:48 welp Exp $ inherit xfce44 @@ -11,30 +11,27 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="debug startup-notification xcomposite" -RDEPEND="|| ( ( x11-libs/libX11 +RDEPEND="x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender x11-libs/libXpm x11-libs/libICE x11-libs/libSM - x11-libs/libXext ) - virtual/x11 ) - xcomposite? ( || ( ( x11-libs/libXcomposite + x11-libs/libXext + xcomposite? ( x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes ) - virtual/x11 ) ) >=dev-libs/glib-2 >=x11-libs/gtk+-2.6 x11-libs/pango startup-notification? ( >=x11-libs/startup-notification-0.5 ) - >=xfce-base/libxfce4mcs-${PV} - >=xfce-base/libxfce4util-${PV} - >=xfce-base/libxfcegui4-${PV}" + >=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION} + >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION} + >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}" DEPEND="${RDEPEND} - || ( ( x11-proto/xextproto - x11-proto/xproto ) - virtual/x11 ) - >=xfce-base/xfce-mcs-manager-${PV}" + x11-proto/xextproto + x11-proto/xproto + >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}" XFCE_CONFIG="${XFCE_CONFIG} --enable-randr $(use_enable xcomposite compositor) \ $(use_enable startup-notification)" -- 2.26.2