Fix some bad imports, HOMEPAGE, misc QA and remove old.

(Portage version: 2.1.3.19)

10 files changed, 68 insertions, 119 deletions

diff --git a/media-gfx/imgseek/ChangeLog b/media-gfx/imgseek/ChangeLog
index cdbdb9e121d5..bb3ea7d490f9 100644
--- a/media-gfx/imgseek/ChangeLog
+++ b/media-gfx/imgseek/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/imgseek
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/ChangeLog,v 1.13 2007/09/09 15:02:11 coldwind Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/ChangeLog,v 1.14 2008/01/18 02:26:18 coldwind Exp $
+
+*imgseek-0.8.6-r1 (18 Jan 2008)
+
+  18 Jan 2008; Santiago M. Mola <coldwind@gentoo.org>
+  +files/imgseek-0.8.6-ImageDB-name-change.patch, -imgseek-0.8.2.ebuild,
+  -imgseek-0.8.4.ebuild, -imgseek-0.8.5.ebuild, -imgseek-0.8.6.ebuild,
+  +imgseek-0.8.6-r1.ebuild:
+  Fix some bad imports, HOMEPAGE, misc QA and remove old.
 
 *imgseek-0.8.6 (09 Sep 2007)
 
diff --git a/media-gfx/imgseek/files/digest-imgseek-0.8.2 b/media-gfx/imgseek/files/digest-imgseek-0.8.2
deleted file mode 100644
index 3cec63935077..000000000000
--- a/media-gfx/imgseek/files/digest-imgseek-0.8.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c6defce999f2777869c4ad62231259d2 imgSeek-0.8.2.tar.bz2 367644
-RMD160 5348aedc720f9bd267d14d01f18de4e89653d231 imgSeek-0.8.2.tar.bz2 367644
-SHA256 8e001fab14e9269086dd6d88a1bfded0f3e5a0435967fc2654f473e4eb29b8b9 imgSeek-0.8.2.tar.bz2 367644
diff --git a/media-gfx/imgseek/files/digest-imgseek-0.8.4 b/media-gfx/imgseek/files/digest-imgseek-0.8.4
deleted file mode 100644
index bb13cfb96b7f..000000000000
--- a/media-gfx/imgseek/files/digest-imgseek-0.8.4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 294ff536569752c3578fac614eddc259 imgSeek-0.8.4-sizetype.patch.tar.gz 8168
-RMD160 2386a04f8b73bb51dbdcf7c2f31593e8c1f5600c imgSeek-0.8.4-sizetype.patch.tar.gz 8168
-SHA256 64fe6a3089084a1122f1394c162395162eb39907ec3a5f423ae1fa2622f1ce0b imgSeek-0.8.4-sizetype.patch.tar.gz 8168
-MD5 6b79e7e7e588fa9afa71240d5c2d0b52 imgSeek-0.8.4.tar.bz2 375144
-RMD160 f55e00dfaf5a2a7cb3cf4a2d3be56d3908233166 imgSeek-0.8.4.tar.bz2 375144
-SHA256 057d5817fb2aa43eaad2bcf89c5e24e6e3fb0685778d4066cc3109e6f555d35f imgSeek-0.8.4.tar.bz2 375144
diff --git a/media-gfx/imgseek/files/digest-imgseek-0.8.5 b/media-gfx/imgseek/files/digest-imgseek-0.8.5
deleted file mode 100644
index 25d1c3a638c8..000000000000
--- a/media-gfx/imgseek/files/digest-imgseek-0.8.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d4c3723ce6050636789336795afa353d imgSeek-0.8.5.tar.bz2 398828
-RMD160 ffa00f070d8cd15bfc014ab7416b4b71cf04065c imgSeek-0.8.5.tar.bz2 398828
-SHA256 a34ec7456987550fd8105f888fab4fe24439e0d14b24f0b28fe3c0470da5c1aa imgSeek-0.8.5.tar.bz2 398828
diff --git a/media-gfx/imgseek/files/digest-imgseek-0.8.6 b/media-gfx/imgseek/files/digest-imgseek-0.8.6-r1
index 60ceae7d35c5..60ceae7d35c5 100644
--- a/media-gfx/imgseek/files/digest-imgseek-0.8.6
+++ b/media-gfx/imgseek/files/digest-imgseek-0.8.6-r1
diff --git a/media-gfx/imgseek/files/imgseek-0.8.6-ImageDB-name-change.patch b/media-gfx/imgseek/files/imgseek-0.8.6-ImageDB-name-change.patch
new file mode 100644
index 000000000000..bdd0504ed502
--- /dev/null
+++ b/media-gfx/imgseek/files/imgseek-0.8.6-ImageDB-name-change.patch
@@ -0,0 +1,48 @@
+http://sourceforge.net/tracker/index.php?func=detail&aid=1612443&group_id=70373&atid=527567
+--- imgSeek-0.8.6/imgSeekLib/sqlitedb.py	2006-01-25 02:56:20.000000000 +0100
++++ imgSeek-0.8.6.new/imgSeekLib/sqlitedb.py	2008-01-18 03:16:07.000000000 +0100
+@@ -2019,12 +2019,12 @@
+     def testConvert():
+         print "#################################### Test importing an old db"
+ 
+-        import ImgDB
++        import ImageDB
+         from Settings import Env
+         myNewDB = SqlDB(Env(), 'mysql',dbArgs={'user': 'tuma', 'passwd':'mp2gra5', 'db':'imgseek'}, dbFile='/home/tuma/.imgseek/img-db.iqd.img')
+         #myNewDB = SqlDB(Env(), 'postgres',dbArgs={'user': 'tuma', 'database':'imgseek'}, dbFile='/home/tuma/.imgseek/img-db.iqd.img')
+         #'/home/tuma/.imgseek/img-db.iqd.newdb'}, dbFile='/home/tuma/.imgseek/img-db.iqd.img')       myOldDB = ImgDB.ImgDB(Env())
+-        myOldDB = ImgDB.ImgDB(Env())
++        myOldDB = ImageDB.ImgDB(Env())
+         myOldDB.opendb('/home/tuma/.imgseek/img-db.iqd.olddb')
+ 
+         myNewDB.convert_old(myOldDB)
+diff -ur imgSeek-0.8.6/Tools/imgSeekCmd imgSeek-0.8.6.new/Tools/imgSeekCmd
+--- imgSeek-0.8.6/Tools/imgSeekCmd	2006-01-25 02:57:55.000000000 +0100
++++ imgSeek-0.8.6.new/Tools/imgSeekCmd	2008-01-18 03:15:05.000000000 +0100
+@@ -29,7 +29,7 @@
+ from os.path import isfile
+ 
+ try:
+-    from imgSeekLib import ImgDB,__version__
++    from imgSeekLib import ImageDB,__version__
+     from imgSeekLib.Settings import Env
+ except:
+     traceback.print_exc()
+@@ -151,7 +151,7 @@
+ 
+     print "Using database file:%s"%db
+     env=Env()
+-    curdb=ImgDB.ImgDB(env)
++    curdb=ImageDB.ImgDB(env)
+     try:
+         curdb.opendb(db)
+     except:
+@@ -165,7 +165,7 @@
+         s=None
+         m=0
+         r=None
+-        restr=ImgDB.AddFilter(env)
++        restr=ImageDB.AddFilter(env)
+         for o, a in opts:
+             try:
+                 if o in ["-h","--help"]: usage("add")
diff --git a/media-gfx/imgseek/imgseek-0.8.2.ebuild b/media-gfx/imgseek/imgseek-0.8.2.ebuild
deleted file mode 100644
index 7bff6aa8ba0a..000000000000
--- a/media-gfx/imgseek/imgseek-0.8.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/imgseek-0.8.2.ebuild,v 1.6 2005/02/22 21:05:17 carlo Exp $
-
-S=${WORKDIR}/imgSeek-${PV}
-DESCRIPTION="Photo collection manager with content-based search."
-HOMEPAGE="http://imgseek.sourceforge.net/"
-SRC_URI="mirror://sourceforge/imgseek/imgSeek-${PV}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.2
-	>=dev-python/PyQt-3.5
-	dev-python/imaging"
-
-src_compile() {
-
-	python setup.py build || die "Python Build Failed"
-
-}
-
-src_install() {
-
-	python setup.py install --prefix=${D}/usr || die "Python Install Failed"
-
-	dodoc ChangeLog COPYING AUTHORS README THANKS
-}
diff --git a/media-gfx/imgseek/imgseek-0.8.4.ebuild b/media-gfx/imgseek/imgseek-0.8.4.ebuild
deleted file mode 100644
index 4d24762327d0..000000000000
--- a/media-gfx/imgseek/imgseek-0.8.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/imgseek-0.8.4.ebuild,v 1.2 2005/03/06 15:53:41 carlo Exp $
-
-inherit eutils
-
-MY_P="imgSeek-${PV}"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Photo collection manager with content-based search."
-HOMEPAGE="http://imgseek.sourceforge.net/"
-SRC_URI="mirror://sourceforge/imgseek/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~carlo/patches/${MY_P}-sizetype.patch.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.2
-	>=dev-python/PyQt-3.5
-	dev-python/imaging"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${WORKDIR}/${MY_P}-sizetype.patch
-}
-
-src_compile() {
-
-	python setup.py build || die "Python Build Failed"
-
-}
-
-src_install() {
-
-	python setup.py install --prefix=${D}/usr || die "Python Install Failed"
-
-	dodoc ChangeLog COPYING AUTHORS README THANKS
-}
diff --git a/media-gfx/imgseek/imgseek-0.8.5.ebuild b/media-gfx/imgseek/imgseek-0.8.5.ebuild
deleted file mode 100644
index a365bfb6f1e8..000000000000
--- a/media-gfx/imgseek/imgseek-0.8.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/imgseek-0.8.5.ebuild,v 1.2 2005/07/22 20:47:45 dholm Exp $
-
-inherit eutils
-
-MY_P="imgSeek-${PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Photo collection manager with content-based search."
-HOMEPAGE="http://imgseek.sourceforge.net/"
-SRC_URI="mirror://sourceforge/imgseek/${MY_P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.2
-	>=dev-python/PyQt-3.5
-	dev-python/imaging"
-
-src_compile() {
-	python setup.py build || die "Python Build Failed"
-}
-
-src_install() {
-	python setup.py install --prefix=${D}/usr || die "Python Install Failed"
-	dodoc ChangeLog COPYING AUTHORS README THANKS
-	insinto /usr/share/imgSeek
-	doins imgSeek.png
-	make_desktop_entry "imgSeek %F" imgSeek "/usr/share/imgSeek/imgSeek.png" "Graphics;Qt"
-}
diff --git a/media-gfx/imgseek/imgseek-0.8.6.ebuild b/media-gfx/imgseek/imgseek-0.8.6-r1.ebuild
index d7ae91693efc..289272aea1ac 100644
--- a/media-gfx/imgseek/imgseek-0.8.6.ebuild
+++ b/media-gfx/imgseek/imgseek-0.8.6-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/imgseek-0.8.6.ebuild,v 1.1 2007/09/09 15:02:11 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imgseek/imgseek-0.8.6-r1.ebuild,v 1.1 2008/01/18 02:26:18 coldwind Exp $
 
 NEED_PYTHON=2.2
 
@@ -11,7 +11,7 @@ MY_P="${MY_PN}-${PV}"
 S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Photo collection manager with content-based search."
-HOMEPAGE="http://imgseek.sourceforge.net/"
+HOMEPAGE="http://www.imgseek.net/"
 SRC_URI="mirror://sourceforge/imgseek/${MY_P}.tar.bz2"
 
 SLOT="0"
@@ -23,7 +23,13 @@ DEPEND=">=dev-python/PyQt-3.5
 	dev-python/imaging"
 RDEPEND="${DEPEND}"
 
-DOCS="ChangeLog COPYING AUTHORS README THANKS"
+DOCS="ChangeLog AUTHORS README THANKS TODO"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-ImageDB-name-change.patch
+}
 
 src_install() {
 	distutils_src_install