After more discussion in bug 323791, it was decided to indeed remove terminal from...

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/xfce-base/xfce4-meta/ChangeLog b/xfce-base/xfce4-meta/ChangeLog
index fdd715828c0f235556e96b9e3b46b4587f02b081..1bff884cb5d48e470e181ad4ae43ebcca698c946 100644 (file)
--- a/xfce-base/xfce4-meta/ChangeLog
+++ b/xfce-base/xfce4-meta/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for xfce-base/xfce4-meta
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/ChangeLog,v 1.5 2010/06/13 16:11:28 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/ChangeLog,v 1.6 2010/06/14 00:59:27 darkside Exp $
+
+  14 Jun 2010; Jeremy Olexa <darkside@gentoo.org> xfce4-meta-4.6.1.ebuild:
+  After more discussion in bug 323791, it was decided to indeed remove
+  terminal from this the meta package and instead make it more clear in the
+  docs, bug 323801
 
   13 Jun 2010; Christoph Mende <angelos@gentoo.org> xfce4-meta-4.6.1.ebuild:
   Added x11-terms/terminal to USE=-minimal

diff --git a/xfce-base/xfce4-meta/Manifest b/xfce-base/xfce4-meta/Manifest
index 2b41e7e013f92f72fa4be0e88d237e8d93f06333..ff95ae8999c9352a4495e12a7472483b9357b57c 100644 (file)
--- a/xfce-base/xfce4-meta/Manifest
+++ b/xfce-base/xfce4-meta/Manifest
@@ -1,13 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-EBUILD xfce4-meta-4.6.1.ebuild 897 RMD160 3efd96d2fb9a3d20aaf13feb6452514a9ad7588a SHA1 de5f0738aa906590addf8c1816b7fe336a5b0219 SHA256 23d8b1e0bc157ce49873dee1596cd2875c916aad1c8693d1ae59197c0cd4903c
-MISC ChangeLog 873 RMD160 5742849cc4615576486a9377e8b246049e432177 SHA1 55f2524df0a5e58d24805fe39058d7ea1fbd40cf SHA256 b8ad2ddb40d361842357750a4def0301813f99e105a7d8544fab78eac2ceb0ec
+EBUILD xfce4-meta-4.6.1.ebuild 877 RMD160 a1958cf21b95cc33a7075295252ddab5d026c928 SHA1 937e7258a9c9b4227dd099cdcff5d3434c5a6bc7 SHA256 9dbcc29690a2d0639df39c3a6eb91ace6c8215787ec37bf247813564048eabea
+MISC ChangeLog 1116 RMD160 7ace89772f155486b8d3b547a45ffd44d642446b SHA1 36db73ad9f1d93831e521994140dead7f466a001 SHA256 990cd6f85ba1be3301f9c8ddcc909f2cf29f6fdc3afe035a90a3844195207fc2
 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iF4EAREIAAYFAkwVA0oACgkQmWq1bYTyC0MMFQEApSesFwD85skr5ZzQN8mzgtFD
-AY4cwJcsY7qO7AtrzjMA/RaOiTrJVDIHsBLr6IaGC4lCgTUGm3Z2zE7hPJAW9qRj
-=tyuR
------END PGP SIGNATURE-----

diff --git a/xfce-base/xfce4-meta/xfce4-meta-4.6.1.ebuild b/xfce-base/xfce4-meta/xfce4-meta-4.6.1.ebuild
index c3b1d86c1429a5507d5d3220f7db79a3adbecfa0..d5af0bc36835efa7d60acae52fed3311c31b8b28 100644 (file)
--- a/xfce-base/xfce4-meta/xfce4-meta-4.6.1.ebuild
+++ b/xfce-base/xfce4-meta/xfce4-meta-4.6.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/xfce4-meta-4.6.1.ebuild,v 1.8 2010/06/13 16:11:28 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/xfce-base/xfce4-meta/xfce4-meta-4.6.1.ebuild,v 1.9 2010/06/14 00:59:27 darkside Exp $
 
 EAPI=2
 
@@ -21,7 +21,6 @@ RDEPEND="x11-themes/gtk-engines-xfce
        >=xfce-base/xfce4-settings-${PV}
        x11-themes/hicolor-icon-theme
        !minimal? ( media-fonts/dejavu
-               x11-terms/terminal
                x11-themes/xfce4-icon-theme )
        session? ( >=xfce-base/xfce4-session-${PV} )
        svg? ( gnome-base/librsvg )"