Add docbook-xml-dtd:4.1.2 to DEPEND, bug #317263.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

6 files changed, 19 insertions, 176 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 433a3190cbe9..3b5cec25cd01 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.291 2010/06/04 20:51:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.292 2010/06/08 12:06:22 eva Exp $
+
+  08 Jun 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  evolution-2.26.3.ebuild, -evolution-2.28.2.ebuild,
+  evolution-2.28.3.1.ebuild, evolution-2.28.3.1-r1.ebuild:
+  Add docbook-xml-dtd:4.1.2 to DEPEND, bug #317263.
 
   04 Jun 2010; Markus Meier <maekke@gentoo.org> evolution-2.28.3.1.ebuild:
   x86 stable, bug #314899
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 318a800362f4..69fe2838bffb 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX evolution-2.21.3-fbsd.patch 1107 RMD160 7dbbf08ed68124a398b9db64bac6a4b0cecfa9ef SHA1 05f581d030bb81aad2e0f734f432dd23add4b3c2 SHA256 942b81689f9e4b5a1896ec7c810c323bfaeb74d40c6c6683d8dfd8b670236e77
 AUX evolution-2.23.3.1-delete-key.patch 2382 RMD160 41e30f2f9e52c8a1a45db11d12fa5da8eb137c04 SHA1 2df3f06c427072d2de7bf379f6d0b6fedaf2a4e1 SHA256 37809a6b12cb93a6da0cf11a50e33d040380ac31b1377eba867e3a12f92d1cbc
 AUX evolution-2.26.3-automagic-plugins.patch 7022 RMD160 2e7279257e90c66abbfc4703ba0fbba015b6f484 SHA1 23602b5b73caf2b06235422042ae3e32c6b520c3 SHA256 acae2843c8068b298b0e54eb263b3b7582ddf272aae5c0ceffa3d4d095f40e91
@@ -12,18 +9,9 @@ AUX evolution-2.28.3.1-allow-setting-alarms_3.patch 1890 RMD160 e42285e4817e98eb
 AUX evolution-2.28.3.1-attachment-bar-RTL.patch 1360 RMD160 e2f512542837dd47c820f2a23b936f5a065665b7 SHA1 f2df4a491ccea878232dd55747526b4f80a40ff8 SHA256 1afb9010a997be10e168dcd050d4d8cb3bb85544f5f9f37c9bd17eb698579f49
 AUX evolution-2.28.3.1-unknown-attachment-size.patch 1182 RMD160 4df9108c74c3b1b1d6d828502d26feab93db7dca SHA1 d248e9d07f6279539b1fa03a59e4005fa6a3aebe SHA256 ae8314004b7e0cfd4f285459a9bfabd864fbb3d3954417e0f5eed8b7e1944a4b
 DIST evolution-2.26.3.tar.bz2 36427464 RMD160 f2b3aa2275095feb2af406022c0a6bc8a381e8d5 SHA1 d0e247ccb903a57a5e6fe23cfb04535ea141e9fb SHA256 e37f8d21a8aa201e9a3d91a110ec9d4dc3feae978be45b0c16cf93adacd5605b
-DIST evolution-2.28.2.tar.bz2 29735192 RMD160 6e5f5ae60563fdaa9daa4c78f780cfa556770043 SHA1 19e970417cc91c82a5279cfe5dd7262d9d4c3319 SHA256 1f4a50127e3af085b0a074dcdfa0595bdf8925aeee295901c33805c3ff0c2603
 DIST evolution-2.28.3.1.tar.bz2 29765375 RMD160 442c7b472caf94ba0aa1abbe253b810d15911a4f SHA1 412c8be73e483444ad69a4ad8c15b0db9520fe0a SHA256 9fda41b0994b1bb8d119f594597f77bb4af1a883588a39f7a81ec7a2eb18f5fd
