Version bump from the GNUstep overlay

(Portage version: 2.1.3.9)

10 files changed, 139 insertions, 222 deletions

diff --git a/gnustep-apps/gnumail/ChangeLog b/gnustep-apps/gnumail/ChangeLog
index 77d3aaa138f1..4665c5e81cbb 100644
--- a/gnustep-apps/gnumail/ChangeLog
+++ b/gnustep-apps/gnumail/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnustep-apps/gnumail
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.23 2007/08/22 16:24:43 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.24 2007/09/10 19:06:45 voyageur Exp $
+
+*gnumail-1.2.0_pre3 (10 Sep 2007)
+
+  10 Sep 2007; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/gnumail-1.2.0_pre3-index.patch, +gnumail-1.2.0_pre3.ebuild,
+  -gnumail-1.2.0.20050606.ebuild, -gnumail-1.2.0.20060424.ebuild,
+  -gnumail-1.2.0.20060925.ebuild:
+  Version bump from the GNUstep overlay
+  Remove old versions
 
   22 Aug 2007; Roy Marples <uberlord@gentoo.org>
   gnumail-1.2.0.20060925.ebuild:
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0.20050606 b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0.20050606
deleted file mode 100644
index dc159b962f63..000000000000
--- a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0.20050606
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 83c677443461ed5c5c702b3d2220522c GNUMail-1.2.0.20050606.tar.bz2 929091
-RMD160 dbc28a3a4108c060107b5a5a5e6874191a347367 GNUMail-1.2.0.20050606.tar.bz2 929091
-SHA256 a23b583b001a728ff6fcf289ac036867b1e1146579285cc3815efa246cfe6215 GNUMail-1.2.0.20050606.tar.bz2 929091
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0.20060424 b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0.20060424
deleted file mode 100644
index 5266d05d17d1..000000000000
--- a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0.20060424
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 84e27fd438f831ff04dd2f47196e978e gnumail-1.2.0.20060424.tar.bz2 919471
-RMD160 35da660206afaa19feb5ae0fb9f0b076fa98611d gnumail-1.2.0.20060424.tar.bz2 919471
-SHA256 5b622beca9019c61028c8c2ce0b40f4f995ee2f27151885502c6c3f0326dce8f gnumail-1.2.0.20060424.tar.bz2 919471
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0.20060925 b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0.20060925
deleted file mode 100644
index 3fe54b0eb379..000000000000
--- a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0.20060925
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0f91fe0c32ef369ea843a2ab3909fb2b GNUMail-1.2.0pre2.tar.gz 1404519
-RMD160 ec9287d0346d12b8b52890cef7020b966ca0361a GNUMail-1.2.0pre2.tar.gz 1404519
-SHA256 8340eefa7d06b165b2a5c0554d38898430c825b101ad7a00fe9fa7770f1840a9 GNUMail-1.2.0pre2.tar.gz 1404519
diff --git a/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre3 b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre3
new file mode 100644
index 000000000000..f6d45a96a127
--- /dev/null
+++ b/gnustep-apps/gnumail/files/digest-gnumail-1.2.0_pre3
@@ -0,0 +1,3 @@
+MD5 66094028676b19cb2eee15e163073ee5 GNUMail-1.2.0pre3.tar.gz 1327521
+RMD160 5d8ff5d6d520f586eca5eb194ed2bafa3e718d0c GNUMail-1.2.0pre3.tar.gz 1327521
+SHA256 29127a65f35208a461436853b41de81f46db7d735958b40e06776805114d7b37 GNUMail-1.2.0pre3.tar.gz 1327521
diff --git a/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-index.patch b/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-index.patch
new file mode 100644
index 000000000000..384911cc57b8
--- /dev/null
+++ b/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-index.patch
@@ -0,0 +1,37 @@
+--- Framework/GNUMail/MailWindowController.m.orig	2007-06-22 17:21:42.000000000 +0200
++++ Framework/GNUMail/MailWindowController.m	2007-06-22 17:23:39.000000000 +0200
+@@ -2372,14 +2372,8 @@
+ 
+   // We set any vertical mouse motion has being dragging
+   [dataView setVerticalMotionCanBeginDrag: NO];
+-   
+-  // FIXME: Should we really make that work under OS X and MingW?
+-  //        Find the right * y ratio
+-#if !defined(MACOSX) && !defined(__MINGW32__)
+-  // We set the table row height, depending on the current font
+-  aSize = [[NSFont seenMessageFont] maximumAdvancement];
+-  [dataView setRowHeight: aSize.height];
+-#endif
++
++  [dataView setRowHeight: [[NSFont seenMessageFont] defaultLineHeightForFont]];
+ 
+   // We load the right set of columns
+   [self _reloadTableColumns: self];
+@@ -2854,16 +2848,7 @@
+ //
+ - (void) _fontValuesHaveChanged
+ {
+-  // FIXME: Should we really make that work under OS X?
+-  //        Find the right * y ratio
+-#ifndef MACOSX
+-  NSSize aSize;
+-  
+-  // We set the table row height, depending on the current font
+-  aSize = [[NSFont seenMessageFont] maximumAdvancement];
+-  [dataView setRowHeight: aSize.height];
+-#endif
+-
++  [dataView setRowHeight: [[NSFont seenMessageFont] defaultLineHeightForFont]];
+   [self _showMessage: self];
+ }
+ 
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0.20050606.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0.20050606.ebuild
deleted file mode 100644
index c9b87a06ee6f..000000000000
--- a/gnustep-apps/gnumail/gnumail-1.2.0.20050606.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0.20050606.ebuild,v 1.5 2007/07/13 07:00:14 mr_bones_ Exp $
-
-inherit gnustep
-
-S=${WORKDIR}/${P/gnum/GNUM}
-
-DESCRIPTION="A fully featured mail application for GNUstep"
-HOMEPAGE="http://www.collaboration-world.com/gnumail/"
-SRC_URI="mirror://gentoo/${P/gnum/GNUM}.tar.bz2"
-
-KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="crypt doc emoticon xface"
-DEPEND="${GS_DEPEND}
-	=gnustep-libs/pantomime-${PV}
-	gnustep-apps/addresses"
-RDEPEND="${GS_RDEPEND}
-	crypt? ( app-crypt/gnupg )
-	=gnustep-libs/pantomime-${PV}
-	gnustep-apps/addresses"
-
-egnustep_install_domain "Local"
-
-src_compile() {
-	egnustep_env
-	egnustep_make
-
-	if use xface ; then
-		cd Bundles/Face
-		egnustep_make
-		cd ../..
-	fi
-
-	if use crypt ; then
-		cd Bundles/PGP
-		egnustep_make
-		cd ../..
-	fi
-
-	if use emoticon ; then
-		cd Bundles/Emoticon
-		egnustep_make
-		cd ../..
-	fi
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install
-	if use doc ; then
-		egnustep_env
-		egnustep_doc || die
-	fi
-
-	use xface && cp -pPR ${S}/Bundles/Face/Face.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
-	use crypt && cp -pPR ${S}/Bundles/PGP/PGP.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
-	use emoticon && cp -pPR ${S}/Bundles/Emoticon/Emoticon.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
-
-	egnustep_package_config
-}
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0.20060424.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0.20060424.ebuild
deleted file mode 100644
index daf85966a2e2..000000000000
--- a/gnustep-apps/gnumail/gnumail-1.2.0.20060424.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0.20060424.ebuild,v 1.2 2007/07/13 07:00:14 mr_bones_ Exp $
-
-inherit gnustep
-
-S=${WORKDIR}/${PN/gnum/GNUM}
-
-DESCRIPTION="A fully featured mail application for GNUstep"
-HOMEPAGE="http://www.collaboration-world.com/gnumail/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-KEYWORDS="~x86 ~ppc"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="crypt doc emoticon xface"
-DEPEND="${GS_DEPEND}
-	=gnustep-libs/pantomime-${PV}
-	gnustep-apps/addresses"
-RDEPEND="${GS_RDEPEND}
-	crypt? ( app-crypt/gnupg )
-	=gnustep-libs/pantomime-${PV}
-	gnustep-apps/addresses"
-
-egnustep_install_domain "Local"
-
-src_compile() {
-	egnustep_env
-	egnustep_make
-
-	if use xface ; then
-		cd Bundles/Face
-		egnustep_make
-		cd ../..
-	fi
-
-	if use crypt ; then
-		cd Bundles/PGP
-		egnustep_make
-		cd ../..
-	fi
-
-	if use emoticon ; then
-		cd Bundles/Emoticon
-		egnustep_make
-		cd ../..
-	fi
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install
-	if use doc ; then
-		egnustep_env
-		egnustep_doc || die
-	fi
-
-	use xface && cp -pPR ${S}/Bundles/Face/Face.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
-	use crypt && cp -pPR ${S}/Bundles/PGP/PGP.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
-	use emoticon && cp -pPR ${S}/Bundles/Emoticon/Emoticon.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
-
-	egnustep_package_config
-}
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0.20060925.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0.20060925.ebuild
deleted file mode 100644
index 189172e3617e..000000000000
--- a/gnustep-apps/gnumail/gnumail-1.2.0.20060925.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0.20060925.ebuild,v 1.4 2007/08/22 16:24:43 uberlord Exp $
-
-inherit gnustep
-
-MY_PN=${PN/gnum/GNUM}
-MY_PV=${PV%.*}
-
-S=${WORKDIR}/${MY_PN}
-
-DESCRIPTION="A fully featured mail application for GNUstep"
-HOMEPAGE="http://www.collaboration-world.com/gnumail/"
-SRC_URI="http://www.collaboration-world.com/gnumail.data/releases/Stable/${MY_PN}-${MY_PV}pre2.tar.gz"
-
-KEYWORDS="~ppc ~x86 ~x86-fbsd"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="crypt doc emoticon xface"
-DEPEND="${GS_DEPEND}
-	=gnustep-libs/pantomime-${PV}
-	>=gnustep-base/gnustep-gui-0.11.0
-	gnustep-apps/addresses
-	virtual/libiconv"
-RDEPEND="${GS_RDEPEND}
-	crypt? ( app-crypt/gnupg )
-	=gnustep-libs/pantomime-${PV}
-	>=gnustep-base/gnustep-gui-0.11.0
-	gnustep-apps/addresses"
-
-egnustep_install_domain "System"
-
-src_unpack() {
-	unpack ${A}
-
-	# FIX encoding
-	cd ${S}/Resources/Russian.lproj
-	iconv -futf-8 -tutf-16 Localizable.strings > Localizable.strings.utf-16
-	mv Localizable.strings.utf-16 Localizable.strings
-}
-
-src_compile() {
-	egnustep_env
-	egnustep_make
-
-	if use xface ; then
-		cd Bundles/Face
-		egnustep_make
-		cd ../..
-	fi
-
-	if use crypt ; then
-		cd Bundles/PGP
-		egnustep_make
-		cd ../..
-	fi
-
-	if use emoticon ; then
-		cd Bundles/Emoticon
-		egnustep_make
-		cd ../..
-	fi
-}
-
-src_install() {
-	egnustep_env
-	egnustep_install
-	if use doc ; then
-		egnustep_env
-		egnustep_doc || die
-	fi
-
-	use xface && cp -pPR ${S}/Bundles/Face/Face.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
-	use crypt && cp -pPR ${S}/Bundles/PGP/PGP.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
-	use emoticon && cp -pPR ${S}/Bundles/Emoticon/Emoticon.bundle ${D}$(egnustep_install_domain)/Library/GNUMail/
-
-	egnustep_package_config
-
-	dodoc ${S}/Documentation/*
-
-	# FIX ?
-	rm -rf ${D}$(egnustep_install_domain)/Applications/GNUMail.app/Resources/Resources
-}
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0_pre3.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0_pre3.ebuild
new file mode 100644
index 000000000000..07e0794d57b9
--- /dev/null
+++ b/gnustep-apps/gnumail/gnumail-1.2.0_pre3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre3.ebuild,v 1.1 2007/09/10 19:06:45 voyageur Exp $
+
+inherit gnustep-2
+
+MY_PN=${PN/gnum/GNUM}
+
+S=${WORKDIR}/${MY_PN}
+
+DESCRIPTION="A fully featured mail application for GNUstep"
+HOMEPAGE="http://www.collaboration-world.com/gnumail/"
+SRC_URI="http://www.collaboration-world.com/gnumail.data/releases/Stable/${MY_PN}-${PV/_/}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="crypt emoticon xface"
+DEPEND="=gnustep-libs/pantomime-${PV}
+	>=gnustep-base/gnustep-gui-0.11.0
+	gnustep-apps/addresses"
+RDEPEND="crypt? ( app-crypt/gnupg )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${P}-index.patch
+	sed -i -e \
+		's|$(GNUSTEP_INSTALLATION_DIR)/Library|$(DESTDIR)$(GNUSTEP_SYSTEM_LIBRARY)|' \
+		Bundles/*/GNUmakefile || die "gnustep-make-2 sed failed"
+}
+
+src_compile() {
+	egnustep_env
+	egnustep_make
+
+	cd Bundles/Clock
+	egnustep_make
+	cd ${S}
+
+	if use xface ; then
+		cd Bundles/Face
+		egnustep_make
+		cd ${S}
+	fi
+
+	if use crypt ; then
+		cd Bundles/PGP
+		egnustep_make
+		cd ${S}
+	fi
+
+	if use emoticon ; then
+		cd Bundles/Emoticon
+		egnustep_make
+		cd ${S}
+	fi
+}
+
+src_install() {
+	gnustep-base_src_install
+
+	cd Bundles/Clock
+	egnustep_install || die
+	cd ${S}
+
+	if use xface ; then
+		cd Bundles/Face
+		egnustep_install || die
+		cd ${S}
+	fi
+	if use crypt ; then
+		cd Bundles/PGP
+		egnustep_install || die
+		cd ${S}
+	fi
+	if use emoticon ; then
+		cd Bundles/Emoticon
+		egnustep_install || die
+		cd ${S}
+	fi
+
+	dodoc ${S}/Documentation/*
+
+	# FIX ?
+	rm -rf ${D}$(egnustep_install_domain)/Applications/GNUMail.app/Resources/Resources
+}