Version bump, mostly portability and bug fixes

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key C74525F2)

4 files changed, 13 insertions, 47 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/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"
 }