dev-dotnet/gnome-panel-sharp is only needed with USE 'applet' and dev-dotnet/gnome-desktop-sharp is not needed at all (bug #358673 by Christoph Mende). Remove old.

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

5 files changed, 17 insertions, 145 deletions

diff --git a/app-misc/tomboy/ChangeLog b/app-misc/tomboy/ChangeLog
index ab25cc3a5559..cc6a7a219113 100644
--- a/app-misc/tomboy/ChangeLog
+++ b/app-misc/tomboy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/tomboy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/ChangeLog,v 1.116 2011/03/12 11:54:46 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/ChangeLog,v 1.117 2011/03/15 08:51:50 pacho Exp $
+
+  15 Mar 2011; Pacho Ramos <pacho@gentoo.org> -tomboy-1.2.1.ebuild,
+  -files/tomboy-1.2.1-xmllint-validation.patch, tomboy-1.4.2-r1.ebuild:
+  dev-dotnet/gnome-panel-sharp is only needed with USE 'applet' and
+  dev-dotnet/gnome-desktop-sharp is not needed at all (bug #358673 by Christoph
+  Mende). Remove old.
 
   12 Mar 2011; <angelos@gentoo.org> tomboy-1.2.1.ebuild, tomboy-1.4.2.ebuild,
   tomboy-1.4.2-r1.ebuild:
diff --git a/app-misc/tomboy/Manifest b/app-misc/tomboy/Manifest
index 1a6b587b7cc4..3f98080f3886 100644
--- a/app-misc/tomboy/Manifest
+++ b/app-misc/tomboy/Manifest
@@ -1,19 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-AUX tomboy-1.2.1-xmllint-validation.patch 3530 RMD160 296355050671f29196539190feadf86d20d2f1e2 SHA1 b56d095596742788cfe0cbdf5c06acc145d2f0ec SHA256 44e13f6be0bb21d14645f3f722484e84cd971dcd9d4326b762620fd2c6c67c33
 AUX tomboy-1.4.2-insecure-path.patch 1236 RMD160 3bb1753e9d50952931b57ae8fb99bf546df6f32f SHA1 bf8cc7c6aa4c20bcc6e41c7ebb6d658e7451235b SHA256 92d43d222009f066f86ecbc7164261f9348360df561a8af31eb8edab487a8837
-DIST tomboy-1.2.1.tar.bz2 6548915 RMD160 ddd17f0c53fd82490e66a2e7e769e5846a2ff0f4 SHA1 cf50b648dc40cf1ea066647ce6a6e818d160de26 SHA256 9cb69d399e25e2a773cce5518c60b65dfdb70a46f487527e38cc013688762f99
 DIST tomboy-1.4.2.tar.bz2 7095365 RMD160 5bd97008b34a9b133a9c9d7b3ae9fe2bd73af157 SHA1 34c9a569bfed659a2bdd7b095c736f7c8ded8fde SHA256 823270473c819d6592074a0dcd41c29fd857b29a0318061aaabfa38fff3cc7e7
-EBUILD tomboy-1.2.1.ebuild 1680 RMD160 c2b5fd2ec483dddf12be8e90232c138a000af7e4 SHA1 334d4e53520c0d3659efd88e468404c201c4c10c SHA256 9c9f7da6dd949d01751d96ff524082fe339d829b4ac6875729a17b1699c317c1
-EBUILD tomboy-1.4.2-r1.ebuild 1743 RMD160 9b30e5647bb27a6c38309e34a1ad1bfc149a901b SHA1 d82cd6e999563fbd35092d837ce9809ecae93610 SHA256 fb6ce90d21dbb97bc5f233dec26b3220eeef2f6fdd9e353bf1d255536cd9f183
+EBUILD tomboy-1.4.2-r1.ebuild 1701 RMD160 20fcac84fe638ad9e648bafd12368dc88e71e12a SHA1 c22db4dc524a6a63721087cebb8fba780eb7dcb9 SHA256 b7cb175cfb75e2ebbc6aa3f7d69f47aadd2effbbf965950bb277cccaf62405fe
 EBUILD tomboy-1.4.2.ebuild 1592 RMD160 556d1f127dbb256b796ecece85c64ab3696ec03f SHA1 5bf9f98b756373de84a34290f954035815343902 SHA256 fd76f04d94736c8e958bbf1d2b09403cb77fd3d5887a1af1657ccf65ba5014e9
-MISC ChangeLog 17556 RMD160 47bc909e82af41101ea3b67a9c56cfca79a461e5 SHA1 4f8993f448b70aeb7a58d624c3d71a78514ccc61 SHA256 a35f0f12f10d07077ba57e750698519c9b176fa97f555f97993615ceebc1b4c2
+MISC ChangeLog 17865 RMD160 f10c04b05f2ab437eab18d8ea6e6cd272494cd0f SHA1 ec07b87505e3d10b0f259a8b19f29df95eb86d9e SHA256 d3b3f3ca58992436772f15296026e9032a86120e880990db75b0beb629d029e7
 MISC metadata.xml 382 RMD160 7995d8c071dc3c111daa117243b916f7a5d8398c SHA1 85b1a41e0cf5c90a8ce9eecdec4abdd6297a4569 SHA256 3f7c4f99441bc78e86be2884a3e50a4d94a289b921a6d7a8d07af0c33270c4f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk17XvwACgkQmWq1bYTyC0OTuQD/cPiO4yEawhYfBLG5LlZv3M33
-DBUE4+qjq0YjxcjwxeUA/3qIHBZHx2RbCBIClXGzXTv/i0HPU0qpCs/4975uSZi9
-=kKpb
+iEYEARECAAYFAk1/KKsACgkQCaWpQKGI+9TUowCfS0QQPjH+hmXW+rrsW1tqh/Xd
+LCQAnAtOfg5QhnBGs56jKFdXY1wX7IW2
+=oJuo
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tomboy/files/tomboy-1.2.1-xmllint-validation.patch b/app-misc/tomboy/files/tomboy-1.2.1-xmllint-validation.patch
deleted file mode 100644
index 1fa50a3ea3d6..000000000000
--- a/app-misc/tomboy/files/tomboy-1.2.1-xmllint-validation.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -Naur original/help/fr/fr.po fixed/help/fr/fr.po
---- original/help/fr/fr.po	2010-08-13 14:39:44.000000000 -0400
-+++ fixed/help/fr/fr.po	2010-08-13 14:42:18.000000000 -0400
-@@ -1451,7 +1451,7 @@
- "associées à aucun bloc-notes et pourront être visualisées en choisissant "
- "<menuchoice><guimenuitem>Notes non classées</guimenuitem></menuchoice> dans "
- "la fenêtre <menuchoice><guimenuitem>Rechercher dans toutes les notes</"
--"guimenuitem></menuchoice."
-+"guimenuitem></menuchoice>."
- 
- #: C/tomboy.xml:1072(para)
- msgid "You can delete a notebook you have created by one of two methods:"
-@@ -1774,7 +1774,7 @@
- "keycap></keycombo>."
- msgstr ""
- "Cochez cette case pour créer des liens pour les expressions "
--"<b>CommeCellesCi</b>. Un clic sur ce lien crée une nouvelle note dont le "
-+"<literal>CommeCellesCi</literal>. Un clic sur ce lien crée une nouvelle note dont le "
- "titre correspond au texte du lien. Cochez ou décochez la case à l'aide de la "
- "souris ou au moyen du raccourci clavier <keycombo><keycap>Alt</"
- "keycap><keycap>W</keycap></keycombo>."
-diff -Naur original/help/lt/lt.po fixed/help/lt/lt.po
---- original/help/lt/lt.po	2010-08-13 14:43:51.000000000 -0400
-+++ fixed/help/lt/lt.po	2010-08-13 14:45:22.000000000 -0400
-@@ -690,11 +690,11 @@
- msgstr ""
- "Mygtukas <guibutton>Susieti</guibutton> leidžia esamame raštelyje sukurti "
- "saitą į naują raštelį. Pavyzdžiui, jei jūsų raštelyje yra frazė "
--"<qoute>Egzaminas</qoute>, galite pažymėti šį tekstą pele ir spustelėti "
-+"<quote>Egzaminas</quote>, galite pažymėti šį tekstą pele ir spustelėti "
- "mygtuką <guibutton>Susieti</guibutton>, taip sukurdami naują raštelį "
--"pavadinimu <qoute>Egzaminas</qoute>. Esamame raštelyje taip pat bus sukurtas "
-+"pavadinimu <quote>Egzaminas</quote>. Esamame raštelyje taip pat bus sukurtas "
- "saitas, kurį spustelėjus bus atverstas naujasis raštelis "
--"<qoute>Egzaminas</qoute>."
-+"<quote>Egzaminas</quote>."
- 
- #: C/tomboy.xml:472(para)
- msgid ""
-@@ -733,7 +733,7 @@
- "keyboard, use the standard keybinding, "
- "<keycombo><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo>."
- msgstr ""
--"Veiksmas <qoute>Atšaukti</qoute> Tomboy programoje galimas dėl šio meniu "
-+"Veiksmas <quote>Atšaukti</quote> Tomboy programoje galimas dėl šio meniu "
- "punkto. Atšaukimo funkcija leidžia panaikinti dabartinio seanso metu "
- "atliktus raštelio pakeitimus. Norėdami atšaukti paskutinį pakeitimą "
- "klaviatūra, naudokite standartinę klavišų kombinaciją "
-@@ -750,8 +750,8 @@
- "using the keyboard, use the standard keybinding, <keycombo><keycap>Shift</ke"
- "ycap><keycap>Ctrl</keycap><keycap>Z</keycap></keycombo>."
- msgstr ""
--"Funkcija <qoute>Pakartoti</qoute> yra naudojama norint grąžinti pakeitimus, "
--"atšauktus naudojant funkciją <qoute>Atšaukti</qoute>. Norėdami pakartoti "
-+"Funkcija <quote>Pakartoti</quote> yra naudojama norint grąžinti pakeitimus, "
-+"atšauktus naudojant funkciją <quote>Atšaukti</quote>. Norėdami pakartoti "
- "paskutinį pakeitimą klaviatūra, naudokite standartinę klavišų kombinaciją <k"
- "eycombo><keycap>Lyg2</keycap><keycap>Vald</keycap><keycap>Z</keycap></keycom"
- "bo>."
-@@ -1800,7 +1800,7 @@
- "is preinstalled with Tomboy."
- msgstr ""
- "Įveskite klavišų kombinaciją, atveriančią raštelį <quote>Pradėti "
--"čia</qoute>, kuris yra iš anksto įdiegtas Tomboy programoje."
-+"čia</quote>, kuris yra iš anksto įdiegtas Tomboy programoje."
- 
- #: C/tomboy.xml:1339(term)
- msgid "Create new note"
diff --git a/app-misc/tomboy/tomboy-1.2.1.ebuild b/app-misc/tomboy/tomboy-1.2.1.ebuild
deleted file mode 100644
index 68df6a0c1079..000000000000
--- a/app-misc/tomboy/tomboy-1.2.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.2.1.ebuild,v 1.9 2011/03/12 11:54:46 angelos Exp $
-
-EAPI=2
-
-inherit eutils gnome2 mono
-
-DESCRIPTION="Desktop note-taking application"
-HOMEPAGE="http://www.beatniksoftware.com/tomboy/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="eds galago"
-
-RDEPEND=">=dev-lang/mono-2
-	>=dev-dotnet/gtk-sharp-2.12.6-r1:2
-	>=dev-dotnet/gconf-sharp-2.24.0:2
-	>=dev-dotnet/gnome-sharp-2.24.0:2
-	>=dev-dotnet/gnome-panel-sharp-2.24.0:2
-	>=dev-dotnet/gnome-desktop-sharp-2.24.0:2
-	>=dev-dotnet/ndesk-dbus-0.4
-	>=dev-dotnet/ndesk-dbus-glib-0.3
-	>=dev-dotnet/mono-addins-0.3
-	>=x11-libs/gtk+-2.12.0:2
-	>=dev-libs/atk-1.2.4
-	>=gnome-base/gconf-2:2
-	>=app-text/gtkspell-2.0.9
-	|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
-	eds? ( dev-libs/gmime:2.4[mono] )
-	galago? ( =dev-dotnet/galago-sharp-0.5* )"
-DEPEND="${RDEPEND}
-	app-text/gnome-doc-utils
-	app-text/rarian
-	dev-libs/libxml2:2[python]
-	sys-devel/gettext
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	sed -i -e '/DISABLE_DEPRECATED/d' $(find . -name 'Makefile.in') || die
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
-		|| die "sed failed"
-
-	# Fix xmllint validation, bug #330693
-	epatch "${FILESDIR}/${P}-xmllint-validation.patch"
-}
-
-src_configure() {
-	gnome2_src_configure $(use_enable galago) $(use_enable eds evolution)
-}
diff --git a/app-misc/tomboy/tomboy-1.4.2-r1.ebuild b/app-misc/tomboy/tomboy-1.4.2-r1.ebuild
index 663faec8a963..9451aa6a940f 100644
--- a/app-misc/tomboy/tomboy-1.4.2-r1.ebuild
+++ b/app-misc/tomboy/tomboy-1.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.4.2-r1.ebuild,v 1.6 2011/03/12 11:54:46 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tomboy/tomboy-1.4.2-r1.ebuild,v 1.7 2011/03/15 08:51:50 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -19,8 +19,6 @@ RDEPEND=">=dev-lang/mono-2
 	>=dev-dotnet/gtk-sharp-2.12.6-r1:2
 	>=dev-dotnet/gconf-sharp-2.24.0:2
 	>=dev-dotnet/gnome-sharp-2.24.0:2
-	>=dev-dotnet/gnome-panel-sharp-2.24.0:2
-	>=dev-dotnet/gnome-desktop-sharp-2.24.0:2
 	>=dev-dotnet/ndesk-dbus-0.4
 	>=dev-dotnet/ndesk-dbus-glib-0.3
 	>=dev-dotnet/mono-addins-0.3[gtk]
@@ -28,7 +26,9 @@ RDEPEND=">=dev-lang/mono-2
 	>=dev-libs/atk-1.2.4
 	>=gnome-base/gconf-2:2
 	>=app-text/gtkspell-2.0.9
-	applet? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) )
+	applet? (
+		|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
+		>=dev-dotnet/gnome-panel-sharp-2.24.0:2 )
 	eds? ( dev-libs/gmime:2.4[mono] )
 	galago? ( =dev-dotnet/galago-sharp-0.5* )"
 DEPEND="${RDEPEND}