One more reference, drop old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 12 insertions, 149 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index ed0500ad9935..6ed5688c99be 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/evolution
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.424 2014/06/28 18:46:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.425 2014/06/30 09:50:57 pacho Exp $
+
+  30 Jun 2014; Pacho Ramos <pacho@gentoo.org> -evolution-3.12.3.ebuild,
+  evolution-3.12.3-r1.ebuild:
+  One more reference, drop old
 
 *evolution-3.12.3-r1 (28 Jun 2014)
 
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 2dbd79b120c7..8138b936da77 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -17,14 +17,13 @@ DIST evolution-3.10.4.tar.xz 12351064 SHA256 ac60557f264f211e6a7bc0ced919041c154
 DIST evolution-3.12.3.tar.xz 12123820 SHA256 980988cf3d1f537102f4a3143a2c251ac812666b8f0936afd6bdde0fe5a96fea SHA512 8db318a469d732380f0020d9bb99e21c1b8eda61584a83cd7c602c7f41643a49f951dfdc5c5cceb41f7842d7b209ac0eab3cb4401a2fdec0c903cbb4ecf0e01c WHIRLPOOL 54bf983d19a3efe21a07b3bc3a49821cc9c5e1daf54378220be7d44f7badd6fe870a11d1651240fd480cde04535a0c59086720920478285a3d20ab697581428c
 EBUILD evolution-2.32.3-r1.ebuild 6164 SHA256 eccfbb24f84fdee7528af0973e475f92e7049b85e59bfbbcc4e58b67747e8e49 SHA512 4f84b8ab0e6188a4162199d7ed1e319702f2831cb1907452d7d02b82e5eaf19f439d99e39f05852ff81ffcdd75b6da5036c04e3d177afd45bdb475ad4ec5de33 WHIRLPOOL 95416087ca1f2677f145d2bbabfb2c6d4d7a0497d03d0fa76aa7a1d5abadb0136d796a7c6c5048745c4fb33448dea5fd744b8eda22a0a7e2b99c5076a0c5401c
 EBUILD evolution-3.10.4-r1.ebuild 4603 SHA256 5702ee191c8231dd55851e75ebe315f52c121aa2e2c4be80ffadfaddf6bc9aa0 SHA512 756becbfa5c9341df202ac7f3f6a489a44dfc036fb9bc61e0382ae489006dcf27eb062cbcda03ecb8ade8a3c111a692180d66fe5f5ba34fb4ada32ddabd33e4a WHIRLPOOL ddcf1ecfa03010e1e68b4c66a4d71993c97c3f9095df05657f5b6ab1e95eafdaaa7825383ae2d879e82a2dbeafc13f550df5607631e7953166be6f2fcf0f912b
-EBUILD evolution-3.12.3-r1.ebuild 4378 SHA256 3d84a4965a83280d0d2430e9ea13e2031bd29ec7724da3db13273c53019fc46f SHA512 a38622ade6689280906f3b635560a451291f81d178dac8e4eec21142f169bb584cc1d3811e466ccb9ca459c8adae945bb817bd5e79eaefade7b1645197804be8 WHIRLPOOL 8ed31b75ce4d1f0b9e43fc5c3e3013c67a3679dba517a8bd4c2c8f9659b75528a56b0639f634f618d09804df797207d37a6f7c6c6aeba3c8a99fe39439c77182
-EBUILD evolution-3.12.3.ebuild 4159 SHA256 f23d93111f9dc17eb7f0bfdfa0034d30df71afd2469e4d5be1c0964105523368 SHA512 89e31d467f883956bad777ad73204623096565d3156a45f3a1fa2a81883eabd5834a2f37b869b38baf9e0fb7871beca51050cca0feb3b817c851f1b19a64dc01 WHIRLPOOL 98dc6c5f16a14762d1757dde96e27892bb7fff8c9fe1791cf3e1108bd30c493ce5aeaa9cbd52e3e3c641ab24d903282fc9dd55e77632379538a7eab48a37cc45
-MISC ChangeLog 92376 SHA256 d3830e52cbf38eae7617fccb5cd930a1ca6d85413ccc1402e0b3427114839522 SHA512 25ee5a400fbcab7cf84bd0a97e8c8f17550c4e6b0edbbf218421190e1046e0b29d60d840f070be8ac0e50bcaf68fc050cfa1c5da2bd55adaf7ec06cbdccfd333 WHIRLPOOL a7d6cf519ccc343515abddea82c86aef4df0b9a4c4935869797a3c0c07c89d3cc9eb6919f7ee025a1f725934927b6b1d8d95b68eecea4698526bd769b148e7d6
+EBUILD evolution-3.12.3-r1.ebuild 4433 SHA256 526bc252a20f6232bb56096096ed5ff2fd1a67224ab01928518e1379581bff60 SHA512 2fbe626d75eb088d1fa2d2d8d701d93e9a4cf4e3795f325db316d00b63a5ffb075a9408f3b9e4c27b21dc86cde6f22e9d157752e78742d34602ba6e7d214cbfc WHIRLPOOL 2ca2cb91f5aee843e97241ef0b51d3d7cdd09b6e42dbaddae6a76ac35d435e60693f5a917135f38db10820dd45776936117fb3bdcfe0b4f3ee1e141a635ef5ec
+MISC ChangeLog 92510 SHA256 44e58496ba97f8b84e45d704d01f47a9b759c6dea0b2bd114a3be113339529f9 SHA512 d29f132cc2b3df430026b634042e70fffdaf005d1e91ab234a1d05d19fc5b55a0536215180b61a95d871fdb0002f23b78c714c87cd41a3f6a8dd162d37162dff WHIRLPOOL e2b50ade6ffdbccb60af402388700e94130dc5ffc9eb34bdf1880c0cd96917d52fad0be9bce2fb9d96a0d7b5dc2957f369d92a41c68273b31ca5fcee1d5a0326
 MISC metadata.xml 1153 SHA256 afcc365511132cc5c54957c0700e3ff9525c920cdf0f8cbddd304351494ca6a3 SHA512 dcd0d5d8eab6ca1e478f6a5ad7d2d41dc6717370ed895d7eff313d69486f77c92a0f94a912908bb23e59f82998fd528d456d6e7649338061bba4a6c451de3167 WHIRLPOOL c7347b0bab5e6d0338a5fda7f7e8f1787e7b07b36d31231180b8034dbdc36fe05428fc782dac9cff638632e879ba138b74c2dc37eb543e7149740bfab1d73707
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlOvDXkACgkQCaWpQKGI+9Qi0ACeI+ECM6HOKkZ5627KtrfyJAqp
-qC8AnAh1ZSf0n/4MLxNAPqk6sU5t+h6P
-=PQ4g
+iEYEAREIAAYFAlOxMwIACgkQCaWpQKGI+9SkAwCaAhDU+LnFdYZQp9e9Ab5NAu8j
+LCoAnjUBxc0T7tAyKg3sZBi3/m4BMtTQ
+=8HWL
 -----END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-3.12.3-r1.ebuild b/mail-client/evolution/evolution-3.12.3-r1.ebuild
