Version bump, drop old

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

3 files changed, 25 insertions, 27 deletions

diff --git a/net-misc/identicurse/ChangeLog b/net-misc/identicurse/ChangeLog
index 0f359cdfd0dd..23ec25a3b82e 100644
--- a/net-misc/identicurse/ChangeLog
+++ b/net-misc/identicurse/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/identicurse
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/identicurse/ChangeLog,v 1.1 2011/09/03 19:51:44 xarthisius Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/identicurse/ChangeLog,v 1.2 2012/01/14 18:09:46 xarthisius Exp $
+
+*identicurse-0.8.2 (14 Jan 2012)
+
+  14 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  +files/identicurse-0.8.2-config_json_path.patch, +identicurse-0.8.2.ebuild,
+  -files/identicurse-config_json_path.patch, -identicurse-0.7.3.ebuild:
+  Version bump, drop old
 
 *identicurse-0.7.3 (03 Sep 2011)
 
diff --git a/net-misc/identicurse/files/identicurse-config_json_path.patch b/net-misc/identicurse/files/identicurse-0.8.2-config_json_path.patch
index bbd217e3c061..b1178f4f17de 100644
--- a/net-misc/identicurse/files/identicurse-config_json_path.patch
+++ b/net-misc/identicurse/files/identicurse-0.8.2-config_json_path.patch
@@ -1,31 +1,22 @@
-Description: IdentiCurse checks for config.json in
- /usr/lib/python*/*-packages/identicurse/, change this behaviour to make it
- check it in /usr/share/identicurse/.
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621895
-Author: Alessio Treglia <alessio@debian.org>
-Modified: Kacper Kowalik <xarthisius@gentoo.org>
-
+--- a/setup.py
++++ b/setup.py
+@@ -42,7 +42,7 @@
+ 
+     license="GPLv3+",
+ 
+-    data_files=[('identicurse',['README', 'conf/config.json'])],
++    data_files=[('share/identicurse',['conf/config.json'])],
+     packages=find_packages('src'),
+     package_dir={'': 'src'},
+     include_package_data=True,
 --- a/src/identicurse/identicurse.py
 +++ b/src/identicurse/identicurse.py
-@@ -133,8 +133,8 @@ class IdentiCurse(object):
+@@ -155,7 +155,7 @@
              else:
                  import getpass, time
                  # no config yet, so let's build one
--                print os.path.join(self.path, "config.json")
 -                config.config.load(os.path.join(self.path, "config.json"))
-+                print os.path.join("/", "usr", "share", "identicurse", "config.json")
 +                config.config.load(os.path.join("/", "usr", "share", "identicurse", "config.json"))
                  print "No config was found, so we will now run through a few quick questions to set up a basic config for you (which will be saved as %s so you can manually edit it later). If the default (where defaults are available, they're stated in []) is already fine for any question, just press Enter without typing anything, and the default will be used." % (config.config.filename)
                  print "This version of IdentiCurse supports OAuth login. Using OAuth to log in means that you do not need to enter your username and password."
                  use_oauth = raw_input("Use OAuth [Y/n]? ").upper()
---- a/setup.py
-+++ b/setup.py
-@@ -36,7 +36,7 @@
- 
-     license="GPLv3+",
- 
--    data_files=[('identicurse',['README', 'conf/config.json'])],
-+    data_files=[('share/identicurse',['README','conf/config.json'])],
-     packages=find_packages('src'),
-     package_dir={'': 'src'},
-     include_package_data=True,
diff --git a/net-misc/identicurse/identicurse-0.7.3.ebuild b/net-misc/identicurse/identicurse-0.8.2.ebuild
index 043cfa0635c9..f01264e45643 100644
--- a/net-misc/identicurse/identicurse-0.7.3.ebuild
+++ b/net-misc/identicurse/identicurse-0.8.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/identicurse/identicurse-0.7.3.ebuild,v 1.1 2011/09/03 19:51:44 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/identicurse/identicurse-0.8.2.ebuild,v 1.1 2012/01/14 18:09:46 xarthisius Exp $
 
-EAPI=3
+EAPI=4
 
 PYTHON_DEPEND="2"
 SUPPORT_PYTHON_ABIS="1"
@@ -28,6 +28,6 @@ S=${WORKDIR}/${PN}-${MY_PV}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-gzipped_readme.patch \
-		"${FILESDIR}"/${PN}-config_json_path.patch
+		"${FILESDIR}"/${P}-config_json_path.patch
 	distutils_src_prepare
 }