fix qa issues regarding --install-data, add doc use flag and other fixes

4 files changed, 75 insertions, 21 deletions

diff --git a/dev-python/kinterbasdb/ChangeLog b/dev-python/kinterbasdb/ChangeLog
index 8f5d9941bdde..26b0dc2e8ad1 100644
--- a/dev-python/kinterbasdb/ChangeLog
+++ b/dev-python/kinterbasdb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/kinterbasdb
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/ChangeLog,v 1.26 2007/06/24 17:24:05 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/ChangeLog,v 1.27 2007/07/02 02:15:43 hawking Exp $
+
+  02 Jul 2007; Ali Polatel <hawking@gentoo.org>
+  +files/kinterbasdb-3.2-no_doc.patch, kinterbasdb-3.2.ebuild:
+  Fixed qa issues caused by --install-data, patch setup.py to stop instaling
+  docs, added doc use flag, setup correct firebird include path in setup.cfg,
+  added trailing slash to HOMEPAGE, removed $PN from DESCRIPTION
 
   24 Jun 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   kinterbasdb-3.1.3.ebuild, kinterbasdb-3.2.ebuild:
diff --git a/dev-python/kinterbasdb/Manifest b/dev-python/kinterbasdb/Manifest
index 49295e0af871..685e1811af83 100644
--- a/dev-python/kinterbasdb/Manifest
+++ b/dev-python/kinterbasdb/Manifest
@@ -1,17 +1,21 @@
+AUX kinterbasdb-3.2-no_doc.patch 1024 RMD160 f85237c71fd570952893cf4b86343acd1f0fb1d6 SHA1 88efc3b0db1f42117b62175ad73ca9ae96602a26 SHA256 66e50dbb077b61e9defc9b58c5b84f61db82c40a5d06cb57b87c044dead26855
+MD5 cbe322e7350b2ce820b0528532df1851 files/kinterbasdb-3.2-no_doc.patch 1024
+RMD160 f85237c71fd570952893cf4b86343acd1f0fb1d6 files/kinterbasdb-3.2-no_doc.patch 1024
+SHA256 66e50dbb077b61e9defc9b58c5b84f61db82c40a5d06cb57b87c044dead26855 files/kinterbasdb-3.2-no_doc.patch 1024
 DIST kinterbasdb-3.1.3.src.tar.gz 220347 RMD160 a2b92c9a7f0b126eddf9a1b49cdd7c00c5e1e07d SHA1 d1a009a9cbd9442d132c3996ad74abab680073c9 SHA256 097b1843895842aededa45758307a2db110c282975e1ab3857f7a7a8c66d8e5d
 DIST kinterbasdb-3.2.src.tar.gz 326284 RMD160 9865d8c64da4f6aa07d8e180bd5e2ae3a030daf0 SHA1 d82c89478737eb324bf899afefdb91b3557f568f SHA256 d1b86b79450fa0dd69311255e0907cd1fe497dcd48692ccf6cb4397a998219ee
 EBUILD kinterbasdb-3.1.3.ebuild 737 RMD160 82ea45e1e7f308e26a6829fa5feaa3f2afc90ef2 SHA1 65f3a439f0af220e56a7cbc5920d65260fbb210a SHA256 042e7aa163029fbc949d4863ed3ece9cd4f2d477d7d8e63656764d036362822f
 MD5 f30f4411151fb8cd14e25b2f04d4da2e kinterbasdb-3.1.3.ebuild 737
 RMD160 82ea45e1e7f308e26a6829fa5feaa3f2afc90ef2 kinterbasdb-3.1.3.ebuild 737
 SHA256 042e7aa163029fbc949d4863ed3ece9cd4f2d477d7d8e63656764d036362822f kinterbasdb-3.1.3.ebuild 737
-EBUILD kinterbasdb-3.2.ebuild 749 RMD160 dfdd9976c9d48adf0421be658b566905c8e0810d SHA1 fe72de710513008726e4bd50bd51ea000dfe2df6 SHA256 d0cdeaa27a078522dfc494d5f8b36eafcd328afefa16d16e80dae1e1d4da553a
-MD5 6736a6e695e367f2d6ebb70db1555d69 kinterbasdb-3.2.ebuild 749
-RMD160 dfdd9976c9d48adf0421be658b566905c8e0810d kinterbasdb-3.2.ebuild 749
-SHA256 d0cdeaa27a078522dfc494d5f8b36eafcd328afefa16d16e80dae1e1d4da553a kinterbasdb-3.2.ebuild 749
-MISC ChangeLog 3496 RMD160 bc94b8286c34000bc02efa57b7aa97f5760467bb SHA1 157bf13a36071103643077ed50ce5f79c473e80f SHA256 f869b697ac4972fe7a7a64f54ab5bae2e7a0327f91c43b0cd30ba3669e7a0089
-MD5 65d05b277950a1b68c8a0feaf22cdfea ChangeLog 3496
-RMD160 bc94b8286c34000bc02efa57b7aa97f5760467bb ChangeLog 3496
-SHA256 f869b697ac4972fe7a7a64f54ab5bae2e7a0327f91c43b0cd30ba3669e7a0089 ChangeLog 3496
+EBUILD kinterbasdb-3.2.ebuild 1012 RMD160 e533761eeae0da5fe2c394e985f7f273a98dac0f SHA1 6dd8ab735bc9c3f233ef79d39631eb2741af5f58 SHA256 c645c2810948175ac79f1069f17dbc1eb445167c0d42fdce91f20c9fd2d3ec34
+MD5 d5b5247c877c57bc57a17b6723b6ef97 kinterbasdb-3.2.ebuild 1012
+RMD160 e533761eeae0da5fe2c394e985f7f273a98dac0f kinterbasdb-3.2.ebuild 1012
+SHA256 c645c2810948175ac79f1069f17dbc1eb445167c0d42fdce91f20c9fd2d3ec34 kinterbasdb-3.2.ebuild 1012
+MISC ChangeLog 3828 RMD160 1f67a75ba05455cff230f006834b2a0c76ace357 SHA1 f02c42f7c7171753561cc61ab7f086da87723f26 SHA256 931c890935a49f78141963d4b74f86d78339fa3bdb1422277e66d92842c13bae
+MD5 e29126db004b94299c6dd644517d113b ChangeLog 3828
+RMD160 1f67a75ba05455cff230f006834b2a0c76ace357 ChangeLog 3828
+SHA256 931c890935a49f78141963d4b74f86d78339fa3bdb1422277e66d92842c13bae ChangeLog 3828
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
 MD5 71c4638c9c88af75b58e5f5cb54fe008 metadata.xml 159
 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f metadata.xml 159
