added python 2.3 fixes to makefile

6 files changed, 36 insertions, 33 deletions

diff --git a/app-portage/lintool/ChangeLog b/app-portage/lintool/ChangeLog
index 0e6048b50cd8..dd5dd428e4c0 100644
--- a/app-portage/lintool/ChangeLog
+++ b/app-portage/lintool/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-portage/lintool
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/lintool/ChangeLog,v 1.4 2003/09/27 10:06:21 robbat2 Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-portage/lintool/ChangeLog,v 1.5 2004/01/23 00:31:24 liquidx Exp $
+
+  23 Jan 2004; Alastair Tse <liquidx@gentoo.org> lintool-0.2.3-r1.ebuild,
+  lintool-0.2.4-r1.ebuild, lintool-0.2.4.ebuild,
+  files/lintool-0.2.4-python.diff:
+  added python 2.3 fixes to makefile
 
   27 Sep 2003; Robin H. Johnson <robbat2@gentoo.org>
   files/lintool-0.2.4-fixyear.diff:
diff --git a/app-portage/lintool/files/digest-lintool-0.2.4 b/app-portage/lintool/files/digest-lintool-0.2.4
deleted file mode 100644
index 55b1984ec599..000000000000
--- a/app-portage/lintool/files/digest-lintool-0.2.4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 89b56abf4614b83a35791c8687d7fc2a /lintool-0.2.4.ebuild 605
-MD5 ab4ca882e1c95e635934b453a0962498 lintool-0.2.4.tar.bz2 21779
diff --git a/app-portage/lintool/files/lintool-0.2.4-python.diff b/app-portage/lintool/files/lintool-0.2.4-python.diff
new file mode 100644
index 000000000000..604aeb59f5ca
--- /dev/null
+++ b/app-portage/lintool/files/lintool-0.2.4-python.diff
@@ -0,0 +1,21 @@
+--- Makefile.orig	2004-01-23 00:06:38.513638208 +0000
++++ Makefile	2004-01-23 00:13:00.155619808 +0000
+@@ -1,14 +1,14 @@
+ DESTDIR =
++PYVER=`/usr/bin/python -c 'import sys; print sys.version[0:3]'`
+ 
+ all:
+ 	cd src/lintool ; python __init__.py
+ 
+ install: all
+-	
++
+ 	install -m0755 -d $(DESTDIR)/usr/bin/
+ 	install -m0755 src/lintool.py $(DESTDIR)/usr/bin/lintool
+-	install -m0755 -d $(DESTDIR)/usr/lib/python2.2/site-packages/lintool/
+-#	for i in digest.pyc ebuild.pyc changelog.pyc __init__.py test.pyc ; do 
++	install -m0755 -d $(DESTDIR)/usr/lib/python$(PYVER)/site-packages/lintool/
+ 	for i in digest.py ebuild.py changelog.py __init__.py test.py ; do \
+-		install -m0644 src/lintool/$$i $(DESTDIR)/usr/lib/python2.2/site-packages/lintool/$$i ; \
++		install -m0644 src/lintool/$$i $(DESTDIR)/usr/lib/python$(PYVER)/site-packages/lintool/$$i ; \
+ 	done
diff --git a/app-portage/lintool/lintool-0.2.3-r1.ebuild b/app-portage/lintool/lintool-0.2.3-r1.ebuild
index dfbf7e798776..f7e292346074 100644
--- a/app-portage/lintool/lintool-0.2.3-r1.ebuild
+++ b/app-portage/lintool/lintool-0.2.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/lintool/lintool-0.2.3-r1.ebuild,v 1.1 2003/08/15 13:22:00 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/lintool/lintool-0.2.3-r1.ebuild,v 1.2 2004/01/23 00:31:24 liquidx Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Gentoo Linux \"lint\" utility"
@@ -19,6 +19,7 @@ src_unpack(){
 	unpack ${A}
 	cd ${S}
 	epatch ${DISTDIR}/lintool-copyright-patch.diff
+	epatch ${FILESDIR}/lintool-0.2.4-python.diff
 }
 src_compile() {
 	emake || die
diff --git a/app-portage/lintool/lintool-0.2.4-r1.ebuild b/app-portage/lintool/lintool-0.2.4-r1.ebuild
index ce184ba09a59..19e97a647547 100644
--- a/app-portage/lintool/lintool-0.2.4-r1.ebuild
+++ b/app-portage/lintool/lintool-0.2.4-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/lintool/lintool-0.2.4-r1.ebuild,v 1.2 2003/11/14 16:34:18 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-portage/lintool/lintool-0.2.4-r1.ebuild,v 1.3 2004/01/23 00:31:24 liquidx Exp $
+
+import python
 
 IUSE=""
 
@@ -18,6 +20,7 @@ DEPEND=">=dev-lang/python-2.2"
 src_unpack() {
 	unpack ${A}
 	epatch ${FILESDIR}/lintool-0.2.4-fixyear.diff
+	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/lintool-0.2.4-python.diff
 }
 
 src_compile() {
diff --git a/app-portage/lintool/lintool-0.2.4.ebuild b/app-portage/lintool/lintool-0.2.4.ebuild
deleted file mode 100644
index 8357da00b154..000000000000
--- a/app-portage/lintool/lintool-0.2.4.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-portage/lintool/lintool-0.2.4.ebuild,v 1.1 2003/08/15 13:22:00 lanius Exp $
-
-IUSE=""
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Gentoo Linux \"lint\" utility"
-HOMEPAGE="http://www.gentoo.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~hppa ~alpha"
-
-DEPEND=">=dev-lang/python-2.2"
-
-src_compile() {
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc README NEWS ChangeLog COPYING AUTHORS
-}