Remove old versions, and bump to version 4.1

(Portage version: 2.1.3.9)

11 files changed, 29 insertions, 214 deletions

diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog
index 3f5da2b1e26a..0ef04cb53b03 100644
--- a/mail-client/mail-notification/ChangeLog
+++ b/mail-client/mail-notification/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for mail-client/mail-notification
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.41 2007/08/30 16:08:54 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.42 2007/09/22 15:39:03 graaff Exp $
+
+*mail-notification-4.1 (22 Sep 2007)
+
+  22 Sep 2007; Hans de Graaff <graaff@gentoo.org> metadata.xml,
+  -mail-notification-0.8.1.ebuild, -mail-notification-1.1.ebuild,
+  -mail-notification-2.0.ebuild, -mail-notification-4.0_rc2.ebuild,
+  +mail-notification-4.1.ebuild:
+  Version bump: bug 184045
+
+  22 Sep 2007; Hans de Graaff <graaff@gentoo.org> metadata.xml,
+  -mail-notification-0.8.1.ebuild, -mail-notification-1.1.ebuild,
+  -mail-notification-2.0.ebuild, -mail-notification-4.0_rc2.ebuild:
+  Remove old versions
+
+  22 Sep 2007; Hans de Graaff <graaff@gentoo.org> metadata.xml:
+  Add myself as maintainer as dicussed on IRC with robbat2 and announced in bug
+  184045.
 
   30 Aug 2007; <pva@gentoo.org> mail-notification-2.0.ebuild,
   mail-notification-3.0.ebuild, mail-notification-4.0_rc2.ebuild,
