version bump and cleanup

6 files changed, 53 insertions, 42 deletions

diff --git a/dev-python/reportlab/ChangeLog b/dev-python/reportlab/ChangeLog
index bfa7c13c6d81..5008f815fdda 100644
--- a/dev-python/reportlab/ChangeLog
+++ b/dev-python/reportlab/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/reportlab
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/ChangeLog,v 1.3 2003/07/12 12:49:26 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/ChangeLog,v 1.4 2003/12/14 02:42:10 liquidx Exp $
+
+*reportlab-1.18 (14 Dec 2003)
+
+  14 Dec 2003; Alastair Tse <liquidx@gentoo.org> reportlab-1.18.ebuild:
+  version bump
 
 *reportlab-1.17-r1 (04 Jul 2003)
 
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index f1065c4c15a0..b3effcff2750 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,10 +1,10 @@
-MD5 2172c2cd44d24f204b34687caa6684a0 reportlab-1.17-r1.ebuild 1021
-MD5 dfcc34ba702f2bab8274ceb868421022 reportlab-1.14.ebuild 814
-MD5 9ef2f30b090d689e462c3fd485a92786 ChangeLog 1546
-MD5 43278f55a402737c2246c563df8218db reportlab-1.17.ebuild 816
+MD5 49336546638c655b8df340d535467cbe ChangeLog 1668
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
-MD5 d5f5c0582f5df6e146b770ba6262cae9 files/digest-reportlab-1.17-r1 64
+MD5 dfcc34ba702f2bab8274ceb868421022 reportlab-1.14.ebuild 814
+MD5 2172c2cd44d24f204b34687caa6684a0 reportlab-1.17-r1.ebuild 1021
+MD5 c90eaa5d749268b3b4f856c3812c98bf reportlab-1.18.ebuild 1023
 MD5 ae52d6e28f68d0a56dad9fdc2c295b92 files/digest-reportlab-1.14 64
-MD5 d5f5c0582f5df6e146b770ba6262cae9 files/digest-reportlab-1.17 64
+MD5 d5f5c0582f5df6e146b770ba6262cae9 files/digest-reportlab-1.17-r1 64
+MD5 9331d627b77ad16c57c78fe9f40f56df files/digest-reportlab-1.18 64
 MD5 f8fae2ab18041c7466c36685624a2192 files/1.14/setup.py 2887
 MD5 cdbafc7e047b69becba3bddfef8a61da files/1.17/setup.py 2887
diff --git a/dev-python/reportlab/files/digest-reportlab-1.17 b/dev-python/reportlab/files/digest-reportlab-1.17
deleted file mode 100644
index 8ee8b40b7224..000000000000
--- a/dev-python/reportlab/files/digest-reportlab-1.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 853b3acaa998cfec39a372a94a00925d ReportLab_1_17.tgz 2160136
diff --git a/dev-python/reportlab/files/digest-reportlab-1.18 b/dev-python/reportlab/files/digest-reportlab-1.18
new file mode 100644
index 000000000000..d32a8188d2d6
--- /dev/null
+++ b/dev-python/reportlab/files/digest-reportlab-1.18
@@ -0,0 +1 @@
+MD5 742dcc46702cb547264803303ffae2aa ReportLab_1_18.tgz 2191658
diff --git a/dev-python/reportlab/reportlab-1.17.ebuild b/dev-python/reportlab/reportlab-1.17.ebuild
deleted file mode 100644
index 263c02d8b8ca..000000000000
--- a/dev-python/reportlab/reportlab-1.17.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-1.17.ebuild,v 1.2 2003/09/06 23:32:29 msterret Exp $
-
-#goofy tarball versioning
-vmaj=${PV%%.*}
-vmin=${PV##*.}
-
-S=${WORKDIR}/${PN}
-DESCRIPTION="Tools for generating printable PDF documents from any data source."
-SRC_URI="http://www.reportlab.com/ftp/ReportLab_${vmaj}_${vmin}.tgz"
-HOMEPAGE="http://www.reportlab.com/"
-
-DEPEND=">=dev-lang/python-1.5"
-RDEPEND="${DEPEND}
-	>=sys-libs/zlib-0.95
-	dev-python/Imaging"
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ~sparc ~alpha"
-
-src_compile() {
-	cp ${FILESDIR}/${PV}/setup.py .
-	python setup.py build
-}
-
-src_install() {
-	python setup.py install --root=${D}
-	dodoc  README license.txt docs/*
-}
-
-
-
-
diff --git a/dev-python/reportlab/reportlab-1.18.ebuild b/dev-python/reportlab/reportlab-1.18.ebuild
new file mode 100644
index 000000000000..ff4e10c71bfd
--- /dev/null
+++ b/dev-python/reportlab/reportlab-1.18.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/reportlab/reportlab-1.18.ebuild,v 1.1 2003/12/14 02:42:11 liquidx Exp $
+
+#goofy tarball versioning
+vmaj=${PV%%.*}
+vmin=${PV##*.}
+
+inherit python distutils
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="Tools for generating printable PDF documents from any data source."
+SRC_URI="http://www.reportlab.org/ftp/ReportLab_${vmaj}_${vmin}.tgz"
+HOMEPAGE="http://www.reportlab.org/"
+
+DEPEND=">=sys-libs/zlib-0.95
+	dev-python/Imaging
+	>=sys-apps/sed-4
+	app-arch/tar"
+
+IUSE=""
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+src_install() {
+	python_version
+	distutils_src_install
+
+	# crude hack to fix data files in the right dir
+	cd ${D}/usr/lib/python${PYVER}
+	tar -cv reportlab | tar -C ${D}/usr/lib/python${PYVER}/site-packages -x
+	rm -rf ${D}/usr/lib/python${PYVER}/reportlab
+
+	# docs
+	cd ${S}
+	dodoc README license.txt
+	insinto /usr/share/doc/${PF}
+	doins docs/*
+}