Stop installing xffm and xfcalendar. Remove blockers against nonexisting Xfce 3.9...

Package-Manager: portage-2.1.2.2

diff --git a/xfce-base/xfce4/ChangeLog b/xfce-base/xfce4/ChangeLog
index 911e33b326f8f92b7a67b52361a6d31b578b08d6..4afc35ffb8c35885c1dc0c45c5f86db0b13f8b37 100644 (file)
--- a/xfce-base/xfce4/ChangeLog
+++ b/xfce-base/xfce4/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for xfce-base/xfce4
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/ChangeLog,v 1.89 2007/03/10 18:58:41 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/ChangeLog,v 1.90 2007/03/11 10:02:02 drac Exp $
+
+  11 Mar 2007; Samuli Suominen <drac@gentoo.org> xfce4-4.2.3.2.ebuild:
+  Stop installing xffm and xfcalendar.
 
   10 Mar 2007; nixnut <nixnut@gentoo.org> xfce4-4.4.0.ebuild:
   Stable on ppc wrt bug 169987

diff --git a/xfce-base/xfce4/Manifest b/xfce-base/xfce4/Manifest
index 5e3c82254d416564f0503d16405114faf111c72d..5e7ccda41eda774e8234bc9ec797736999215c8d 100644 (file)
--- a/xfce-base/xfce4/Manifest
+++ b/xfce-base/xfce4/Manifest
@@ -1,15 +1,15 @@
-EBUILD xfce4-4.2.3.2.ebuild 1637 RMD160 f0a302f995da95d00f0626e425080b9f5d4419c2 SHA1 ec388e95709da11680bc68d46017706a886ec6fa SHA256 99de1ca3cbc1b8b7f2c5d45657437f5a2ff492d7aef4c61751103c209f355c1b
-MD5 330931661ba850300fd06d668d7be0aa xfce4-4.2.3.2.ebuild 1637
-RMD160 f0a302f995da95d00f0626e425080b9f5d4419c2 xfce4-4.2.3.2.ebuild 1637
-SHA256 99de1ca3cbc1b8b7f2c5d45657437f5a2ff492d7aef4c61751103c209f355c1b xfce4-4.2.3.2.ebuild 1637
+EBUILD xfce4-4.2.3.2.ebuild 1467 RMD160 ae4efcb876e8a179530e8e2d58a2e7ef399e71ff SHA1 24d1e0f0ec80d9f974a1943532532c523345d75a SHA256 ff076dce97db39f11a2ce02802ecaebff2f8885bb170702bd30dee7be01a3799
+MD5 a30d334dbf68ea32fa8d16ee2b989b42 xfce4-4.2.3.2.ebuild 1467
+RMD160 ae4efcb876e8a179530e8e2d58a2e7ef399e71ff xfce4-4.2.3.2.ebuild 1467
+SHA256 ff076dce97db39f11a2ce02802ecaebff2f8885bb170702bd30dee7be01a3799 xfce4-4.2.3.2.ebuild 1467
 EBUILD xfce4-4.4.0.ebuild 1539 RMD160 7a3b7578941e6c4cd3b55f3f7c2a1cdaeee6af7b SHA1 c28e1dd0a0d9fcb16d9c4794794264ab39739c79 SHA256 caaf5576da60e18b21ce6dc5fba87cca4336e96c69de6816663ca8a94a5668d7
 MD5 1b4c07f51536444179709eb6ad46cccd xfce4-4.4.0.ebuild 1539
 RMD160 7a3b7578941e6c4cd3b55f3f7c2a1cdaeee6af7b xfce4-4.4.0.ebuild 1539
 SHA256 caaf5576da60e18b21ce6dc5fba87cca4336e96c69de6816663ca8a94a5668d7 xfce4-4.4.0.ebuild 1539
-MISC ChangeLog 10504 RMD160 762a87646603b46f368c2456f150f3b6381a9d54 SHA1 99037111bfb9ab075b1832ae7a1fb26c719ad4e6 SHA256 6de7c3d5de64577d2597413041291e552a8e8d40ff097ef57fa37997593e43ad
-MD5 4010c5de95d2b76c019b06b75d9e91c2 ChangeLog 10504
-RMD160 762a87646603b46f368c2456f150f3b6381a9d54 ChangeLog 10504
-SHA256 6de7c3d5de64577d2597413041291e552a8e8d40ff097ef57fa37997593e43ad ChangeLog 10504
+MISC ChangeLog 10613 RMD160 583f676d8c7d6db26f2a761845fd593c289f396e SHA1 4340ee4fed18ea92b5c457745dd2e2a4a9c37b5b SHA256 2f0e6bc1438df510ff863b2b35d0f9e2702389d50232af0fbe7837de4b123271
+MD5 e8c4bbc376e8ba2e96e6297d6fae7000 ChangeLog 10613
+RMD160 583f676d8c7d6db26f2a761845fd593c289f396e ChangeLog 10613
+SHA256 2f0e6bc1438df510ff863b2b35d0f9e2702389d50232af0fbe7837de4b123271 ChangeLog 10613
 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/xfce4/xfce4-4.2.3.2.ebuild b/xfce-base/xfce4/xfce4-4.2.3.2.ebuild
