scrollkeeper violation fix as reported in #92920, cleanup old ebuilds.

(Portage version: 2.0.51.19)

8 files changed, 24 insertions, 161 deletions

diff --git a/mail-client/balsa/ChangeLog b/mail-client/balsa/ChangeLog
index 2b3f556268ac..74828d0da7b7 100644
--- a/mail-client/balsa/ChangeLog
+++ b/mail-client/balsa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/balsa
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.30 2005/06/05 11:49:28 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/ChangeLog,v 1.31 2005/06/11 12:20:59 allanonjl Exp $
+
+*balsa-2.2.6-r4 (11 Jun 2005)
+
+  11 Jun 2005; John N. Laliberte <allanonjl@gentoo.org> -balsa-2.2.6.ebuild,
+  -balsa-2.2.6-r1.ebuild, -balsa-2.2.6-r2.ebuild, +balsa-2.2.6-r4.ebuild:
+  scrollkeeper violation fix as reported in #92920, cleanup old ebuilds.
 
   05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
   balsa-2.0.15-r2.ebuild:
diff --git a/mail-client/balsa/Manifest b/mail-client/balsa/Manifest
index 7ec1f0dcc280..e4e56c0928f7 100644
--- a/mail-client/balsa/Manifest
+++ b/mail-client/balsa/Manifest
@@ -1,20 +1,16 @@
-MD5 d4f6dbc31e378077014bb877a6be7feb balsa-1.4.3.ebuild 1700
-MD5 f9b75f07316fa4c916016a2f92ed0cb2 balsa-2.2.6-r1.ebuild 1768
-MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
-MD5 f5c8556335628c7ee19138a7ecba07cf ChangeLog 13010
-MD5 63f89a65fc88a9d4b338339ce95eb3a3 balsa-2.2.6-r2.ebuild 1816
-MD5 3f9307f7f2f95feab10f1647ee53773d balsa-2.2.6.ebuild 1726
 MD5 b869b36a118057b63963b90363c8d692 balsa-2.0.15-r2.ebuild 1800
 MD5 200266fcc87c5e7e698c879b5496dad8 balsa-2.2.6-r3.ebuild 1877
-MD5 6bad789bbe40ec51339b6c85735d88e5 files/digest-balsa-2.2.6 65
-MD5 aa4090173ee51cb5766ef1b3a6d6f379 files/digest-balsa-2.0.15-r2 66
+MD5 d4f6dbc31e378077014bb877a6be7feb balsa-1.4.3.ebuild 1700
+MD5 b1ebb740ae9cb8173fe789f0ce298d5f ChangeLog 13266
+MD5 f4713bbf77ae895c7ff6c022a7a2f542 metadata.xml 222
+MD5 bcf5ca8bf81cfda5ff814fb71db394a7 balsa-2.2.6-r4.ebuild 1971
 MD5 481c442eb3eb11f09e588578bdac4968 files/balsa-sqlite3-fix.patch 15975
+MD5 f723c65b41c5410c4402b0c5aa2fabd9 files/balsa-ssl.patch 502
 MD5 6214786af3a3095a1e721302f10228f2 files/gtk+2.4-2.patch 1542
 MD5 7640c6a66bb87af1486164581e95296d files/balsa-1.4.0-gentoo.diff 830
-MD5 6bad789bbe40ec51339b6c85735d88e5 files/digest-balsa-2.2.6-r1 65
 MD5 1a6b22403c4f66fbbbd6940c7cc31dca files/balsa-gtk+-2.4-deprecation-fix.patch 2848
-MD5 f723c65b41c5410c4402b0c5aa2fabd9 files/balsa-ssl.patch 502
-MD5 cb6019030e00d143459011755f8f525f files/balsa-2.2.6-deprecation.fix.patch 3352
 MD5 92455a1d3e62f5727b37d43f60acdf12 files/digest-balsa-1.4.3 65
+MD5 cb6019030e00d143459011755f8f525f files/balsa-2.2.6-deprecation.fix.patch 3352
 MD5 6bad789bbe40ec51339b6c85735d88e5 files/digest-balsa-2.2.6-r3 65
