Drop old version, relax pantomime dependency

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

6 files changed, 20 insertions, 180 deletions

diff --git a/gnustep-apps/gnumail/ChangeLog b/gnustep-apps/gnumail/ChangeLog
index db9fff7063a4..b4653bd807d5 100644
--- a/gnustep-apps/gnumail/ChangeLog
+++ b/gnustep-apps/gnumail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnustep-apps/gnumail
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.37 2012/08/24 07:15:29 xmw Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.38 2014/10/20 13:33:58 voyageur Exp $
+
+  20 Oct 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  -gnumail-1.2.0_pre3-r1.ebuild, gnumail-1.2.0.ebuild,
+  -files/gnumail-1.2.0_pre3-index.patch,
+  -files/gnumail-1.2.0_pre3-pgpversion.patch:
+  Drop old version, relax pantomime dependency
 
   24 Aug 2012; Michael Weber <xmw@gentoo.org> gnumail-1.2.0.ebuild:
   ppc stable (bug 421335).
diff --git a/gnustep-apps/gnumail/Manifest b/gnustep-apps/gnumail/Manifest
index ebc9b56eb831..238710541924 100644
--- a/gnustep-apps/gnumail/Manifest
+++ b/gnustep-apps/gnumail/Manifest
@@ -1,18 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gnumail-1.2.0_pre3-index.patch 1276 SHA256 1836fb38201c30fa52d9b96cb14447844a426e56d2ef8c5af90ebec0c5cf9473 SHA512 8c9b000d24bab732ac33e393e60348c0bb6b743f9f35c02cbdab827238d6d47d250183da2bd9f27911d0030c74810d091679e1699927403c6b7640d4f23e2664 WHIRLPOOL 360dbde2218ea4baacb1ac7bd0fed45409fb02354a493a03a0ff0445555778bb8aadf8257789fccba05e060adff073770df1cb5bf0d45b4d92a1e8251a1d5b1e
-AUX gnumail-1.2.0_pre3-pgpversion.patch 932 SHA256 5f7af2e8b1177f361347978b6e858279fd83f4c2c7e32783f6448c7ae2f61c5c SHA512 c57dfc8f8fe5f8b7842d367725500fd00bc42685f9ffdadd9fb80d77102a59384f49c5a3e6b9729fe596ce8b7ed2d57de72fb02f0f61f24ff568b68514b7d95f WHIRLPOOL 807222ab593d6887d311d2aa9a997d1ee128c625f056436818116dd8751c89c8d9e6fc739bce88f5b4350f8f193785c4777fd89af58b3b4fff7de610fe09b750
-DIST GNUMail-1.2.0.tar.gz 1380032 SHA256 792512276b253d79362736fb0cb7d614d5a980ea356d03d6adec4d0dd0f6ef2c
-DIST GNUMail-1.2.0pre3.tar.gz 1327521 SHA256 29127a65f35208a461436853b41de81f46db7d735958b40e06776805114d7b37
-EBUILD gnumail-1.2.0.ebuild 1539 SHA256 929b07e47215618b2a1feff97609abf38a422c0c4f70485db8d7861e668dea1c SHA512 1bfa8035383e3a8bc7c6ba247c7fcd1fbfcf5caf0daaa1c4d1b7a1cadb2544d96bfd4afb293a07c2f75f74774ed758dc71920b039d09c388672f4c0fc69b7c7e WHIRLPOOL 8feaefdb58aafc92421d60006b4abc89f9af8b6b6334e8618992ac05332cd172f2d800198476d6929e3a048b0416873d83aa0ed1218c6ead99ade31a74ae0317
-EBUILD gnumail-1.2.0_pre3-r1.ebuild 1940 SHA256 017ab694eae4374fcfcefb0b3506dcf7225bb3fa8bc4c76f080817ec7968aff5 SHA512 bee8b135fcdcd23840c032369a9a71e8149d39b0d70efe898039c4acaab694717cbcd2f218a0b2035bdc7f33a093fbc722d35415f7e5c8cca34ae21f7f29cfb4 WHIRLPOOL b617e903e0448cc04ba430ae7b5403242a6e66e278f683844c25e8412cde9698251847f917484644c18988a53f5d3d6201aff9615350fab270273d56b881566a
-MISC ChangeLog 8154 SHA256 6712ff777d262341c8d15afe4c12724bdfd3b66ba8b17884cdba50764604d059 SHA512 40ba48f167680bebcbcf3d63451b738a79efebf5b1f23fb4a62fd6e7550d773ecf1738b88e2382a8671ea13e9527d0b0c8ee03e661347fad2d2d6ae2714b71fc WHIRLPOOL f0aa5d4f8ab512e117036024338ed0d829fa46cc4f1a3b2dfd0e4ce82d6e28ced39a017161ab4ceffe7a46f075a0e7a6d5d235b93da43c91f60859a74b0ef833
+DIST GNUMail-1.2.0.tar.gz 1380032 SHA256 792512276b253d79362736fb0cb7d614d5a980ea356d03d6adec4d0dd0f6ef2c SHA512 ef0c806e5550daa064a789633c3ecb87819c1e94667fc69fc52bc2923a6819ac6e7fc5262a74503c3554e79429c3d2163eeb68fd30adcfe59ba3aede7ee0a7cb WHIRLPOOL 8fb58c22ff2a2b0a8949aefcbe16c943287069e96d0ff0543156065c7d15e5c0b781497b7f6d3d01f609a3d2ff3010437bc5353ca233cc0b06a9d704374442df
+EBUILD gnumail-1.2.0.ebuild 1510 SHA256 c338b891603207e99acbb490252c8deeeac0945ad452b318962d1b38f1926f57 SHA512 18622f56e03823f09af4241c05f8de7d880188e44a6cfb2419b655a934b0bb5ea027237ed80a876dfe4bc1c4856c12ad8dadeb5917393dec0d6bce61f972a97d WHIRLPOOL 9dea0af85eaa6cdec841722516a154956be7825253f381d228f1cd4f17d53d15f44d349187ff3deb541309b45a806b007680320f199b6079736563a008ffa53a
+MISC ChangeLog 8404 SHA256 184d367ab41a381fec71d51383254486f439fc42501a3fe8f87fa319e7736e15 SHA512 4dde92e6a8a18fb267399dd458a6d8b5b7d8b79fbfd49c1f34efc43be69cfb29b420307b8af7befc4812e9fff25d0d2fbae99a1b2acc7bb60d08de287381433d WHIRLPOOL afadd875c9cc6637e387f9141eb246f6b329480adabfd9c056558c46ae9f24d191f561b325e7bd1362add7db048465d47568cba6372b115f94e0b5d429b4471b
 MISC metadata.xml 729 SHA256 ae26ba1cb935aec4350392cb1bf56d20be81ef8904d233b388bbd5811c162100 SHA512 096894aed7c9d1728dbd2ee001b5c769bd0f3f454c18b61e642478e96972e7d55780be30dafae9ab150b3e91730829e1fc284889a95bc0257ba6b3cbdb05de20 WHIRLPOOL e3301c549ad25d99324c8b2e62f5d06e0f851588527370dbe3d4a688034e7438d46e5fb21dea377c25dcf849733c784105b7a04febb19f33484c5911ad0e0c41
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iF4EAREIAAYFAlA3KhUACgkQknrdDGLu8JCDkQD+KfKehMRfTqzLuM+EhJZPP/Ef
-/j87Cr0RIImWT1XMeRIA/jtyxA212lWAcNKD6ZYls2OeE/Uq7acRvQBO0Z56QwkA
-=Td14
+iF4EAREIAAYFAlRFD0wACgkQFYEBGcdFJfIkKwD7BIvSL+bAwKMYlMI61YqoW/xU
+K4BkjL7tvxyMqy3Ylr8A/RLWWb3DuNuMBtapnDOYlMd2caAi2xj1Iyha08+b4O+q
+=y1wQ
 -----END PGP SIGNATURE-----
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
deleted file mode 100644
index 384911cc57b8..000000000000
--- a/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-index.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- 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/files/gnumail-1.2.0_pre3-pgpversion.patch b/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-pgpversion.patch
deleted file mode 100644
index 6fd1d333a00b..000000000000
--- a/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-pgpversion.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- Bundles/PGP/PGPController.h.orig    2007-09-21 13:51:25.000000000 -0700
-+++ Bundles/PGP/PGPController.h 2007-09-21 13:58:22.000000000 -0700
-@@ -69,6 +69,7 @@
- // other methods
- //
- - (void) updateAndRestartTimer;
-+- (NSString *) myVersion;
- 
- @end
- 
---- Bundles/PGP/PGPController.m.orig    2007-09-21 13:51:37.000000000 -0700
-+++ Bundles/PGP/PGPController.m 2007-09-21 13:58:19.000000000 -0700
-@@ -274,7 +274,7 @@
- //
- //
- //
--- (NSString *) version
-+- (NSString *) myVersion
- {
-   return @"v0.9.1";
- }
---- Bundles/PGP/PGPViewController.m.orig        2007-09-25 11:42:10.000000000 -0700
-+++ Bundles/PGP/PGPViewController.m     2007-09-25 11:42:30.000000000 -0700
-@@ -71,7 +71,7 @@
- 
-   // We set the version label value
-   [versionLabel setStringValue: [NSString stringWithFormat: _(@"Version: %@"),
--					  [[PGPController singleInstance] version]]];
-+					  [[PGPController singleInstance] myVersion]]];
- 
-   return self;
- }
-
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0.ebuild
index bddb165c7816..c1da43950dfa 100644
--- a/gnustep-apps/gnumail/gnumail-1.2.0.ebuild
+++ b/gnustep-apps/gnumail/gnumail-1.2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.ebuild,v 1.4 2012/08/24 07:15:29 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0.ebuild,v 1.5 2014/10/20 13:33:58 voyageur Exp $
 
 EAPI=4
 inherit gnustep-2