index ac8f033aed62e40ad51e074375631acfbdb17a66..0c066960a479112c207992da36e554d09b4c38a3 100644 (file)
--- a/xfce-base/xfce4/xfce4-4.2.3.2.ebuild
+++ b/xfce-base/xfce4/xfce4-4.2.3.2.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/xfce4/xfce4-4.2.3.2.ebuild,v 1.14 2007/01/18 14:56:14 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4/xfce4-4.2.3.2.ebuild,v 1.15 2007/03/11 10:02:02 drac Exp $
 
 inherit versionator
 
@@ -31,12 +31,9 @@ RDEPEND="${DEPEND}
        ~xfce-extra/xfce4-toys-${MY_PV}
        ~xfce-extra/xfce4-trigger-launcher-${MY_PV}
        ~xfce-extra/xfwm4-themes-${MY_PV}
-       ~xfce-extra/xfcalendar-${MY_PV}
        ~xfce-extra/xfce4-appfinder-${MY_PV}
        ~xfce-extra/xfce4-icon-theme-${MY_PV}
-       ~xfce-base/xffm-${MY_PV}
-       ~xfce-extra/xfce4-mixer-${MY_PV}
-       !xfce-base/xfce4-base"
+       ~xfce-extra/xfce4-mixer-${MY_PV}"
 
 src_install() {
        dodir /etc/X11/Sessions
@@ -45,8 +42,6 @@ src_install() {
 }
 
 pkg_postinst() {
-       einfo
-       ewarn "As of Xfce 4.2 xfce-base/xfce4-base is deprecated, please remove it."
        einfo
        einfo "For extra functionality please emerge xfce-base/xfce4-extras."
        einfo "To start Xfce the default script is startxfce4."

diff --git a/xfce-base/xffm/Manifest b/xfce-base/xffm/Manifest
index f85709abe330c0eaa886a7f72be557f3dd925419..9a2f5e4712265fecfd6c7bdb3527943c4e02734b 100644 (file)
--- a/xfce-base/xffm/Manifest
+++ b/xfce-base/xffm/Manifest
@@ -3,14 +3,14 @@ MD5 db40ffdfcb4c71dd7883c97dbea254d4 files/xffm-4.2.1-gcc4.patch 855
 RMD160 61eef11b9367d93db2416ffbc47956475b8e9c30 files/xffm-4.2.1-gcc4.patch 855
 SHA256 1c52ebe64a906962ad054f9f323e19015fba85e4507fac8868e6c0ef871da877 files/xffm-4.2.1-gcc4.patch 855
 DIST xffm-4.2.3.tar.gz 5117799 RMD160 6de5cca2375c364b86d82ec3701db61248d72c66 SHA1 f1d4ddd9377c241ee94bc373d7f9b8ef58a79ca2 SHA256 791a05a2fd695508ff6b3fd3e0e2be66de28a3d0bf86ee22e14126992d7aef21
-EBUILD xffm-4.2.3.ebuild 616 RMD160 60675c098fe359155b9b7250cc4dccf1394dc1cc SHA1 0a41bc1b9f159392beadfc5c73a675aa468019b9 SHA256 8034f1b7a654c2cc852f0c5688de6ce708414379cdf947229354a8e08882f36e
-MD5 3b40fb57d5d501f960935ba92a450e31 xffm-4.2.3.ebuild 616
-RMD160 60675c098fe359155b9b7250cc4dccf1394dc1cc xffm-4.2.3.ebuild 616
-SHA256 8034f1b7a654c2cc852f0c5688de6ce708414379cdf947229354a8e08882f36e xffm-4.2.3.ebuild 616
-MISC ChangeLog 7652 RMD160 5b17afabda1faf9ab967073c0545b44c951c1e2d SHA1 d6dd73e36d959a3fe53babaf4a594a5b43f16494 SHA256 e167d9019b658f5b21652fa3f70bcb1122cd5677c8b6983c133396a8ab22f96a
-MD5 8e8f358cef6f0d9d19f190ee582eb994 ChangeLog 7652
-RMD160 5b17afabda1faf9ab967073c0545b44c951c1e2d ChangeLog 7652
-SHA256 e167d9019b658f5b21652fa3f70bcb1122cd5677c8b6983c133396a8ab22f96a ChangeLog 7652
+EBUILD xffm-4.2.3.ebuild 509 RMD160 7d2b714c1d99d08421c164092e5c6fcce502a435 SHA1 22d57b3b58ec3e3b2147d84fe78343914462250d SHA256 fa33e04a7b3e255437543dd6545ea76b0be75ee8114ebd4d901870bfd18100fa
+MD5 ea0928e90b7e16fab89e139d2f6e0aeb xffm-4.2.3.ebuild 509
+RMD160 7d2b714c1d99d08421c164092e5c6fcce502a435 xffm-4.2.3.ebuild 509
+SHA256 fa33e04a7b3e255437543dd6545ea76b0be75ee8114ebd4d901870bfd18100fa xffm-4.2.3.ebuild 509
+MISC ChangeLog 7805 RMD160 d84589ebd371b9d3126237898727cf050443d22f SHA1 cc2cdc63a21a7eb2d233204d0eed044b8e379b15 SHA256 5256123648d53e6eecdd1534c6a95ac665e4cfc06d09fbeae183062f82780e0a
+MD5 be0bb000064fc558256431c11f669dbd ChangeLog 7805
+RMD160 d84589ebd371b9d3126237898727cf050443d22f ChangeLog 7805
+SHA256 5256123648d53e6eecdd1534c6a95ac665e4cfc06d09fbeae183062f82780e0a ChangeLog 7805
 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61
 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157
 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157