-EBUILD evolution-2.26.3.ebuild 4517 RMD160 ac48da6ef66ca3063f12ef4743d337e9bc00886e SHA1 d0b5243b4643bb256dbe160d4baef3946fab1510 SHA256 8d6f3ed856496b9d41fc0da6a7a2bb17487fc5008e163a81dbd2c50a78c5599c
-EBUILD evolution-2.28.2.ebuild 4825 RMD160 f14efbbdb05bbd53ad280c3744dcaf0bbbff698b SHA1 f02463898073a3f89ed192bf98e386156fa39971 SHA256 667db599047326713027ad7be24e6efa90183a444ed311940630b42b68f58e0b
-EBUILD evolution-2.28.3.1-r1.ebuild 5312 RMD160 d4f62e45f454daef3ba987f283d7a6882a8237e6 SHA1 5581f6e0615443e6ebadabc4f0a802ee131036a9 SHA256 dd7a33f03ab03e50ab6dd646a746794d4b24ad6496e73d655b0ab8379fd56b63
-EBUILD evolution-2.28.3.1.ebuild 4822 RMD160 3468abbc714d13a53936aa6da248ab19c8aa8063 SHA1 24196c681f2fae0254c5575d95f769f486a4af43 SHA256 72d53ca6a8a92de7f2f44295e7ef6c534e2e4f2f0e508efccef9f71cf42f845a
-MISC ChangeLog 68289 RMD160 a5b1d5087047132bc4ba31e44801be19770da8b3 SHA1 899c6ff02e93cd28af15354d1470c1fdb55168f5 SHA256 f323e19cbe85b1b740f6620fd2f5f738def020e2bae11c212e4db8bad3ae6859
+EBUILD evolution-2.26.3.ebuild 4543 RMD160 be4487a89d3a2195a78f0ba2376227c01f556b2b SHA1 fc3e87a9f6f21d245855d928275d90869a11a1ba SHA256 91dff725e7f78199f94250dc5d3d3078d373c73ecc9c2874589d9799e52f1c88
+EBUILD evolution-2.28.3.1-r1.ebuild 5343 RMD160 b41f223e648639fc0505b0f1e0372a3c9ada180e SHA1 2f017ae516204faf0fcfef390698b0a78773f61c SHA256 657d8568fc3d54dd7886ab4c3eefb6b3ad82a5c871a5407c20c7f68e1eb2fcbc
+EBUILD evolution-2.28.3.1.ebuild 4851 RMD160 587cae4ba2745b2623156c61e1db0dc686c2fc55 SHA1 7f3c8b53af55cbbdba0b592253dd16ce87c3c1dd SHA256 85045aa14899dcbdaf8861a5d0868ebbe6f33dc1c298f52f90072856e5e6dcfc
+MISC ChangeLog 68505 RMD160 7d6e48adb7ba1c30e02c8859db27b1d866972536 SHA1 ab99bc6a5245a721785fe2169d39d1e45e50e78e SHA256 3de7834c42e66720f09463aebca3d48bfcc698c407531cf6f914d2c393a2b87f
 MISC metadata.xml 1461 RMD160 a54b702777b629e801eb07e83c3151d020b2db2c SHA1 1db2d57540fd6732e6ad356e746f8c14f7411750 SHA256 1768837d6848092351ece0bff37f4db820dcb9cf9efcd21e596a71ad97892035
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwJZuoACgkQkKaRLQcq0GLG+ACaAthHf1imSU1aswbAEhx/w+mR
-BuEAnRvImaLeLy9EwcGBubly9OJRsLYf
-=YqD/
------END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.26.3.ebuild b/mail-client/evolution/evolution-2.26.3.ebuild
index 29ffb0011292..33f20a1c280d 100644
--- a/mail-client/evolution/evolution-2.26.3.ebuild
+++ b/mail-client/evolution/evolution-2.26.3.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/mail-client/evolution/evolution-2.26.3.ebuild,v 1.13 2010/03/22 09:14:23 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.26.3.ebuild,v 1.14 2010/06/08 12:06:22 eva Exp $
 
 EAPI="2"
 