@@ -17,9 +17,9 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="crypt +emoticon +xface"
-DEPEND="~gnustep-libs/pantomime-${PV}
-	>=gnustep-base/gnustep-gui-0.11.0
-	|| ( gnustep-apps/addresses gnustep-libs/addresseskit )"
+DEPEND=">=gnustep-base/gnustep-gui-0.11.0
+	=gnustep-libs/pantomime-1.2*
+	gnustep-apps/addresses"
 RDEPEND="crypt? ( app-crypt/gnupg )"
 
 src_prepare() {
diff --git a/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild
deleted file mode 100644
index 06cd4d4a7817..000000000000
--- a/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 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-r1.ebuild,v 1.8 2011/06/06 09:09:49 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 gnustep-libs/addresseskit )"
-RDEPEND="crypt? ( app-crypt/gnupg )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-index.patch
-	epatch "${FILESDIR}"/${P}-pgpversion.patch
-	sed -i -e 's|GNUMail_GUI_LIBS =|LIBRARIES_DEPEND_UPON +=|' \
-		Framework/GNUMail/GNUmakefile || die "as-needed sed failed"
-	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
-	cd "${S}"
-
-	if use xface ; then
-		cd Bundles/Face
-		egnustep_install
-		cd "${S}"
-	fi
-	if use crypt ; then
-		cd Bundles/PGP
-		egnustep_install
-		cd "${S}"
-	fi
-	if use emoticon ; then
-		cd Bundles/Emoticon
-		egnustep_install
-		cd "${S}"
-	fi
-
-	dodoc "${S}"/Documentation/*
-
-	# FIX ?
-	rm -rf "${D}"$(egnustep_install_domain)/Applications/GNUMail.app/Resources/Resources
-}