-MD5 6bad789bbe40ec51339b6c85735d88e5 files/digest-balsa-2.2.6-r2 65
+MD5 6bad789bbe40ec51339b6c85735d88e5 files/digest-balsa-2.2.6-r4 65
+MD5 aa4090173ee51cb5766ef1b3a6d6f379 files/digest-balsa-2.0.15-r2 66
diff --git a/mail-client/balsa/balsa-2.2.6-r1.ebuild b/mail-client/balsa/balsa-2.2.6-r1.ebuild
deleted file mode 100644
index 97204ab47c62..000000000000
--- a/mail-client/balsa/balsa-2.2.6-r1.ebuild
+++ /dev/null
@@ -1,73 +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/balsa/balsa-2.2.6-r1.ebuild,v 1.1 2005/05/23 13:41:35 allanonjl Exp $
-
-inherit gnome2 eutils
-
-IUSE="doc ssl gtkhtml pcre ldap crypt kerberos threads sqlite"
-DESCRIPTION="Email client for GNOME"
-SRC_URI="http://balsa.gnome.org/${P}.tar.bz2"
-HOMEPAGE="http://balsa.gnome.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=gnome-base/libgnome-2.0
-	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/gnome-vfs-2.0
-	=dev-libs/gmime-2.1.9*
-	>=gnome-base/libbonobo-2.0
-	>=gnome-base/libgnomeprint-2.1.4
-	>=gnome-base/libgnomeprintui-2.1.4
-	>=x11-libs/gtk+-2
-	net-mail/mailbase
-	>=net-libs/libesmtp-1.0-r1
-	sys-devel/libtool
-	virtual/aspell-dict
-	ssl? ( dev-libs/openssl )
-	pcre? ( >=dev-libs/libpcre-3.4 )
-	gtkhtml? (
-		|| (
-			=gnome-extra/libgtkhtml-3.2*
-			=gnome-extra/libgtkhtml-3.0*
-			=gnome-extra/libgtkhtml-2*
-		)
-	)
-	ldap? ( net-nds/openldap )
-	kerberos? ( app-crypt/mit-krb5 )
-	sqlite? ( >=dev-db/sqlite-2.8 )
-	crypt? ( >=app-crypt/gpgme-0.9.0 )
-	"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	>=app-text/scrollkeeper-0.1.4
-	doc? ( dev-util/gtk-doc )
-	"
-
-USE_DESTDIR="1"
-
-src_unpack(){
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/balsa-2.2.6-deprecation.fix.patch
-	epatch ${FILESDIR}/balsa-ssl.patch
-}
-
-use crypt \
-	&& G2CONF="${G2CONF} --with-gpgme=gpgme-config" \
-	|| G2CONF="${G2CONF} --without-gpgme"
-
-G2CONF="${G2CONF} \
-		$(use_with ssl) \
-		$(use_with ldap) \
-		$(use_with sqlite) \
-		$(use_with kerberos gss) \
-		$(use_enable gtkhtml) \
-		$(use_enable threads) \
-		$(use_enable pcre) \
-		"
-
-DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO docs/*"
diff --git a/mail-client/balsa/balsa-2.2.6-r2.ebuild b/mail-client/balsa/balsa-2.2.6-r4.ebuild
index e2692184f4cb..5362d0284025 100644
--- a/mail-client/balsa/balsa-2.2.6-r2.ebuild
+++ b/mail-client/balsa/balsa-2.2.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.2.6-r2.ebuild,v 1.1 2005/05/24 16:03:36 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/balsa/balsa-2.2.6-r4.ebuild,v 1.1 2005/06/11 12:20:59 allanonjl Exp $
 
 inherit gnome2 eutils
 
@@ -56,7 +56,15 @@ src_unpack(){
 	epatch ${FILESDIR}/${PN}-ssl.patch
 	epatch ${FILESDIR}/${PN}-sqlite3-fix.patch
 
+	#aclocal
+	#libtoolize --copy --force
+	autoheader
 	autoconf
+	#automake
+}
+
+src_install() {
+	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
 }
 
 use crypt \
diff --git a/mail-client/balsa/balsa-2.2.6.ebuild b/mail-client/balsa/balsa-2.2.6.ebuild
deleted file mode 100644
index a1ff670fc64c..000000000000
--- a/mail-client/balsa/balsa-2.2.6.ebuild
+++ /dev/null
@@ -1,72 +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/balsa/balsa-2.2.6.ebuild,v 1.12 2005/05/17 18:08:03 ferdy Exp $
-
-inherit gnome2 eutils
-
-IUSE="doc ssl gtkhtml pcre ldap crypt kerberos threads sqlite"
-DESCRIPTION="Email client for GNOME"
-SRC_URI="http://balsa.gnome.org/${P}.tar.bz2"
-HOMEPAGE="http://balsa.gnome.org"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=gnome-base/libgnome-2.0
-	>=gnome-base/libgnomeui-2.0
-	>=gnome-base/gnome-vfs-2.0
-	=dev-libs/gmime-2.1.9*
-	>=gnome-base/libbonobo-2.0
-	>=gnome-base/libgnomeprint-2.1.4
-	>=gnome-base/libgnomeprintui-2.1.4
-	>=x11-libs/gtk+-2
-	net-mail/mailbase
-	>=net-libs/libesmtp-1.0-r1
-	sys-devel/libtool
-	virtual/aspell-dict
-	ssl? ( dev-libs/openssl )
-	pcre? ( >=dev-libs/libpcre-3.4 )
-	gtkhtml? (
-		|| (
-			=gnome-extra/libgtkhtml-3.2*
-			=gnome-extra/libgtkhtml-3.0*
-			=gnome-extra/libgtkhtml-2*
-		)
-	)
-	ldap? ( net-nds/openldap )
-	kerberos? ( app-crypt/mit-krb5 )
-	sqlite? ( >=dev-db/sqlite-2.8 )
-	crypt? ( >=app-crypt/gpgme-0.9.0 )
-	"
-
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	dev-util/pkgconfig
-	>=app-text/scrollkeeper-0.1.4
-	doc? ( dev-util/gtk-doc )
-	"
-
-USE_DESTDIR="1"
-
-src_unpack(){
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/balsa-2.2.6-deprecation.fix.patch
-}
-
-use crypt \
-	&& G2CONF="${G2CONF} --with-gpgme=gpgme-config" \
-	|| G2CONF="${G2CONF} --without-gpgme"
-
-G2CONF="${G2CONF} \
-		$(use_with ssl) \
-		$(use_with ldap) \
-		$(use_with sqlite) \
-		$(use_with kerberos gss) \
-		$(use_enable gtkhtml) \
-		$(use_enable threads) \
-		$(use_enable pcre) \
-		"
-
-DOCS="AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO docs/*"
diff --git a/mail-client/balsa/files/digest-balsa-2.2.6-r1 b/mail-client/balsa/files/digest-balsa-2.2.6-r1
deleted file mode 100644
index beeeb355c10c..000000000000
--- a/mail-client/balsa/files/digest-balsa-2.2.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6179fadbfc5cca642dac081519acef25 balsa-2.2.6.tar.bz2 2913847
diff --git a/mail-client/balsa/files/digest-balsa-2.2.6-r2 b/mail-client/balsa/files/digest-balsa-2.2.6-r2
deleted file mode 100644
index beeeb355c10c..000000000000
--- a/mail-client/balsa/files/digest-balsa-2.2.6-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6179fadbfc5cca642dac081519acef25 balsa-2.2.6.tar.bz2 2913847
diff --git a/mail-client/balsa/files/digest-balsa-2.2.6 b/mail-client/balsa/files/digest-balsa-2.2.6-r4
index beeeb355c10c..beeeb355c10c 100644
--- a/mail-client/balsa/files/digest-balsa-2.2.6
+++ b/mail-client/balsa/files/digest-balsa-2.2.6-r4