Depend on unrar-4.1.4-r1 to support encrypted archives and make it manditory.

Remove old version that could corrupt data.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 17 insertions, 76 deletions

diff --git a/media-gfx/mcomix/ChangeLog b/media-gfx/mcomix/ChangeLog
index b08e34c8e023..ff9e28caa445 100644
--- a/media-gfx/mcomix/ChangeLog
+++ b/media-gfx/mcomix/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/mcomix
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mcomix/ChangeLog,v 1.5 2011/12/30 07:44:04 dirtyepic Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mcomix/ChangeLog,v 1.6 2012/01/23 04:27:12 dirtyepic Exp $
+
+  23 Jan 2012; Ryan Hill <dirtyepic@gentoo.org> -mcomix-0.95.ebuild,
+  mcomix-0.96.ebuild, metadata.xml:
+  Depend on unrar-4.1.4-r1 to support encrypted archives and make it manditory.
+  Remove old version that could corrupt data.
 
 *mcomix-0.96 (30 Dec 2011)
 
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index e8307b50ebd3..623a7462ef23 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST mcomix-0.95.tar.bz2 426111 RMD160 3dd7969a7af6854bd056db2182e80ada7697e556 SHA1 627d91da0f56cda449792bd154fbf4eb3ebb689c SHA256 059c7a7a3fc8d969561c7b4490fa7d5ccccbef220afe3a442b3edaf4ae9dd857
 DIST mcomix-0.96.tar.bz2 444411 RMD160 b5001811c536afe2bb180dd2d434b747fd5f5582 SHA1 a856a0020b46f6e305b481a1d05493830872e84b SHA256 87d744016908d5e06b22a161fe96899c482ebed6cbd6dc0a409cd1858e541215
-EBUILD mcomix-0.95.ebuild 1409 RMD160 82511717e0e9ea85ec7255ccd4da1e098a8e74eb SHA1 b62a5c0ba6340066c125211643098d272d9b7574 SHA256 823ec4588e17051555dca389e21c96b498688843301db5328a87cab7202034ec
-EBUILD mcomix-0.96.ebuild 1409 RMD160 1beb1e92e918534c2d2a144ed914b085964fb086 SHA1 fcd8cc494402a72c195375403fe9130821a219fc SHA256 2c398edc5a608f17eba23a5394b6b6ea423c54468ebc8ac736418c4ea00e8118
-MISC ChangeLog 1143 RMD160 f288b7e0f0f85d31bdce9e326377ceee5ffbd698 SHA1 48054cff01fb5c6c1708940e639e340fc32a0e34 SHA256 233e2d0f018ab5e653337e0a7165df345fa9bd41b25ffd817c8e28e17f412703
-MISC metadata.xml 348 RMD160 d9333117c38bc7f847bc570cd1ddf8e43af86269 SHA1 42ceeb2bf580a9a6b7e2d380f3307ae092cb9c23 SHA256 c7d6bd3547fdb9da40b0e578322d4d85156114d7916ffc4430707af4e4573a21
+EBUILD mcomix-0.96.ebuild 1289 RMD160 37d780743836f07350ea47fff8f99146222a7579 SHA1 7e534dc6587127c4ac5556cfd582a59d3b1ced63 SHA256 590ec383f91b6cc3ab1c33762a2207b2c6daf6992e4eeb83a7d4dc69c3504b30
+MISC ChangeLog 1375 RMD160 292f3e8fa015b44e546d3a2200e3214d92f97286 SHA1 2bcb10c48379a4ee5c8f8f6a5a6122e0a481021e SHA256 30c8cacf7cb9a3ad83af570609422464cd621f509a44dd8038be42d93d6132c6
+MISC metadata.xml 255 RMD160 1a2c812136a060821f29d1732982e6ed1d004654 SHA1 cf584dcb2d79c5446eb2530fd478d5ae956bfdfb SHA256 ef9b756a2f77927233532f8e206fb0481d2a18569ab26497a0dc5bdf95c8bb20
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk79bf0ACgkQiqiDRvmkBmISsgCeL3DVsON/JhZ1gxzPZ60g5F02
-gFoAnjc3SXTv5ecmoZax72j+/290DO9Y
-=ZEYT
+iEYEARECAAYFAk8c46kACgkQiqiDRvmkBmJHhACg03utxunqFlvXP7+libQCM2ZJ
+Vb0An3ZQbVBT8UFOHxuoCZDLx3bCmfpL
+=yZIl
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/mcomix/mcomix-0.95.ebuild b/media-gfx/mcomix/mcomix-0.95.ebuild
deleted file mode 100644
index fdbefbc4fb5a..000000000000
--- a/media-gfx/mcomix/mcomix-0.95.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/mcomix/mcomix-0.95.ebuild,v 1.1 2011/11/15 03:27:30 dirtyepic Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2:2.6"
-SUPPORT_PYTHON_ABIS=1
-
-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="rar"
-
-DEPEND="dev-python/setuptools"
-RDEPEND="${DEPEND}
-	>=dev-python/imaging-1.1.5
-	>=dev-python/pygtk-2.14
-	|| ( dev-lang/python[sqlite] dev-python/pysqlite )
-	rar? ( || ( app-arch/unrar app-arch/rar ) )
-	!media-gfx/comix"
-# TODO - if libunrar ever becomes available (bug #177402)
-# we need it for passworded cbr archives
-
-RESTRICT_PYTHON_ABIS="3.*"
-
-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.96.ebuild b/media-gfx/mcomix/mcomix-0.96.ebuild
index 4f00f31a2f76..be74964f0394 100644
--- a/media-gfx/mcomix/mcomix-0.96.ebuild
+++ b/media-gfx/mcomix/mcomix-0.96.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.96.ebuild,v 1.1 2011/12/30 07:44:04 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mcomix/mcomix-0.96.ebuild,v 1.2 2012/01/23 04:27:12 dirtyepic Exp $
 
 EAPI="3"
 
@@ -16,17 +16,15 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="rar"
+IUSE=""
 
 DEPEND="dev-python/setuptools"
 RDEPEND="${DEPEND}
+	>=app-arch/unrar-4.1.4-r1
 	>=dev-python/imaging-1.1.5
 	>=dev-python/pygtk-2.14
 	|| ( dev-lang/python[sqlite] dev-python/pysqlite )
-	rar? ( || ( app-arch/unrar app-arch/rar ) )
 	!media-gfx/comix"
-# TODO - if libunrar ever becomes available (bug #177402)
-# we need it for passworded cbr archives
 
 RESTRICT_PYTHON_ABIS="3.*"
 
diff --git a/media-gfx/mcomix/metadata.xml b/media-gfx/mcomix/metadata.xml
index bf2814829223..0d5dcbd313a2 100644
--- a/media-gfx/mcomix/metadata.xml
+++ b/media-gfx/mcomix/metadata.xml
@@ -6,9 +6,4 @@
     <email>dirtyepic@gentoo.org</email>
     <name>Ryan Hill</name>
 </maintainer>
-<use>
-	<flag name='rar'>
-		Enable support for .cbr archives using rar/unrar.
-	</flag>
-</use>
 </pkgmetadata>