Drop old and move to testing arches that won't keep stabilizing newer stuff from gnome3.8/3.10 bugs

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 6 insertions, 216 deletions

diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog
index ce46bf35f681..885d9cf7778b 100644
--- a/mail-client/mail-notification/ChangeLog
+++ b/mail-client/mail-notification/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mail-notification
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.119 2014/02/22 22:56:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.120 2014/04/25 19:19:43 pacho Exp $
+
+  25 Apr 2014; Pacho Ramos <pacho@gentoo.org> -mail-notification-5.4-r4.ebuild,
+  -mail-notification-5.4-r6.ebuild, metadata.xml:
+  Drop old and move to testing arches that won't keep stabilizing newer stuff
+  from gnome3.8/3.10 bugs
 
   22 Feb 2014; Pacho Ramos <pacho@gentoo.org> mail-notification-5.4-r7.ebuild:
   Fix wrong commit, bug 502160
diff --git a/mail-client/mail-notification/mail-notification-5.4-r4.ebuild b/mail-client/mail-notification/mail-notification-5.4-r4.ebuild
deleted file mode 100644
index fda1c16714aa..000000000000
--- a/mail-client/mail-notification/mail-notification-5.4-r4.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r4.ebuild,v 1.10 2012/05/21 23:35:20 vapier Exp $
-
-EAPI=2
-
-inherit gnome2 multilib flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="A GNOME trayicon which checks for email, with support for many online and offline mailbox formats."
-HOMEPAGE="http://www.nongnu.org/mailnotify/"
-SRC_URI="http://savannah.nongnu.org/download/mailnotify/${P}.tar.bz2"
-
-KEYWORDS="amd64 ppc sparc x86"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="evo gmail imap ipv6 maildir mbox mh mozilla pop sasl ssl sylpheed"
-
-# gmime is actually optional, but it's used by so much of the package
-# it's pointless making it optional. gnome-keyring is required for
-# several specific access methods, and thus linked to those USE flags
-# instead of adding a keyring USE flag.
-RDEPEND=">=x11-libs/gtk+-2.12:2
-	>=dev-libs/glib-2.14
-	>=gnome-base/gconf-2.4.0
-	>=gnome-base/gconf-2.6
-	>=gnome-base/libgnomeui-2.14
-	>=gnome-base/libglade-2.0
-	dev-libs/dbus-glib
-	dev-libs/gmime:2.4
-	>=x11-libs/libnotify-0.4.1
-	pop? ( gnome-base/gnome-keyring )
-	imap? ( gnome-base/gnome-keyring )
-	gmail? ( gnome-base/gnome-keyring )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	evo? ( >=mail-client/evolution-2.24 )
-	sylpheed? ( mail-client/sylpheed )"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.0"
-
-# this now uses JB (the Jean-Yves Lefort's Build System) as a build system
-# instead of autotools, this is a little helper function that basically does
-# the same thing as use_enable
-use_var() {
-	echo "${2:-$1}=$(usex $1)"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-dont-update-cache.patch"
-
-	# We are not Ubuntu, and I suspect that this is the cause of #215281
-	epatch "${FILESDIR}/${P}-remove-ubuntu-special-case.patch"
-
-	# Make it work ok with eds-2.24 and 2.29
-	epatch "${FILESDIR}/${P}-e-d-s.patch"
-
-	# Fix gtkhtml depend to solve building against evo-2.28, see bug #293374
-	epatch "${FILESDIR}/${P}-evolution-gtkhtml.patch"
-
-	# Add patch for new cyrus-sasl's ABI, see:
-	# https://bugzilla.redhat.com/501456
-	epatch "${FILESDIR}/${P}-sasl_encode64.patch"
-
-	# Fedora patch to build against dev-libs/gmime:2.4
-	epatch "${FILESDIR}/${P}-gmime.patch"
-
-	# Fix forced --as-needed, bug 317905
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-
-	# Fix icons for gnome 2.30+
-	epatch "${FILESDIR}/${P}-icons.patch"
-}
-
-src_configure() {
-	set -- \
-	./jb configure destdir="${D}" prefix="/usr" libdir=/usr/$(get_libdir) \
-		sysconfdir="/etc" localstatedir="/var" cc="$(tc-getCC)" \
-		cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
-		scrollkeeper-dir="/var/lib/scrollkeeper" \
-		$(use_var evo evolution) \
-		$(use_var gmail) \
-		$(use_var imap) \
-		$(use_var ipv6) \
-		$(use_var maildir) \
-		$(use_var mbox) \
-		$(use_var mh) \
-		$(use_var mozilla) \
-		$(use_var pop pop3) \
-		$(use_var sasl) \
-		$(use_var ssl) \
-		$(use_var sylpheed)
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	./jb build || die
-}
-
-src_install() {
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install || die
-
-	dodoc NEWS README AUTHORS TODO TRANSLATING
-
-	rm -rf "${D}/var/lib/scrollkeeper"
-}
diff --git a/mail-client/mail-notification/mail-notification-5.4-r6.ebuild b/mail-client/mail-notification/mail-notification-5.4-r6.ebuild
deleted file mode 100644
index e04d791820fd..000000000000
--- a/mail-client/mail-notification/mail-notification-5.4-r6.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-5.4-r6.ebuild,v 1.2 2012/10/06 15:12:51 blueness Exp $
-
-EAPI=4
-inherit gnome2 multilib flag-o-matic toolchain-funcs eutils
-
-DESCRIPTION="A GNOME trayicon which checks for email, with support for many online and offline mailbox formats."
-HOMEPAGE="http://www.nongnu.org/mailnotify/ https://github.com/epienbroek/mail-notification"
-
-GIT_REVISION="b4ca832" # Same as Fedora
-SRC_URI="https://github.com/epienbroek/${PN}/tarball/${GIT_REVISION} -> ${PN}-${GIT_REVISION}.tar.gz"
-S="${WORKDIR}/epienbroek-${PN}-${GIT_REVISION}"
-
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-linux"
-SLOT="0"
-LICENSE="GPL-3"
-IUSE="evo +gnome-keyring sasl +sound ssl sylpheed"
-
-LANGS="bg ca cs de es fr ja nl pl pt pt_BR ru sr sr@Latn sv"
-for lang in ${LANGS}; do
-	IUSE+=" linguas_${lang}"
-done
-
-# gmime is actually optional, but it's used by so much of the package
-# it's pointless making it optional. gnome-keyring is required for
-# several specific access methods, and thus linked to those USE flags
-# instead of adding a keyring USE flag.
-RDEPEND="x11-libs/gtk+:3
-	>=dev-libs/glib-2.14
-	>=gnome-base/gconf-2.6
-	>=gnome-base/libgnomeui-2.14
-	dev-libs/dbus-glib
-	dev-libs/gmime:2.6
-	>=x11-libs/libnotify-0.4.1
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	sound? ( media-libs/gstreamer:0.10 )
-	evo? ( >=mail-client/evolution-3 )
-	sylpheed? ( mail-client/sylpheed )"
-
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	dev-util/gob
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35.0"
-
-# this now uses JB (the Jean-Yves Lefort's Build System) as a build system
-# instead of autotools, this is a little helper function that basically does
-# the same thing as use_enable
-use_var() {
-	echo "${2:-$1}=$(usex $1)"
-}
-
-src_prepare() {
-	sed -i	-e '/jb_rule_set_install_message/d' \
-		-e '/jb_rule_add_install_command/d' \
-		jbsrc/jb.c || die
-
-	# We are not Ubuntu, and I suspect that this is the cause of #215281
-	epatch "${FILESDIR}/${P}-remove-ubuntu-special-case.patch"
-
-	# Fix .desktop files to make them freedesktop compliant
-	sed -i -e '/Encoding/d' data/mail-notification-properties.desktop.in \
-		data/mail-notification.desktop.in || die
-}
-
-src_configure() {
-	set -- \
-	./jb configure destdir="${D}" prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" \
-		sysconfdir="${EPREFIX}/etc" localstatedir="${EPREFIX}/var" cc="$(tc-getCC)" \
-		cflags="${CFLAGS}" cppflags="${CXXFLAGS}" ldflags="${LDFLAGS}" \
-		scrollkeeper-dir="${EPREFIX}/var/lib/scrollkeeper" \
-		$(use_var evo evolution) \
-		$(use_var gnome-keyring gmail) \
-		$(use_var gnome-keyring imap) \
-		$(use_var gnome-keyring pop3) \
-		$(use_var sasl) \
-		$(use_var ssl) \
-		$(use_var sylpheed)
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	./jb build || die
-}
-
-src_install() {
-	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install || die
-	dodoc NEWS README AUTHORS TODO TRANSLATING
-	rm -rf "${ED}/var/lib/scrollkeeper"
-
-	einfo "Cleaning up locales..."
-	for lang in ${LANGS}; do
-		use "linguas_${lang}" && {
-			einfo "- keeping ${lang}"
-			continue
-		}
-		rm -Rf "${D}"/usr/share/locale/"${lang}" || die
-	done
-}
diff --git a/mail-client/mail-notification/metadata.xml b/mail-client/mail-notification/metadata.xml
index 22c330757089..21831f360489 100644
--- a/mail-client/mail-notification/metadata.xml
+++ b/mail-client/mail-notification/metadata.xml
@@ -11,9 +11,6 @@ Maildir, IMAP, Sylpheed, POP3, Gmail and Evolution.  Authenticates via
 apop, ssl, sasl.
 </longdescription>
 <use>
-	<flag name='gmail'>Enable Gmail mailbox checking</flag>
-	<flag name='mh'>Enable MH mailbox checking</flag>
-	<flag name='pop'>Enable support for pop</flag>
 	<flag name='sylpheed'>Enable support for MH mailboxes used by
 		<pkg>mail-client/sylpheed</pkg></flag>
 </use>