From 02fd725cd28b0cad748c30a9d61a454b2a2af967 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Tue, 23 Feb 2010 19:37:22 +0000 Subject: [PATCH] gnome-panel dependency is optional, bug #298932, thanks to Olaf for noticing. Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- app-misc/gnote/ChangeLog | 7 ++++- app-misc/gnote/Manifest | 16 +++++----- app-misc/gnote/gnote-0.6.2.ebuild | 52 ------------------------------- app-misc/gnote/gnote-0.6.3.ebuild | 9 +++--- app-misc/gnote/gnote-0.7.1.ebuild | 7 +++-- 5 files changed, 22 insertions(+), 69 deletions(-) delete mode 100644 app-misc/gnote/gnote-0.6.2.ebuild diff --git a/app-misc/gnote/ChangeLog b/app-misc/gnote/ChangeLog index 502592c894f5..54f5ad448524 100644 --- a/app-misc/gnote/ChangeLog +++ b/app-misc/gnote/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/gnote # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.5 2010/01/11 23:20:38 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.6 2010/02/23 19:37:22 eva Exp $ + + 23 Feb 2010; Gilles Dartiguelongue -gnote-0.6.2.ebuild, + gnote-0.6.3.ebuild, gnote-0.7.1.ebuild: + gnome-panel dependency is optional, bug #298932, thanks to Olaf for + noticing. *gnote-0.7.1 (11 Jan 2010) diff --git a/app-misc/gnote/Manifest b/app-misc/gnote/Manifest index a1cdcc502920..6a25df264a3e 100644 --- a/app-misc/gnote/Manifest +++ b/app-misc/gnote/Manifest @@ -2,18 +2,16 @@ Hash: SHA1 AUX gnote-0.6.1-dbus-switch.patch 1486 RMD160 f5b3273d9ef89e1be21b9bed0314b8a95249b912 SHA1 92fb3adc5bbb520c8f5992d44ee361fb4b321082 SHA256 7fa4abfd81ca5a811847d50e6f20c581324b764fbf3551f27b9c86eb801eec1c -DIST gnote-0.6.2.tar.bz2 1215674 RMD160 c5ce888c711dadf9322d0aebb2b27afdfc561909 SHA1 c3db65642a561fbe9339cacf1b60fa90e63c8b04 SHA256 6a2af8f4e4f0d68e67cef8c796dd4a048d99601d7192d19127a88e273b91b648 DIST gnote-0.6.3.tar.bz2 1298042 RMD160 ef6c5fd2770a67c8390ba22c3a8a9b4ecc6cf72d SHA1 18d7bff1e1afefd18bee406473f6fb0d6504f5ed SHA256 dd45347f0ed3713b1d23b5c50f9dce83d86628405cd7ae8dd9f68028211e90b2 DIST gnote-0.7.1.tar.bz2 1304699 RMD160 64c209400cf87cd08fbe9691938ba09ba4dc9e01 SHA1 f75b6bb3dff70ebce477dd2ae291e8be32c77a24 SHA256 2e11ba64e67d36adf6c968b315913ba071e9429bb6a7f8432be81081060570e1 -EBUILD gnote-0.6.2.ebuild 1256 RMD160 6419a825840db06f39bf6e79e579aeb600c38cb8 SHA1 d3797a49992576df77f9f38fcb59cdb48dae8e2d SHA256 79bf7fec0437d88a7828b612d713de8776dc422bc93f393cbe4b3c84804f90fd -EBUILD gnote-0.6.3.ebuild 1079 RMD160 5e0187fefad32d1822a7f54e685fd15ca32697d8 SHA1 dcb9c2f6559e5f1a72e5dc9520641e02282b8f38 SHA256 78a98dc2f3092192d9a019a86f8fe87827ae930a305442af5ec6660dafa0cb62 -EBUILD gnote-0.7.1.ebuild 1079 RMD160 dc0ade4f8886928ae9895c3a7b6f171bd74d1d20 SHA1 49551035e0fa16bd64670422bd9939749cd6afb7 SHA256 05a4c1a9a7fc213472aecbbc7f3271eb087b0babe9e44aff8da1cc7213424d64 -MISC ChangeLog 1086 RMD160 0e6b9e63dec3d498ee2d354b5d53270b38a35167 SHA1 2096f9f8c045092dcef16ee50796d0a7a89a0ff5 SHA256 ca9621f927b36d56dd66a243df58c82956ebe8978c8bf4015a511aa054a9340c +EBUILD gnote-0.6.3.ebuild 1082 RMD160 b7741d6fe09f5b8f5959bd13d586508e03434ba7 SHA1 93db1b162e0ff464db8ac500f003fbe3d14ece81 SHA256 ef74879b8a1084dca21a5fd5ef154c95e5b0d5ed88b3e124a7bb704eb77c1401 +EBUILD gnote-0.7.1.ebuild 1082 RMD160 9374b9a89c40f812d4d5cff6068c166b47255312 SHA1 8b6ba9e7282c49f7c6977163c511c506fb96478a SHA256 c1c8112f030eedfd3e39629573f30bceb13e6b92ab43f723c09c171d1dc70399 +MISC ChangeLog 1286 RMD160 5e2b9a09864f52016b6d3d68c997ededdfdadc15 SHA1 d3ddf540c169414e765346d27d65d5163b1dd98a SHA256 9c13a3dcb3e5182cd661ce3a66f75693c3f4f855785357548f08d2e0aeb88388 MISC metadata.xml 360 RMD160 cf909f1a4ac3af93e460b399f39aa8cb325b992e SHA1 5bf9ef61ef8587bdb9bc0365fdb6fd935ad3583a SHA256 bb3a0273a2bc0105a61ddbbe4dddb9189553625ff0c4ff946dd201a454b4a9b7 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.13 (GNU/Linux) +Version: GnuPG v2.0.14 (GNU/Linux) -iEYEARECAAYFAktLskwACgkQ1fmVwcYIWAaurgCg324GMkuVWb+mNB4cqLC93Nyp -9+sAnR7I3xMJdnwgXDJczYBLiGNGPigu -=vJMm +iEYEARECAAYFAkuELngACgkQ1fmVwcYIWAYz0ACdGP9JAW1TcUlurqr/qakhpcnK +FskAn3jmXtElVoo5ZqA4D+PHaqxlMTGp +=6sfz -----END PGP SIGNATURE----- diff --git a/app-misc/gnote/gnote-0.6.2.ebuild b/app-misc/gnote/gnote-0.6.2.ebuild deleted file mode 100644 index a38570ee9202..000000000000 --- a/app-misc/gnote/gnote-0.6.2.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.6.2.ebuild,v 1.2 2009/08/26 21:54:04 eva Exp $ - -EAPI="2" - -inherit gnome2 - -DESCRIPTION="Desktop note-taking application" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="applet debug" # dbus - -RDEPEND=">=x11-libs/gtk+-2.14 - >=dev-cpp/glibmm-2 - >=dev-cpp/gtkmm-2.12 - >=dev-libs/libxml2-2 - dev-libs/libxslt - >=gnome-base/gconf-2 - >=dev-libs/libpcre-7.8[cxx] - >=app-text/gtkspell-2.0.9 - >=dev-libs/boost-1.34 - sys-libs/e2fsprogs-libs - >=gnome-base/gnome-panel-2 - applet? ( >=dev-cpp/libpanelappletmm-2.26 )" -# Build with dbus is currently not implemented -# dbus? ( >=dev-libs/dbus-glib-0.70 )" -DEPEND="${DEPEND} - dev-util/pkgconfig - >=dev-util/intltool-0.35.0 - app-text/gnome-doc-utils - app-text/docbook-xml-dtd:4.1.2" - -DOCS="AUTHORS ChangeLog NEWS README TODO" - -src_prepare() { - gnome2_src_prepare - - # Fix intltoolize broken file, see upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed" -} - -pkg_setup() { - G2CONF="${G2CONF} - --disable-dbus - --disable-static - $(use_enable applet) - $(use_enable debug)" -} diff --git a/app-misc/gnote/gnote-0.6.3.ebuild b/app-misc/gnote/gnote-0.6.3.ebuild index 7b6f4c291133..6d93779539cd 100644 --- a/app-misc/gnote/gnote-0.6.3.ebuild +++ b/app-misc/gnote/gnote-0.6.3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.6.3.ebuild,v 1.1 2009/12/13 21:51:45 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.6.3.ebuild,v 1.2 2010/02/23 19:37:22 eva Exp $ EAPI="2" @@ -24,8 +24,9 @@ RDEPEND=">=x11-libs/gtk+-2.14 >=app-text/gtkspell-2.0.9 >=dev-libs/boost-1.34 sys-libs/e2fsprogs-libs - >=gnome-base/gnome-panel-2 - applet? ( >=dev-cpp/libpanelappletmm-2.26 )" + applet? ( + >=gnome-base/gnome-panel-2 + >=dev-cpp/libpanelappletmm-2.26 )" # Build with dbus is currently not implemented # dbus? ( >=dev-libs/dbus-glib-0.70 )" DEPEND="${DEPEND} diff --git a/app-misc/gnote/gnote-0.7.1.ebuild b/app-misc/gnote/gnote-0.7.1.ebuild index eeab0a4c6bce..e7dc3d26ab99 100644 --- a/app-misc/gnote/gnote-0.7.1.ebuild +++ b/app-misc/gnote/gnote-0.7.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/app-misc/gnote/gnote-0.7.1.ebuild,v 1.1 2010/01/11 23:20:38 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-0.7.1.ebuild,v 1.2 2010/02/23 19:37:22 eva Exp $ EAPI="2" @@ -24,8 +24,9 @@ RDEPEND=">=x11-libs/gtk+-2.14 >=app-text/gtkspell-2.0.9 >=dev-libs/boost-1.34 sys-libs/e2fsprogs-libs - >=gnome-base/gnome-panel-2 - applet? ( >=dev-cpp/libpanelappletmm-2.26 )" + applet? ( + >=gnome-base/gnome-panel-2 + >=dev-cpp/libpanelappletmm-2.26 )" # Build with dbus is currently not implemented # dbus? ( >=dev-libs/dbus-glib-0.70 )" DEPEND="${DEPEND} -- 2.26.2