Version bump, mostly portability and bug fixes

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

5 files changed, 19 insertions, 55 deletions

diff --git a/gnustep-libs/pantomime/ChangeLog b/gnustep-libs/pantomime/ChangeLog
index 5e155dff5fcf..c619d3d5aa4c 100644
--- a/gnustep-libs/pantomime/ChangeLog
+++ b/gnustep-libs/pantomime/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnustep-libs/pantomime
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/ChangeLog,v 1.30 2014/08/10 21:18:12 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/ChangeLog,v 1.31 2014/10/20 13:36:43 voyageur Exp $
+
+*pantomime-1.2.2 (20 Oct 2014)
+
+  20 Oct 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  -pantomime-1.2.0_pre3.ebuild, -pantomime-1.2.0_pre3-r1.ebuild,
+  +pantomime-1.2.2.ebuild, -files/pantomime-1.2.0_pre3-gscategories.patch:
+  Version bump, mostly portability and bug fixes
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> pantomime-1.2.0.ebuild,
   pantomime-1.2.0_pre3-r1.ebuild, pantomime-1.2.0_pre3.ebuild:
diff --git a/gnustep-libs/pantomime/Manifest b/gnustep-libs/pantomime/Manifest
index a8c747e889b3..38972760d8ef 100644
--- a/gnustep-libs/pantomime/Manifest
+++ b/gnustep-libs/pantomime/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX pantomime-1.2.0_pre3-gscategories.patch 505 SHA256 550e9d053a02b2578cde8eee53fcdadc6e89ee33c2c17ca3d2b5e536b3d22231 SHA512 0d8b93b8a51cf0177e8b91e999cb485014a997f74896fb17a706c2c109680476fe884f965c82128968710ddbec7e0df10b7b1952e316728b840604ccbcdeb57b WHIRLPOOL 017ba5573c8f12cd04a0e41927ecfd292232f2d0e14192e47440f1b6996353138382a105fdae5f6a689073e3527743745e163dd00c77113c3e867f86cf9be6b6
 DIST Pantomime-1.2.0.tar.gz 466206 SHA256 c6484634dd0611d07108e7e006a2c6bdbe3e72b23de7473440df9a559f6b6218
-DIST Pantomime-1.2.0pre3.tar.gz 441478 SHA256 84227a08ca9131f14fdc6aa1365b15d75d82ca84fc3ceaec2d936f38d38f2ff2
+DIST Pantomime-1.2.2.tar.gz 468276 SHA256 f87b6b362b56c2b22667e614432f222604e318e61340a13b30c8277b180a3be8 SHA512 198c1e0248f47bbd2cc284eec0d804959ea2a51e4a4810f8909048b41fc4bfbbaab9fc86e1ad507611a77382f353b357615c52845228e2411a0da7af88b2988f WHIRLPOOL 93895bcf5819e1d5e8cbc23b21e70e51574f320d25a234ae7cd51873d7da0e1df4b4d4bffcbdf1b8faa172044b8a63212f47ca0340b53247fd9250d4cb293b18
 EBUILD pantomime-1.2.0.ebuild 876 SHA256 151e62329c2d392640f4b8f40c3dfed0febec57a268ecc15a97802adadba2dec SHA512 33e4a142a5c65c325ec78dacd5698ea589675e6ca8a2f42d475df20c829009eb483c30b79eadafea07b0ff0d4c009014ecea6f0a801c86da7eef989ba829d110 WHIRLPOOL 238a6567969b7cb08ef14f7a569681365a153db1d7d6869f11fc764359b07c76f7c773ca629f49439c60bf2bbf97dbdcba9ea8d37c27fe15864352a13c08d492