@@ -67,7 +67,8 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	app-text/scrollkeeper
 	>=gnome-base/gnome-common-2.12.0
-	>=app-text/gnome-doc-utils-0.9.1"
+	>=app-text/gnome-doc-utils-0.9.1
+	app-text/docbook-xml-dtd:4.1.2"
 
 PDEPEND="exchange? ( >=gnome-extra/evolution-exchange-2.26.1 )"
 
diff --git a/mail-client/evolution/evolution-2.28.2.ebuild b/mail-client/evolution/evolution-2.28.2.ebuild
deleted file mode 100644
index 737a458ff208..000000000000
--- a/mail-client/evolution/evolution-2.28.2.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.28.2.ebuild,v 1.2 2010/03/22 09:14:23 ssuominen Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit autotools gnome2 flag-o-matic python
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://www.gnome.org/projects/evolution/"
-
-LICENSE="GPL-2 FDL-1.1"
-SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="crypt dbus hal kerberos krb4 ldap mono networkmanager nntp pda profile python ssl gstreamer exchange"
-# pst
-
-# Pango dependency required to avoid font rendering problems
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-RDEPEND=">=dev-libs/glib-2.20
-	>=x11-libs/gtk+-2.16
-	>=gnome-extra/evolution-data-server-${PV}
-	>=x11-themes/gnome-icon-theme-2.20
-	>=gnome-base/libbonobo-2.20.3
-	>=gnome-base/libbonoboui-2.4.2
-	>=gnome-extra/gtkhtml-3.27.90
-	>=gnome-base/gconf-2
-	>=gnome-base/libglade-2
-	>=gnome-base/libgnomecanvas-2
-	>=gnome-base/libgnomeui-2
-	>=dev-libs/libxml2-2.7.3
-	>=dev-libs/libgweather-2.25.3
-	>=x11-misc/shared-mime-info-0.22
-	>=gnome-base/gnome-desktop-2.26.0
-	dbus? ( >=dev-libs/dbus-glib-0.74 )
-	hal? ( >=sys-apps/hal-0.5.4 )
-	x11-libs/libnotify
-	pda? (
-		>=app-pda/gnome-pilot-2.0.15
-		>=app-pda/gnome-pilot-conduits-2 )
-	dev-libs/atk
-	ssl? (
-		>=dev-libs/nspr-4.6.1
-		>=dev-libs/nss-3.11 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	>=net-libs/libsoup-2.4
-	kerberos? ( virtual/krb5 )
-	krb4? ( app-crypt/mit-krb5[krb4] )
-	>=gnome-base/orbit-2.9.8
-	crypt? ( || (
-				  ( >=app-crypt/gnupg-2.0.1-r2
-					app-crypt/pinentry[gtk] )
-				  =app-crypt/gnupg-1.4* ) )
-	ldap? ( >=net-nds/openldap-2 )
-	mono? ( >=dev-lang/mono-1 )
-	python? ( >=dev-lang/python-2.4 )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10
-		>=media-libs/gst-plugins-base-0.10 )"
-# Disabled until API stabilizes
-#	pst? ( >=net-mail/libpst-0.6.41 )
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.16
-	>=dev-util/intltool-0.35.5
-	sys-devel/gettext
-	sys-devel/bison
-	app-text/scrollkeeper
-	>=gnome-base/gnome-common-2.12.0
-	>=app-text/gnome-doc-utils-0.9.1"
-
-PDEPEND="exchange? ( >=gnome-extra/evolution-exchange-2.26.1 )"
-
-DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-ELTCONF="--reverse-deps"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--without-kde-applnk-path
-		--enable-plugins=experimental
-		--with-weather
-		$(use_enable ssl nss)
-		$(use_enable ssl smime)
-		$(use_enable mono)
-		$(use_enable nntp)
-		$(use_enable networkmanager nm)
-		$(use_enable dbus)
-		$(use_enable gstreamer audio-inline)
-		$(use_enable exchange)
-		--disable-pst-import
-		$(use_enable pda pilot-conduits)
-		$(use_enable profile profiling)
-		$(use_enable python)
-		$(use_with ldap openldap)
-		$(use_with kerberos krb5 /usr)
-		$(use_with krb4 krb4 /usr)"
-
-	# dang - I've changed this to do --enable-plugins=experimental.  This will
-	# autodetect new-mail-notify and exchange, but that cannot be helped for the
-	# moment.  They should be changed to depend on a --enable-<foo> like mono
-	# is.  This cleans up a ton of crap from this ebuild.
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Fix timezone offsets on fbsd.  bug #183708
-	# FIXME: bsd needs to be more active at pushing stuff upstream
-	#epatch "${FILESDIR}/${PN}-2.21.3-fbsd.patch"
-
-	# Fix delete keyboard shortcut, bug #????
-	epatch "${FILESDIR}/${PN}-2.28.0-delete-key.patch"
-
-	# Fix multiple automagic plugins, bug #204300 & bug #271451
-	epatch "${FILESDIR}/${PN}-2.28.0-automagic-plugins.patch"
-
-	# FIXME: Fix compilation flags crazyness
-	sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \
-		-i configure.ac configure || die "sed 1 failed"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	if use ssl ; then
-		sed -i -e "s|mozilla-nss|nss|
-			s|mozilla-nspr|nspr|" "${S}"/configure || die "sed 1 failed"
-		G2CONF="${G2CONF} --enable-nss=yes"
-	else
-		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-			--without-nss-libs --without-nss-includes"
-	fi
-
-	# problems with -O3 on gcc-3.3.1
-	replace-flags -O3 -O2
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "To change the default browser if you are not using GNOME, do:"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
-	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
-	elog ""
-	elog "Replace 'mozilla %s' with which ever browser you use."
-	elog ""
-	elog "Junk filters are now a run-time choice. You will get a choice of"
-	elog "bogofilter or spamassassin based on which you have installed"
-	elog ""
-	elog "You have to install one of these for the spam filtering to actually work"
-}
diff --git a/mail-client/evolution/evolution-2.28.3.1-r1.ebuild b/mail-client/evolution/evolution-2.28.3.1-r1.ebuild
index 8a49e23bbbda..6c8831152995 100644
--- a/mail-client/evolution/evolution-2.28.3.1-r1.ebuild
+++ b/mail-client/evolution/evolution-2.28.3.1-r1.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/mail-client/evolution/evolution-2.28.3.1-r1.ebuild,v 1.1 2010/05/19 19:30:59 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.28.3.1-r1.ebuild,v 1.2 2010/06/08 12:06:22 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -71,7 +71,8 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	app-text/scrollkeeper
 	>=gnome-base/gnome-common-2.12.0