diff --git a/dev-python/kinterbasdb/files/kinterbasdb-3.2-no_doc.patch b/dev-python/kinterbasdb/files/kinterbasdb-3.2-no_doc.patch
new file mode 100644
index 000000000000..f4983d2cd374
--- /dev/null
+++ b/dev-python/kinterbasdb/files/kinterbasdb-3.2-no_doc.patch
@@ -0,0 +1,33 @@
+--- setup.py.orig	2006-08-11 06:24:49.000000000 +0300
++++ setup.py	2007-07-02 04:25:32.000000000 +0300
+@@ -1359,29 +1359,7 @@
+     # 2005.12.08:
+     cmdclass={'config': ConfigCommand, 'build_ext': BuildExtCommand,},
+ 
+-    ext_modules=extensionModules,
+-    data_files = [
+-      # documentation:
+-      (
+-        # This path will be interpreted by distutils as being relative to
+-        # sys.exec_prefix.
+-        ((platformIsWindows and 'Lib') or 'lib/python'+sys.version[:3])
+-          + '/site-packages/kinterbasdb/docs',
+-        [
+-          'docs/changelog.txt',
+-          'docs/firebird-client-library-thread-safety-overview.html',
+-          'docs/global.css',
+-          'docs/index.html',
+-          'docs/installation-binary.html',
+-          'docs/installation-source.html',
+-          'docs/license.txt',
+-          'docs/links.html',
+-          'docs/Python-DB-API-2.0.html',
+-          'docs/usage.html',
+-          'docs/w3c.png',
+-        ]
+-      )
+-    ]
++    ext_modules=extensionModules
+   )
+ 
+ 
diff --git a/dev-python/kinterbasdb/kinterbasdb-3.2.ebuild b/dev-python/kinterbasdb/kinterbasdb-3.2.ebuild
index 51690a06dbb6..66bf8deda13e 100644
--- a/dev-python/kinterbasdb/kinterbasdb-3.2.ebuild
+++ b/dev-python/kinterbasdb/kinterbasdb-3.2.ebuild
@@ -1,15 +1,14 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/kinterbasdb-3.2.ebuild,v 1.3 2007/06/24 17:24:05 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/kinterbasdb/kinterbasdb-3.2.ebuild,v 1.4 2007/07/02 02:15:43 hawking Exp $
 
-inherit distutils
+inherit distutils eutils
 
-DESCRIPTION="kinterbasdb - firebird/interbase interface for Python."
-HOMEPAGE="http://kinterbasdb.sourceforge.net"
-SRC_URI="mirror://sourceforge/kinterbasdb/${P}.src.tar.gz"
+DESCRIPTION="firebird/interbase interface for Python."
+HOMEPAGE="http://kinterbasdb.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
 
-
-IUSE=""
+IUSE="doc"
 KEYWORDS="~amd64 -sparc ~x86"
 LICENSE="kinterbasdb"
 SLOT="0"
@@ -18,12 +17,24 @@ DEPEND="virtual/python
 	>=dev-db/firebird-1.0_rc1
 	>=dev-python/egenix-mx-base-2.0.1"
 
-DOCS="docs/*.txt"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# firebird headers are in /opt/firebird/include
+	# don't byte-compile .py files
+	sed -i \
+		-e 's:^#\(database_include_dir=\).*:\1/opt/firebird/include:' \
+		-e 's:\(compile=\)1:\10:' \
+		-e 's:\(optimize=\)1:\10:' \
+		setup.cfg || die "sed in setup.cfg failed"
+
+	epatch "${FILESDIR}/${P}-no_doc.patch"
+}
 
 src_install() {
-	distutils_src_install --install-data=${D}/usr/share/doc/${PF}
+	DOCS="docs/changelog.txt"
+	distutils_src_install
 
-	# we put docs in properly ourselves
-	rm -rf ${D}/var
-	dohtml docs/*
+	use doc && dohtml docs/*
 }