-EBUILD pantomime-1.2.0_pre3-r1.ebuild 973 SHA256 c3bb8b1832aadc65c19e8ca6ea40afe642b3a11dd3dddb7b3a4040d5a397dfbe SHA512 33101b9ed2863fddd3086c9131cae753a2617d34b7fca9af62e1f1bc80cdd6b345045440be06188122fca2a85272a3be17dd90ea85cecfae63ae36241c2eb05c WHIRLPOOL 88301e344fa7b0c0f11b5a0a43c5d51b1b14966265db6ae257014f34faac244dd2d75e39854a2c8b31c89fdbd169df40da590c039aa681b5f3bc94873a70ee78
-EBUILD pantomime-1.2.0_pre3.ebuild 756 SHA256 995c1780f630249d2f07d212b0de5ae8c5d316961cbf4ef21130277dc328aff3 SHA512 87c3ab38272c16b74dff8f2aaa017eeff398f29a1d88ae44b1715d50931b9a032de6e289847e45f8597e61f5d7f5937f538f47a004fe9f776ea5fce0f3ca4775 WHIRLPOOL 1a7b67ef3777f36f57601b1cce62e8a3a829cd88a5db530142c0a4aff812faafcadee35ddd85bde5eccace44d412a3c31db47850c4c03264b88b9f72b9b6224d
-MISC ChangeLog 6869 SHA256 7d10441cb78a7dff87f3e5b3a94e0582b6f08a83e5223042e9d93295849daf16 SHA512 fcd3140ccbb0dbc6eda307d164e3433c07939c7fcde53c9444c16d13e6d20ff61382ea9532013813f5b55f022dd5a083bb8814f608c5c68f7915e9434954866f WHIRLPOOL c02c135de792a7d08c0a8a3ef7e7b0bdb986be5f8f60ee4451278edeb609f81f52543bc054515dcf135a217d834928efe16573db38a40338193060da448a104d
+EBUILD pantomime-1.2.2.ebuild 881 SHA256 365b8d31bd93b944ea8affc45668f9ef7eddca582806a562a52a81ab570873b3 SHA512 6c0a3fa5cd0b24dc28a0b61276c7f8f6334b0eb97560276d65de414347eb447d8d9f775783c1b5b70bbdb14d1290c7f9ba67b3a2be3dfdcdeaf7b0a29e63147e WHIRLPOOL 26fa9c516cdbaf61e9066ba0ed011c0e0cfc8be6278bda08fd2500f557ff4cef6a0302ea03f8af192fa3bd3e9e77a5790dd9c696871c3c9730c12ce353455c35
+MISC ChangeLog 7148 SHA256 d148763126fce95255406afb7146a1b8150a54b2535a8408741bca4e40c341c2 SHA512 e125933bc0b571a82b40fc78bd82c16d1d32ecfead85e105ff1480ac71d3a9f2268a696d6050c926f48c7e622c552d46f42b8a3e9bb745ce59dcbeee9d25d4f3 WHIRLPOOL 28a067ab6a97b8699b350e579fe577eb15233bf5c9e7950f7627f4e04040e7dd6239290de3e383c0ff77efe9c1db7c37679c25846ad714dc713f01aa7b8bd374
 MISC metadata.xml 375 SHA256 bab11e174cd8bb882d70f6ae9e6272ba8dfdd5709f57fe42fa76bdc6c34d416e SHA512 6a6ca4700b86223fd6d1f177c9da6b2f5fdb1786d896a8fccfff7821eab116636f74b12f0ad0465df7d28dd7e889459aaa68a71386df1693b5661c4758f008e7 WHIRLPOOL 74245365a64da0cb0309a25a4721aa85bcce3869dab3f7ba01c25a7ccf1b42f0375b542bba9a633b10782be274cfbdda90640f936271e3bb0cef57f667d859a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn4ZUACgkQcaHudmEf86r/6QCfTd74m4U2irBgA6PV5+39qHXi