index 079c97ddc699..9df5e9ba2284 100644
--- a/mail-client/evolution/evolution-3.12.3-r1.ebuild
+++ b/mail-client/evolution/evolution-3.12.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.12.3-r1.ebuild,v 1.1 2014/06/28 18:46:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.12.3-r1.ebuild,v 1.2 2014/06/30 09:50:57 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -137,6 +137,7 @@ src_install() {
 	# Problems with prelink:
 	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
 	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
 	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
 	doenvd "${T}"/99${PN}
 
diff --git a/mail-client/evolution/evolution-3.12.3.ebuild b/mail-client/evolution/evolution-3.12.3.ebuild
deleted file mode 100644
index 41a3edfe8243..000000000000
--- a/mail-client/evolution/evolution-3.12.3.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.12.3.ebuild,v 1.1 2014/06/12 18:38:01 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic readme.gentoo gnome2 #autotools
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.4
-	>=dev-libs/glib-2.36:2
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gtk+-3.8.0:3
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=x11-libs/libnotify-0.7:=
-	>=gnome-extra/evolution-data-server-${PV}:=[weather?]
-	>=gnome-extra/gtkhtml-4.5.2:4.0
-	dev-libs/atk
-	>=dev-libs/dbus-glib-0.6
-	>=dev-libs/libxml2-2.7.3:2
-	>=net-libs/libsoup-2.42:2.4
-	>=x11-misc/shared-mime-info-0.22
-	>=x11-themes/gnome-icon-theme-2.30.2.1
-	>=dev-libs/libgdata-0.10:=
-	>=net-libs/webkit-gtk-2.0.1:3
-
-	x11-libs/libSM
-	x11-libs/libICE
-
-	crypt? ( || (
-		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
-		=app-crypt/gnupg-1.4* ) )
-	map? (
-		>=app-misc/geoclue-0.12.0:0
-		>=media-libs/libchamplain-0.12:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-3.10.0
-		x11-libs/mx:1.0 )
-	spell? ( app-text/gtkspell:3 )
-	ldap? ( >=net-nds/openldap-2:= )
-	ssl? (
-		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.8:2= )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#	app-text/yelp-tools
-#	>=gnome-base/gnome-common-2.12
-RDEPEND="${COMMON_DEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	highlight? ( app-text/highlight )
-	spamassassin? ( mail-filter/spamassassin )
-	!gnome-extra/evolution-exchange
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-src_prepare() {
-	# Reason?
-	ELTCONF="--reverse-deps"
-
-	#eautoreconf # See https://bugzilla.gnome.org/701904
-
-	gnome2_src_prepare
-
-	# Fix compilation flags crazyness
-	sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "CPPFLAGS sed failed"
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
-	gnome2_src_configure \
-		--without-glade-catalog \
-		--disable-image-inline \
-		--disable-pst-import \
-		--enable-canberra \
-		$(use_enable bogofilter) \
-		$(use_enable highlight text-highlight) \
-		$(use_enable map contact-maps) \
-		$(use_enable spamassassin) \
-		$(use_enable spell gtkspell) \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_with ldap openldap) \
-		$(usex ssl --enable-nss=yes "--without-nspr-libs
-			--without-nspr-includes
-			--without-nss-libs
-			--without-nss-includes") \
-		$(use_enable weather) \
-		ITSTOOL=$(type -P true)
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}