-	>=app-text/gnome-doc-utils-0.9.1"
+	>=app-text/gnome-doc-utils-0.9.1
+	app-text/docbook-xml-dtd:4.1.2"
 
 PDEPEND="exchange? ( >=gnome-extra/evolution-exchange-2.26.1 )"
 
diff --git a/mail-client/evolution/evolution-2.28.3.1.ebuild b/mail-client/evolution/evolution-2.28.3.1.ebuild
index 989b25f8fff5..2e0e07aaa5f3 100644
--- a/mail-client/evolution/evolution-2.28.3.1.ebuild
+++ b/mail-client/evolution/evolution-2.28.3.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/mail-client/evolution/evolution-2.28.3.1.ebuild,v 1.4 2010/06/04 20:51:24 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.28.3.1.ebuild,v 1.5 2010/06/08 12:06:22 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -69,7 +69,8 @@ DEPEND="${RDEPEND}
 	sys-devel/bison
 	app-text/scrollkeeper
 	>=gnome-base/gnome-common-2.12.0
-	>=app-text/gnome-doc-utils-0.9.1"
+	>=app-text/gnome-doc-utils-0.9.1
+	app-text/docbook-xml-dtd:4.1.2"
 
 PDEPEND="exchange? ( >=gnome-extra/evolution-exchange-2.26.1 )"