-zMwAn0835KZn0p3dXe7oL7mxqop4KwKI
-=wyUi
+iF4EAREIAAYFAlRFD/AACgkQFYEBGcdFJfJrlgD+PVmgNl2vwqZifjzMLy/sj6N4
+T0s6l0erv1AsyfWYw4wA/3pgj0ilFSYeuSzLNK9684SACvOMM6SAKZlR1+pmwDs+
+=h+DI
 -----END PGP SIGNATURE-----
diff --git a/gnustep-libs/pantomime/files/pantomime-1.2.0_pre3-gscategories.patch b/gnustep-libs/pantomime/files/pantomime-1.2.0_pre3-gscategories.patch
deleted file mode 100644
index eb00d02d6c2f..000000000000
--- a/gnustep-libs/pantomime/files/pantomime-1.2.0_pre3-gscategories.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur Pantomime.orig/Framework/Pantomime/NSString+Extensions.m Pantomime/Framework/Pantomime/NSString+Extensions.m
---- Pantomime.orig/Framework/Pantomime/NSString+Extensions.m	2010-07-07 22:46:19.000000000 +0200
-+++ Pantomime/Framework/Pantomime/NSString+Extensions.m	2010-07-07 22:47:16.000000000 +0200
-@@ -42,8 +42,6 @@
- #ifdef MACOSX
- #include <CoreFoundation/CFString.h>
- #include <CoreFoundation/CFStringEncodingExt.h>
--#else
--#include <GNUstepBase/GSCategories.h>
- #endif
- 
- #include <ctype.h>
diff --git a/gnustep-libs/pantomime/pantomime-1.2.0_pre3.ebuild b/gnustep-libs/pantomime/pantomime-1.2.0_pre3.ebuild
deleted file mode 100644
index f65cb74ba44f..000000000000
--- a/gnustep-libs/pantomime/pantomime-1.2.0_pre3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/pantomime-1.2.0_pre3.ebuild,v 1.6 2014/08/10 21:18:12 slyfox Exp $
-
-inherit gnustep-2
-
-MY_PN=${PN/p/P}
-
-S=${WORKDIR}/${MY_PN}
-
-DESCRIPTION="A set of Objective-C classes that model a mail system"
-HOMEPAGE="http://www.collaboration-world.com/pantomime/"
-SRC_URI="http://www.collaboration-world.com/pantomime.data/releases/Stable/${MY_PN}-${PV/_/}.tar.gz"
-
-LICENSE="LGPL-2.1 Elm"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
-SLOT="0"
-
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	gnustep-base_src_install
-
-	dodoc "${S}"/Documentation/*
-	docinto rfc
-	dodoc "${S}"/Documentation/RFC/*
-}
diff --git a/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild b/gnustep-libs/pantomime/pantomime-1.2.2.ebuild
index 7fa10ab6d8c2..0f3a95916e75 100644
--- a/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild
+++ b/gnustep-libs/pantomime/pantomime-1.2.2.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/pantomime-1.2.0_pre3-r1.ebuild,v 1.3 2014/08/10 21:18:12 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-libs/pantomime/pantomime-1.2.2.ebuild,v 1.1 2014/10/20 13:36:43 voyageur Exp $
 
-EAPI=2
+EAPI=5
 inherit eutils gnustep-2
 
-MY_PN=${PN/p/P}
+MY_P=${P/p/P}
 
-S=${WORKDIR}/${MY_PN}
+S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="A set of Objective-C classes that model a mail system"
 HOMEPAGE="http://www.collaboration-world.com/pantomime/"
-SRC_URI="http://www.collaboration-world.com/pantomime.data/releases/Stable/${MY_PN}-${PV/_/}.tar.gz"
+SRC_URI="http://download.gna.org/gnustep-nonfsf/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1 Elm"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
@@ -22,7 +22,6 @@ DEPEND="dev-libs/openssl"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-gscategories.patch
 	sed -i -e "s|ADDITIONAL_LDFLAGS|LIBRARIES_DEPEND_UPON|" \
 		Framework/Pantomime/GNUmakefile || die "as-needed sed failed"
 }