diff --git a/mail-client/mail-notification/files/digest-mail-notification-0.8.1 b/mail-client/mail-notification/files/digest-mail-notification-0.8.1
deleted file mode 100644
index a944e706f99f..000000000000
--- a/mail-client/mail-notification/files/digest-mail-notification-0.8.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d6a2791a896db71643d1c8ca8e2fa8b4 mail-notification-0.8.1.tar.gz 588618
-RMD160 e15126772765195486fd9d6f8186aaeb7eb13528 mail-notification-0.8.1.tar.gz 588618
-SHA256 9b1190a56e12dca78513a15b7d9b8aadc5efd16b073d73ca3598ef1bf6702b9a mail-notification-0.8.1.tar.gz 588618
diff --git a/mail-client/mail-notification/files/digest-mail-notification-1.1 b/mail-client/mail-notification/files/digest-mail-notification-1.1
deleted file mode 100644
index 05dc0099e475..000000000000
--- a/mail-client/mail-notification/files/digest-mail-notification-1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2359fb53128b12cf295bdf8553e5869b mail-notification-1.1.tar.gz 683776
-RMD160 bf5c0f261e883c0b3f6f083f302a7be711be8193 mail-notification-1.1.tar.gz 683776
-SHA256 7fb003b1d09210adb5358c7a6d59ba6c31f44ae814a7c1fcffd5483db2f5392a mail-notification-1.1.tar.gz 683776
diff --git a/mail-client/mail-notification/files/digest-mail-notification-2.0 b/mail-client/mail-notification/files/digest-mail-notification-2.0
deleted file mode 100644
index ec8e9131383e..000000000000
--- a/mail-client/mail-notification/files/digest-mail-notification-2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 56ef7401aba1cb27d881fb0f33a3248d mail-notification-2.0.tar.gz 869151
-RMD160 0fb3adc3331f0699ca6fb01f3c63f360aa79a7fb mail-notification-2.0.tar.gz 869151
-SHA256 e4ec2fe27b3d399a6289857ef5a33e564bfe641a829f597e9dac753ae643339b mail-notification-2.0.tar.gz 869151
diff --git a/mail-client/mail-notification/files/digest-mail-notification-4.0_rc2 b/mail-client/mail-notification/files/digest-mail-notification-4.0_rc2
deleted file mode 100644
index ad7dc9ee647b..000000000000
--- a/mail-client/mail-notification/files/digest-mail-notification-4.0_rc2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3861866f2860a81f4bee50af19f8308d mail-notification-4.0-rc2.tar.gz 955898
-RMD160 52413c5af9ae3628e4c243df52361d054142d8f1 mail-notification-4.0-rc2.tar.gz 955898
-SHA256 7d9ee4e104bff7cafa5b26f80f8e5c168a24fa66e27515a63f22b9b87b488108 mail-notification-4.0-rc2.tar.gz 955898
diff --git a/mail-client/mail-notification/files/digest-mail-notification-4.1 b/mail-client/mail-notification/files/digest-mail-notification-4.1
new file mode 100644
index 000000000000..b0ce7998f6d5
--- /dev/null
+++ b/mail-client/mail-notification/files/digest-mail-notification-4.1
@@ -0,0 +1,3 @@
+MD5 4d9617ad0e7eded0953ac6d152f06a46 mail-notification-4.1.tar.bz2 713068
+RMD160 2c261dd53c4f1142cd2744bbdf45e687fbf1f11a mail-notification-4.1.tar.bz2 713068
+SHA256 c3dea02bf7060e3e30851adb629b3b3b78e163371c4001028d011d81976d9193 mail-notification-4.1.tar.bz2 713068
diff --git a/mail-client/mail-notification/mail-notification-0.8.1.ebuild b/mail-client/mail-notification/mail-notification-0.8.1.ebuild
deleted file mode 100644
index 5e0f4f620d24..000000000000
--- a/mail-client/mail-notification/mail-notification-0.8.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-0.8.1.ebuild,v 1.6 2005/01/12 16:47:15 slarti Exp $
-
-inherit gnome2
-
-DESCRIPTION="A GNOME trayicon which checks for mail supporting mbox, MH,
-Maildir, IMAP, Sylpheed, POP3, Gmail. Authenticates via apop, ssl, sasl."
-HOMEPAGE="http://www.nongnu.org/mailnotify/"
-SRC_URI="http://savannah.nongnu.org/download/mailnotify/${P}.tar.gz"
-
-KEYWORDS="x86 amd64 ppc"
-SLOT="0"
-LICENSE="GPL-2"
-
-IUSE="imap ipv6 mime ssl sasl gmail"
-
-DEPEND=">=x11-libs/gtk+-2.4
-	>=dev-util/gob-2
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/eel-2
-	>=gnome-base/gconf-2.4
-	>=gnome-base/libgnomeui-2.4
-	>=gnome-base/libglade-2.0
-	>=gnome-base/eel-2.0
-	>=gnome-base/orbit-2.0
-	dev-perl/XML-Parser
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	mime? ( >=dev-libs/gmime-2 )
-	gmail? ( >=net-libs/libsoup-2.2 )"
-
-G2CONF="${G2CONF} $(use_enable ssl)"
-G2CONF="${G2CONF} $(use_enable sasl)"
-G2CONF="${G2CONF} $(use_enable ipv6)"
-G2CONF="${G2CONF} $(use_enable imap)"
-G2CONF="${G2CONF} $(use_enable mime)"
-
-# Gmail good to go now. --slarti
-G2CONF="${G2CONF} $(use_enable gmail)"
-
-pkg_postinst() {
-	echo
-	ewarn "Due to a bug in bonobo-activation, your GNOME/X11 session must"
-	ewarn "be restarted for mail-notification to work. If you don't do"
-	ewarn "this, this program will crash during the setup phase."
-	ewarn "See http://bugzilla.gnome.org/show_bug.cgi?id=151082"
-	echo
-}
diff --git a/mail-client/mail-notification/mail-notification-1.1.ebuild b/mail-client/mail-notification/mail-notification-1.1.ebuild
deleted file mode 100644
index f3c1bdf8ef59..000000000000
--- a/mail-client/mail-notification/mail-notification-1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-1.1.ebuild,v 1.6 2005/08/24 20:43:08 gustavoz Exp $
-
-inherit gnome2
-
-DESCRIPTION="A GNOME trayicon which checks for mail supporting mbox, MH,
-Maildir, IMAP, POP3, Gmail. Authenticates via apop, ssl, sasl."
-HOMEPAGE="http://www.nongnu.org/mailnotify/"
-SRC_URI="http://savannah.nongnu.org/download/mailnotify/${P}.tar.gz"
-
-KEYWORDS="~x86 ~amd64 ~ppc sparc"
-SLOT="0"
-LICENSE="GPL-2"
-
-IUSE="imap ipv6 mime ssl sasl" # gmail gmailtimestamps
-
-DEPEND=">=x11-libs/gtk+-2.4
-	>=dev-util/gob-2
-	>=gnome-base/gnome-panel-2
-	>=gnome-base/eel-2
-	>=gnome-base/gconf-2.4
-	>=gnome-base/libgnomeui-2.4
-	>=gnome-base/libglade-2.0
-	>=gnome-base/eel-2.0
-	>=gnome-base/orbit-2.0
-	dev-perl/XML-Parser
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	mime? ( >=dev-libs/gmime-2.1 )"
-#	gmail? ( >=net-libs/libsoup-2.2
-#		gmailtimestamps? ( >=dev-libs/icu-2.6 ) )
-
-G2CONF="${G2CONF} $(use_enable ssl)"
-G2CONF="${G2CONF} $(use_enable sasl)"
-G2CONF="${G2CONF} $(use_enable ipv6)"
-G2CONF="${G2CONF} $(use_enable imap)"
-G2CONF="${G2CONF} $(use_enable mime)"
-G2CONF="${G2CONF} --disable-gmail"
-
-# Gmail good to go now. --slarti
-# Update: or it would be, if it worked
-# G2CONF="${G2CONF} $(use_enable gmail)"
-
-pkg_postinst() {
-	ewarn
-	ewarn "Due to a bug in bonobo-activation, your GNOME/X11 session must"
-	ewarn "be restarted for mail-notification to work. If you don't do"
-	ewarn "this, this program will crash during the setup phase."
-	ewarn "See http://bugzilla.gnome.org/show_bug.cgi?id=151082"
-	ewarn
-	ewarn "Support for gmail does not seem to be functioning. Check back for"
-	ewarn "gmail support in future releases."
-	ewarn
-}
diff --git a/mail-client/mail-notification/mail-notification-2.0.ebuild b/mail-client/mail-notification/mail-notification-2.0.ebuild
deleted file mode 100644
index 8af6ff21468e..000000000000
--- a/mail-client/mail-notification/mail-notification-2.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-2.0.ebuild,v 1.10 2007/08/30 16:08:54 pva Exp $
-
-inherit eutils gnome2 multilib flag-o-matic versionator
-
-DESCRIPTION="A GNOME trayicon which checks for mail. Supports mbox, MH,
-Maildir, IMAP, Sylpheed, POP3, Gmail and Evolution.  Authenticates via
-apop, ssl, sasl."
-HOMEPAGE="http://www.nongnu.org/mailnotify/"
-SRC_URI="http://savannah.nongnu.org/download/mailnotify/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-IUSE="imap ipv6 ssl sasl gmail evo sylpheed mbox maildir pop"
-
-# gmime is actually optional, but it's used by so much of the package it's
-# pointless making it optional.
-DEPEND=">=x11-libs/gtk+-2.6
-	>=dev-util/gob-2
-	>=gnome-base/gnome-panel-2.6
-	>=gnome-base/eel-2.6
-	>=gnome-base/gconf-2.6
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/libglade-2.0
-	>=gnome-base/orbit-2.6
-	>=dev-libs/gmime-2.1
-	dev-perl/XML-Parser
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	evo? ( >=mail-client/evolution-2.4 )
-	sylpheed? ( virtual/sylpheed )"
-
-pkg_setup() {
-	if use evo ; then
-		EVO_INSTALLED="$(best_version mail-client/evolution)"
-		EVO_INSTALLED="${EVO_INSTALLED##*/}"
-		EVO_INSTALLED="${EVO_INSTALLED#*-}"
-		EVO_VERSION="$(get_version_component_range 1-2 ${EVO_INSTALLED})"
-	fi
-
-	G2CONF="${G2CONF} $(use_enable ssl)"
-	G2CONF="${G2CONF} $(use_enable sasl)"
-	G2CONF="${G2CONF} $(use_enable ipv6)"
-	# ssl, sasl and ipv6 requires either pop3 or imap, else they will be disabled
-	G2CONF="${G2CONF} $(use_enable imap)"
-	G2CONF="${G2CONF} $(use_enable pop pop3)"
-	G2CONF="${G2CONF} $(use_enable gmail)"
-	G2CONF="${G2CONF} $(use_enable evo evolution)"
-	G2CONF="${G2CONF} --with-evolution-source-dir=/usr/include/evolution-${EVO_VERSION}"
-	G2CONF="${G2CONF} $(use_enable sylpheed)"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	if use evo ; then
-		epatch "${FILESDIR}/${P}-evolution-${EVO_VERSION}.diff"
-	fi
-
-	epatch "${FILESDIR}/${P}-buildfix.diff"
-	epatch "${FILESDIR}/${P}-gmail-properties-fix.diff"
-
-	gnome2_omf_fix
-}
-
-src_compile() {
-	append-ldflags -Wl,-export-dynamic
-	gnome2_src_compile
-}
-
-src_install() {
-	gnome2_src_install
-	evolution_plugindir="/usr/$(get_libdir)/evolution/${EVO_INSTALLED}/plugins"
-
-	dodoc README NEWS AUTHORS TODO
-}
-
-pkg_postinst() {
-	ewarn ""
-	ewarn "Due to a bug in bonobo-activation, your GNOME/X11 session must"
-	ewarn "be restarted for mail-notification to work. If you don't do"
-	ewarn "this, this program will crash during the setup phase."
-	ewarn "See http://bugzilla.gnome.org/show_bug.cgi?id=151082"
-	ewarn ""
-}
diff --git a/mail-client/mail-notification/mail-notification-4.0_rc2.ebuild b/mail-client/mail-notification/mail-notification-4.1.ebuild
index 9173e09439a9..fd9d7ed3c6d6 100644
--- a/mail-client/mail-notification/mail-notification-4.0_rc2.ebuild
+++ b/mail-client/mail-notification/mail-notification-4.1.ebuild
@@ -1,16 +1,14 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-4.0_rc2.ebuild,v 1.4 2007/08/30 16:08:54 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-4.1.ebuild,v 1.1 2007/09/22 15:39:03 graaff Exp $
 
 inherit eutils gnome2 multilib flag-o-matic versionator
 
