Version bump. Port to distutils-r1 eclass. Drop unrar dependency and mention

it in postinst instead (bug #467138). Remove old.

Signed-off-by: Ryan Hill <dirtyepic@gentoo.org>
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key 957A8463)

4 files changed, 63 insertions, 105 deletions

diff --git a/media-gfx/mcomix/ChangeLog b/media-gfx/mcomix/ChangeLog
index f7bf02ba8a7d..ac6527b47ddf 100644
--- a/media-gfx/mcomix/ChangeLog
+++ b/media-gfx/mcomix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/mcomix
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mcomix/ChangeLog,v 1.14 2013/01/01 03:04:56 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mcomix/ChangeLog,v 1.15 2013/05/26 07:19:54 dirtyepic Exp $
+
+*mcomix-1.00 (26 May 2013)
+
+  26 May 2013; Ryan Hill <dirtyepic@gentoo.org> -mcomix-0.98.ebuild,
+  -mcomix-0.99.ebuild, +mcomix-1.00.ebuild:
+  Version bump. Port to distutils-r1 eclass. Drop unrar dependency and mention
+  it in postinst instead (bug #467138). Remove old.
 
 *mcomix-0.99-r1 (01 Jan 2013)
 
diff --git a/media-gfx/mcomix/mcomix-0.98.ebuild b/media-gfx/mcomix/mcomix-0.98.ebuild
deleted file mode 100644
index 9430127a0e98..000000000000
--- a/media-gfx/mcomix/mcomix-0.98.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mcomix/mcomix-0.98.ebuild,v 1.1 2012/04/26 04:11:41 dirtyepic Exp $
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_USE_WITH="sqlite"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils fdo-mime python
-
-DESCRIPTION="A fork of comix, a GTK image viewer for comic book archives."
-HOMEPAGE="http://mcomix.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}
-	app-arch/unrar
-	>=dev-python/imaging-1.1.5
-	>=dev-python/pygtk-2.14
-	virtual/jpeg
-	!media-gfx/comix"
-
-src_install() {
-	distutils_src_install
-	insinto /etc/gconf/schemas/
-	doins "${S}"/mime/comicbook.schemas || die
-	dobin "${S}"/mime/comicthumb || die
-	dodoc ChangeLog README || die
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-	echo
-	elog "You can optionally add support for 7z or LHA archives by installing"
-	elog "app-arch/p7zip or app-arch/lha."
-	echo
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/mcomix/mcomix-0.99.ebuild b/media-gfx/mcomix/mcomix-0.99.ebuild
deleted file mode 100644
index 2439f3ee688f..000000000000
--- a/media-gfx/mcomix/mcomix-0.99.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mcomix/mcomix-0.99.ebuild,v 1.1 2012/07/21 05:24:19 dirtyepic Exp $
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_USE_WITH="sqlite"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils fdo-mime python
-
-DESCRIPTION="A fork of comix, a GTK image viewer for comic book archives."
-HOMEPAGE="http://mcomix.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}
-	app-arch/unrar
-	>=dev-python/imaging-1.1.5
-	>=dev-python/pygtk-2.14
-	virtual/jpeg
-	!media-gfx/comix"
-
-src_install() {
-	distutils_src_install
-	insinto /etc/gconf/schemas/
-	doins "${S}"/mime/comicbook.schemas || die
-	dobin "${S}"/mime/comicthumb || die
-	dodoc ChangeLog README || die
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-	echo
-	elog "You can optionally add support for 7z or LHA archives by installing"
-	elog "app-arch/p7zip or app-arch/lha."
-	echo
-}
-
-pkg_postrm() {
-	distutils_pkg_postrm
-	fdo-mime_mime_database_update
-	fdo-mime_desktop_database_update
-}
diff --git a/media-gfx/mcomix/mcomix-1.00.ebuild b/media-gfx/mcomix/mcomix-1.00.ebuild
new file mode 100644
index 000000000000..dad2d6796be5
--- /dev/null
+++ b/media-gfx/mcomix/mcomix-1.00.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mcomix/mcomix-1.00.ebuild,v 1.1 2013/05/26 07:19:54 dirtyepic Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_6 python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1 eutils fdo-mime
+
+DESCRIPTION="A fork of comix, a GTK image viewer for comic book archives."
+HOMEPAGE="http://mcomix.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	>=dev-python/imaging-1.1.5[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.14[${PYTHON_USEDEP}]
+	virtual/jpeg
+	x11-libs/gdk-pixbuf
+	!media-gfx/comix"
+
+DOCS=( ChangeLog README )
+
+python_install_all() {
+	distutils-r1_python_install_all
+	insinto /etc/gconf/schemas/
+	doins "${S}"/mime/comicbook.schemas
+	dobin "${S}"/mime/comicthumb
+}
+
+pkg_postinst() {
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+	echo
+	elog "Additional packages are required to open most common comic files:"
+	elog
+	elog "    cbr: app-arch/unrar"
+	elog "    cbz: app-arch/unzip"
+	elog
+	elog "You can also add support for 7z or LHA archives by installing"
+	elog "app-arch/p7zip or app-arch/lha."
+	echo
+}
+
+pkg_postrm() {
+	fdo-mime_mime_database_update
+	fdo-mime_desktop_database_update
+}