Removing usage of virtual/x11, and hardcoding in depends. Minor clean ups.

Package-Manager: portage-2.1.2-r1

diff --git a/xfce-base/orage/ChangeLog b/xfce-base/orage/ChangeLog
index 4ae2f8e3e93436e418cc600d0ef0da901cc7da96..7834dd9d0e1cdfa49c5fcacf973fcc145d1e4121 100644 (file)
--- a/xfce-base/orage/ChangeLog
+++ b/xfce-base/orage/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/orage
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/orage/ChangeLog,v 1.11 2007/01/23 13:39:28 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/orage/ChangeLog,v 1.12 2007/01/23 16:46:19 welp Exp $
+
+  23 Jan 2007; Peter Weller <welp@gentoo.org> orage-4.4.0.ebuild:
+  Removing usage of virtual/x11,  and hardcoding in depends. Minor clean ups.
 
   23 Jan 2007; Joshua Nichols <nichoj@gentoo.org> orage-4.4.0.ebuild:
   Removed berkdb USE flag, as it doesn't do anything. See bug #163237.

diff --git a/xfce-base/orage/Manifest b/xfce-base/orage/Manifest
index 5a38acf93a13472271f643148c9d1ea70dd2e1b7..44d990ef0533ab071527cf1f4acd1063794e04c5 100644 (file)
--- a/xfce-base/orage/Manifest
+++ b/xfce-base/orage/Manifest
@@ -8,14 +8,14 @@ EBUILD orage-4.3.99.2.ebuild 806 RMD160 fd15843d4caedcb897df8c3bc61fba7a377f8ecf
 MD5 58fbd3b7f79940d1969983754b7b91dc orage-4.3.99.2.ebuild 806
 RMD160 fd15843d4caedcb897df8c3bc61fba7a377f8ecf orage-4.3.99.2.ebuild 806
 SHA256 5a3038f0d1bcc064c902790c00be27c8fa23fd7c66bba08040151fda025f6c90 orage-4.3.99.2.ebuild 806
-EBUILD orage-4.4.0.ebuild 754 RMD160 969aa33406c4fe7e1539e877ede2834f9923a785 SHA1 4c2d7bb7033e7c78fdc84ab065dc588faa95a01c SHA256 401e14cc1bb61e62b8ea78a85ceafdbca10fc3ddd7b2cf673baccd45223fbd68
-MD5 b9d50ab9a84ec2afa71c9c2c511c10a5 orage-4.4.0.ebuild 754
-RMD160 969aa33406c4fe7e1539e877ede2834f9923a785 orage-4.4.0.ebuild 754
-SHA256 401e14cc1bb61e62b8ea78a85ceafdbca10fc3ddd7b2cf673baccd45223fbd68 orage-4.4.0.ebuild 754
-MISC ChangeLog 1715 RMD160 c170f4350043e54869fd6e6bbf3f2539ab21abfb SHA1 b2a625b0fea222a6cc0c15c0ba952638cdbedb1e SHA256 238a424a02f4455b12c0507b31410461156a119d2e37529d1523f7b98dbf8205
-MD5 9337fe3bd8c1d8dba2f731b2f6f111ec ChangeLog 1715
-RMD160 c170f4350043e54869fd6e6bbf3f2539ab21abfb ChangeLog 1715
-SHA256 238a424a02f4455b12c0507b31410461156a119d2e37529d1523f7b98dbf8205 ChangeLog 1715
+EBUILD orage-4.4.0.ebuild 800 RMD160 70c1bce673e529e10e0f0333fec73abbf66f3165 SHA1 f66529d76053f77abff7a147a3163b4da185b443 SHA256 da929e8acf4de22ec3d9e8c7109c4e553817fea81b953f39f68e9c02a1c3e907
+MD5 524041350852aa60f7bed7b7908e9c21 orage-4.4.0.ebuild 800
+RMD160 70c1bce673e529e10e0f0333fec73abbf66f3165 orage-4.4.0.ebuild 800
+SHA256 da929e8acf4de22ec3d9e8c7109c4e553817fea81b953f39f68e9c02a1c3e907 orage-4.4.0.ebuild 800
+MISC ChangeLog 1858 RMD160 18c48d651d65286c827913b1116eab94fc8a614f SHA1 21a794fea5b38b7cd1ec7ff54cada65ee75d3ba8 SHA256 96c720a8a37538ced870fd06b4a31b6979b06e0e94083ca4d188c90ed1a557ac
+MD5 e6d31d30f5d96573f304c76f8e9579e0 ChangeLog 1858
+RMD160 18c48d651d65286c827913b1116eab94fc8a614f ChangeLog 1858
+SHA256 96c720a8a37538ced870fd06b4a31b6979b06e0e94083ca4d188c90ed1a557ac ChangeLog 1858
 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/orage/orage-4.4.0.ebuild b/xfce-base/orage/orage-4.4.0.ebuild
index 95bb29a9e622a18dfcadcd677fcf5c38ea41016b..b8ce9421efa41cbcd5b8358cb562f18572df2083 100644 (file)
--- a/xfce-base/orage/orage-4.4.0.ebuild
+++ b/xfce-base/orage/orage-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/orage/orage-4.4.0.ebuild,v 1.2 2007/01/23 13:39:28 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/orage/orage-4.4.0.ebuild,v 1.3 2007/01/23 16:46:19 welp Exp $
 
 inherit xfce44
 
@@ -10,14 +10,12 @@ DESCRIPTION="Calendar for Xfce4"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug"
 
-RDEPEND="|| ( x11-libs/libX11
-       virtual/x11 )
-       >=dev-libs/glib-2.2
+RDEPEND=">=dev-libs/glib-2.2
        >=x11-libs/gtk+-2.2
-       >=xfce-base/libxfce4mcs-${PV}
-       >=xfce-base/libxfce4util-${PV}
-       >=xfce-base/libxfcegui4-${PV}
-       >=xfce-base/xfce4-panel-${PV}
+       >=xfce-base/libxfce4mcs-${XFCE_MASTER_VERSION}
+       >=xfce-base/libxfce4util-${XFCE_MASTER_VERSION}
+       >=xfce-base/libxfcegui4-${XFCE_MASTER_VERSION}
+       >=xfce-base/xfce4-panel-${XFCE_MASTER_VERSION}
        dev-libs/atk
        media-libs/libpng
        sys-libs/zlib
@@ -25,6 +23,6 @@ RDEPEND="|| ( x11-libs/libX11
        x11-libs/pango
        !xfce-extra/xfcalendar"
 DEPEND="${RDEPEND}
-       >=xfce-base/xfce-mcs-manager-${PV}"
+       >=xfce-base/xfce-mcs-manager-${XFCE_MASTER_VERSION}"
 
 xfce44_core_package