-MY_PV=$(replace_version_separator 2 '-')
-
 DESCRIPTION="A GNOME trayicon which checks for email. Supports mbox, MH,
 Maildir, IMAP, Sylpheed, POP3, Gmail and Evolution.  Authenticates via
 apop, ssl, sasl."
 HOMEPAGE="http://www.nongnu.org/mailnotify/"
-SRC_URI="http://savannah.nongnu.org/download/mailnotify/${PN}-${MY_PV}.tar.gz"
+SRC_URI="http://savannah.nongnu.org/download/mailnotify/${P}.tar.bz2"
 
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
@@ -25,18 +23,17 @@ DEPEND=">=x11-libs/gtk+-2.6
 	>=gnome-base/gnome-panel-2.6
 	>=gnome-base/eel-2.6
 	>=gnome-base/gconf-2.6
-	>=gnome-base/libgnomeui-2.6
+	>=gnome-base/libgnomeui-2.14
 	>=gnome-base/libglade-2.0
 	>=gnome-base/orbit-2.6
 	>=dev-libs/gmime-2.1
+	x11-libs/libnotify
 	dev-perl/XML-Parser
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
 	evo? ( >=mail-client/evolution-2.6 )
 	sylpheed? ( virtual/sylpheed )"
 
-S="${WORKDIR}/${P/_/-}"
-
 pkg_setup() {
 	if use evo ; then
 		EVO_INSTALLED="$(best_version mail-client/evolution)"
@@ -60,7 +57,6 @@ pkg_setup() {
 
 src_unpack() {
 	gnome2_src_unpack
-	gnome2_omf_fix
 
 	sed -i -e 's:gtk-update-icon-cache:true:' ./art/Makefile.in
 }
diff --git a/mail-client/mail-notification/metadata.xml b/mail-client/mail-notification/metadata.xml
index 51f94e3fbe0e..c414c535c8ab 100644
--- a/mail-client/mail-notification/metadata.xml
+++ b/mail-client/mail-notification/metadata.xml
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer>
+<email>graaff@gentoo.org</email>
+<name>Hans de Graaff</name>
+</maintainer>
 <herd>net-mail</herd>
 </pkgmetadata>