Stop installing comicthumb for bug #471532. It's a leftover from comix and

has never actually worked properly here. Change imaging dep to virtual. If
you encounter blockers then try uninstalling dev-python/imaging first. Remove
old.

Signed-off-by: Ryan Hill <dirtyepic@gentoo.org>
Package-Manager: portage-2.2.0_alpha187/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

5 files changed, 67 insertions, 257 deletions

diff --git a/media-gfx/mcomix/ChangeLog b/media-gfx/mcomix/ChangeLog
index ac6527b47ddf..7a34a8b79ec2 100644
--- a/media-gfx/mcomix/ChangeLog
+++ b/media-gfx/mcomix/ChangeLog
@@ -1,6 +1,15 @@
 # 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.15 2013/05/26 07:19:54 dirtyepic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/mcomix/ChangeLog,v 1.16 2013/07/08 05:19:47 dirtyepic Exp $
+
+*mcomix-1.00-r1 (08 Jul 2013)
+
+  08 Jul 2013; Ryan Hill <dirtyepic@gentoo.org> -mcomix-0.99-r1.ebuild,
+  +mcomix-1.00-r1.ebuild, -files/mcomix-0.99-auto-rotate.patch:
+  Stop installing comicthumb for bug #471532. It's a leftover from comix and
+  has never actually worked properly here. Change imaging dep to virtual. If
+  you encounter blockers then try uninstalling dev-python/imaging first. Remove
+  old.
 
 *mcomix-1.00 (26 May 2013)
 
diff --git a/media-gfx/mcomix/Manifest b/media-gfx/mcomix/Manifest
index b3d094f03ffc..49a065cc04bb 100644
--- a/media-gfx/mcomix/Manifest
+++ b/media-gfx/mcomix/Manifest
@@ -1,21 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX mcomix-0.99-auto-rotate.patch 8118 SHA256 21095c4a3a4f284e2a81f5ce6354a966af433800ca13f5f7281a297d70068841 SHA512 b1b05417e1a8fc1eede39a916a21ca4086a92e58778a9f3068c8944ae054aea3d4ab611ac4346346ac233fa685f25bba3d7ffd2db6a7a026eb03bd3e902bbeed WHIRLPOOL 8b15073bdd498873fc1443bc24b44c0b1d0c3b54cb68a27274b31ed9c45f11948141d651f8559caee6b4b49f7fa860626ce27ae8660854550589335e2e85d3f2
-DIST mcomix-0.99.tar.bz2 476455 SHA256 67a64e4d8e38513cbd3ded4b7daa06215e10d95ff022e73a9614ceea2bea45eb SHA512 3db2ce2a22bb9b1379952fd1618ee409282ce458efe3297b5fd6eb855e1be1c28d3ee55e02b8f99599fe3ef552ab88cbf9fabd0f11fa04bf12a237ed964faa22 WHIRLPOOL 496e855e830b6066f6efeb9738ad68c54320afea1001f58e974649b22bb55231e46f3fb278982cf8798782d5bd8c66a25521d0c6a9777c6fb583ec5a0b48b9ca
 DIST mcomix-1.00.tar.bz2 527779 SHA256 d8453109a297153f67fdc898d822fa57057d575b71ed857e538da9a7426f0cde SHA512 9fc975afa92ad7130fe0d39058463cf26f8a9415257869e45e4cf83fae5e2bd8f4f264821046fcf425ee3729ec3dacfa59cd52342055a6246cf0b61b866f09b1 WHIRLPOOL 6aed2176904d5f12cd66e7f6f41fc23914d5a81cd514242a209994222b7ee1d18ceca4367e78f8a61bb6edbec559d0da94165f4db841c44840d6d768ba700f14
-EBUILD mcomix-0.99-r1.ebuild 1346 SHA256 ee88b104c36b7ffca058ed9c446a59fef3a38700060971eae6f612495b79d0e6 SHA512 9d2f5ba51bbdc404e61a402f995afa8f8835efced2c4a0e4ae780ce0fc8414a3ab98a79bb8c23e5e5c5f6ee52dd0fa2bf4338c5c27e0423fa7551c7fa12f97b5 WHIRLPOOL 131cccc7de3d9de3837e2004b0e7f12d0620910e69f3d79d0d2a6e0976425e7bf7c1ab8d82984c880ef9633fba3486c6ed45ce4c969574725489b3d2447605cd
+EBUILD mcomix-1.00-r1.ebuild 1229 SHA256 48adbb34e9446ac29b05f3f439b82b72d50cf95e2b5a1f755a27b55781995265 SHA512 2d1028ae1dce3acdf0bbe92f2f8e2ec71f39f0441f42e1b9b9e3b1a3d5122559bf3d41bfdbd49b2fbee14ba57df4e04eacbacd6cc25fb1c1a9ae6d1757a55f01 WHIRLPOOL 1de1a804c96ee9043f202d347de75ca537859db9ab2bd9a362956ba80299eb9c4e5cdf8c7100da2c44e4d6a71f23fa5f11299a6ed23d550d22e82c8a3a09e91e
 EBUILD mcomix-1.00.ebuild 1389 SHA256 173e3805c69653d4c4fbab196c6c1364d6e1624d085cba806f203e6921cac2ab SHA512 b477ffe02f2624c3b3f210b38f2245228c4c765fde1d2e01d27b10ef0c990ae934f2a8f0ee630690c75eacaa813c5634d5a6766080fb9c51af6ef8b79ae425fc WHIRLPOOL 9435c5e0cf0a733d63fde96e79d54eab34fc2ce6d36d511c1e3af68c990428a34f8eeb821e5cc2c6a8ce8623975f865a0b52df2d7cb379eda30b29e9f8543488
-MISC ChangeLog 3041 SHA256 efa0265b1692f1fd444b8fe272ada07df3905e5928e711d1d48fb51868f5409f SHA512 8dc9d9254d7f53d31e4095362e636c5aa60c73d8203bb25a8957e577ccd4043a758c3f3ec3f7cbe53267a01c1b02455a582fe4aa11ccf58b70e60c5618c73604 WHIRLPOOL 654be75cd02510154cc5c939a0104893daba768cd8f6386da88fd7f1c6201a654ec7c421348fb6ec2df804fe0715964d97402e2cd6e0a4838ad8ddee138d7b2e
+MISC ChangeLog 3450 SHA256 ff31e888c379613c808085d3416a109adb01eefeb7a53132896eb974f5068d09 SHA512 1261e0477de1b280625c3de8dcc4c23805a9c8c0f4089f0bf18dcae4851ff47be09bc8278229d68ee6cc9a8e57a328b3b6646a134e51214f0b0f94ef5b116afc WHIRLPOOL 5f33c6b1617935623be57b63ebaa1af7b93519f507805cd28e858b61e2e7c8e089247c2b333b94565aaeeb7eb0fe9bb18f32615a9ae33c8c38b55b7890dabe51
 MISC metadata.xml 255 SHA256 ef9b756a2f77927233532f8e206fb0481d2a18569ab26497a0dc5bdf95c8bb20 SHA512 a2893f38621a5b7c82b80bd14f87f2c4eb312fb0d66c33c616a8ee9e481842667b41f35e3a30ce9736f8b49a5719dbe880cb83a885b20aa9665b30ab2c215941 WHIRLPOOL 7c64f342dbcfd90ea3b4c1ca6310318112e4b54692f6bac24e8503e64c56c9b473436c89848c623924e03ad97de63d705449053c9cf5b59762f73ad750fd68e0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRoboRAAoJEO04vUmVeoRjUR4IAK5etGgj4zlpwrB/17sNMupJ
-KOPusokyztazxwdFUB5fUDHGH/m2eWBJGxrFRXgNbgjjxMwJ8c+LZFjUK6knajd2
-gu3q0sn6c0zf5H9vp4EVVY06HULbXMdDmh2t5ealBNkzs67ens439TbqIE243qn+
-U/TDv/GM1HbRUcZPp23ZwPrL//LAs61wJn01p7J+icOrgMjH7Kgh+CyOrnYdVr1H
-TQlTZyFr7tI+k/OCRGjE0QcwdH6r1RxZnXRsMSogo7swIhR2ZP1/m+keBG/gDMmF
-I3zHhguulHCWnRWhaXx1L5JFFzzRTAqyLby3jEV43v2965mRZGeXMcc8hSyn4Es=
-=0b8j
+iQEcBAEBCAAGBQJR2k56AAoJEO04vUmVeoRjVIAH/jugevWYDgeoBLDefrE1i3XY
+B3dgIqPysTkdmhZCIhjxOifLg6EkvEEr8RaDkCMXrNGklpZ1nAIBzUgThVU7B9K/
+N9ILTbbWyzu7uZsmsW1ZWLuRh//W05ctFIYDVBAzPg7zxdgjHGdJf28jsz66kKYL
+GyRXyBu3Ar/MzHBBD/sLUrEX4k5ZNn+QzGIZ1254XH6Yx6rywgoLhRXcHppwXLuR
+JeoG5NHOM4oRsb4yx7NeR2nV31ubp+SzDppmgxkQFBFvdZr416iEmIiKvn99EgWA
+4YfxkcsIfYyFDxg650HpEegUKsDU9nF9mbTFQ28N3O10ED8sc5cfx70/2dmQaS4=
+=GwsN
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/mcomix/files/mcomix-0.99-auto-rotate.patch b/media-gfx/mcomix/files/mcomix-0.99-auto-rotate.patch
deleted file mode 100644
index c1783f57dd99..000000000000
--- a/media-gfx/mcomix/files/mcomix-0.99-auto-rotate.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-http://sourceforge.net/tracker/?func=detail&aid=3548642&group_id=341051&atid=1427791
-http://mcomix.svn.sourceforge.net/viewvc/mcomix?view=revision&revision=781	
-
-  Add option for auto-rotating images based on size.
-
-  This doesn't work for double-page mode, as it would kind of defeat
-  the purpose of placing two images next to each other.
-
-
---- mcomix/preferences.py
-+++ mcomix/preferences.py
-@@ -63,6 +63,7 @@
-     'show thumbnails': True,
-     'rotation': 0,
-     'auto rotate from exif': True,
-+    'auto rotate depending on size': constants.AUTOROTATE_NEVER,
-     'vertical flip': False,
-     'horizontal flip': False,
-     'keep transformation': False,
---- mcomix/constants.py
-+++ mcomix/constants.py
-@@ -31,6 +31,8 @@
- ZIP, RAR, TAR, GZIP, BZIP2, PDF, SEVENZIP, LHA = range(8)
- NORMAL_CURSOR, GRAB_CURSOR, WAIT_CURSOR, NO_CURSOR = range(4)
- LIBRARY_DRAG_EXTERNAL_ID, LIBRARY_DRAG_BOOK_ID, LIBRARY_DRAG_COLLECTION_ID = range(3)
-+AUTOROTATE_NEVER, AUTOROTATE_WIDTH_90, AUTOROTATE_WIDTH_270, \
-+    AUTOROTATE_HEIGHT_90, AUTOROTATE_HEIGHT_270 = range(5)
- 
- RESPONSE_REVERT_TO_DEFAULT = 3
- RESPONSE_REMOVE = 4
---- mcomix/ui.py
-+++ mcomix/ui.py
-@@ -13,6 +13,7 @@
- from mcomix import constants
- from mcomix import status
- from mcomix import file_chooser_main_dialog
-+from mcomix.preferences import prefs
- from mcomix.library import main_dialog as library_main_dialog
- 
- class MainUI(gtk.UIManager):
-@@ -97,6 +98,9 @@
-             ('menu_tools', None, _('_Tools')),
-             ('menu_help', None, _('_Help')),
-             ('menu_transform', 'mcomix-transform', _('_Transform image')),
-+            ('menu_autorotate', None, _('_Auto-rotate image')),
-+            ('menu_autorotate_width', None, _('...when width exceeds height')),
-+            ('menu_autorotate_height', None, _('...when height exceeds width')),
-             ('expander', None, None, None, None, None)])
- 
-         self._actiongroup.add_toggle_actions([
-@@ -146,6 +150,20 @@
-                 'a', _('Manual zoom mode'), constants.ZOOM_MODE_MANUAL)],
-             3, window.change_zoom_mode)
- 
-+        # Automatically rotate image if width>height or height>width
-+        self._actiongroup.add_radio_actions([
-+            ('no_autorotation', None, _('Never'),
-+             None, None, constants.AUTOROTATE_NEVER),
-+            ('rotate_90_width', 'mcomix-rotate-90', _('_Rotate 90 degrees CW'),
-+             None, None, constants.AUTOROTATE_WIDTH_90),
-+            ('rotate_270_width', 'mcomix-rotate-270', _('Rotat_e 90 degrees CCW'),
-+             None, None, constants.AUTOROTATE_WIDTH_270),
-+            ('rotate_90_height', 'mcomix-rotate-90', _('_Rotate 90 degrees CW'),
-+             None, None, constants.AUTOROTATE_HEIGHT_90),
-+            ('rotate_270_height', 'mcomix-rotate-270', _('Rotat_e 90 degrees CCW'),
-+             None, None, constants.AUTOROTATE_HEIGHT_270)],
-+            prefs['auto rotate depending on size'], window.change_autorotation)
-+
-         self._actiongroup.add_actions([
-             ('about', gtk.STOCK_ABOUT, _('_About'),
-              None, None, dialog_handler.open_dialog)], (window, 'about-dialog'))
-@@ -280,6 +298,20 @@
-                         <menuitem action="rotate_270" />
-                         <menuitem action="rotate_180" />
-                         <separator />
-+                        <menu action="menu_autorotate">
-+                            <menuitem action="no_autorotation" />
-+                            <separator />
-+                            <menuitem action="menu_autorotate_height" />
-+                            <separator />
-+                            <menuitem action="rotate_90_height" />
-+                            <menuitem action="rotate_270_height" />
-+                            <separator />
-+                            <menuitem action="menu_autorotate_width" />
-+                            <separator />
-+                            <menuitem action="rotate_90_width" />
-+                            <menuitem action="rotate_270_width" />
-+                        </menu>
-+                        <separator />
-                         <menuitem action="flip_horiz" />
-                         <menuitem action="flip_vert" />
-                         <separator />
---- mcomix/main.py
-+++ mcomix/main.py
-@@ -203,6 +203,9 @@
-             prefs['vertical flip'] = False
-             prefs['horizontal flip'] = False
- 
-+        self.actiongroup.get_action('menu_autorotate_width').set_sensitive(False)
-+        self.actiongroup.get_action('menu_autorotate_height').set_sensitive(False)
-+
-         self.add(table)
-         table.show()
-         self._main_layout.show()
-@@ -305,15 +308,9 @@
-             right_unscaled_x = right_pixbuf.get_width()
-             right_unscaled_y = right_pixbuf.get_height()
- 
--            left_rotation = prefs['rotation']
--            right_rotation = prefs['rotation']
-+            left_rotation = self._get_pixbuf_rotation(left_pixbuf, True)
-+            right_rotation = self._get_pixbuf_rotation(right_pixbuf, True)
- 
--            if prefs['auto rotate from exif']:
--                left_rotation += image_tools.get_implied_rotation(left_pixbuf)
--                left_rotation = left_rotation % 360
--                right_rotation += image_tools.get_implied_rotation(right_pixbuf)
--                right_rotation = right_rotation % 360
--
-             if left_rotation in (90, 270):
-                 total_width = left_unscaled_y
-                 total_height = left_unscaled_x
-@@ -385,11 +382,7 @@
-             pixbuf = self.imagehandler.get_pixbufs(single=True)[ 0 ]
-             width, height = pixbuf.get_width(), pixbuf.get_height()
- 
--            rotation = prefs['rotation']
--            if prefs['auto rotate from exif']:
--                rotation += image_tools.get_implied_rotation(pixbuf)
--                rotation = rotation % 360
--
-+            rotation = self._get_pixbuf_rotation(pixbuf)
-             if rotation in (90, 270):
-                 width, height = height, width
- 
-@@ -502,6 +495,37 @@
-         self.statusbar.update()
-         self.update_title()
- 
-+    def _get_pixbuf_rotation(self, pixbuf, no_autorotation=False):
-+        """ Determines if a pixbuf must be rotated before being displayed.
-+        Returns the degree of rotation (0, 90, 180, 270). """
-+        
-+        width, height = pixbuf.get_width(), pixbuf.get_height()
-+        rotation = prefs['rotation']
-+        if prefs['auto rotate from exif']:
-+            rotation += image_tools.get_implied_rotation(pixbuf)
-+            rotation = rotation % 360
-+
-+        if (height > width and
-+            not no_autorotation and
-+            prefs['auto rotate depending on size'] in
-+                (constants.AUTOROTATE_HEIGHT_90, constants.AUTOROTATE_HEIGHT_270)):
-+
-+            if prefs['auto rotate depending on size'] == constants.AUTOROTATE_HEIGHT_90:
-+                rotation = 90
-+            else:
-+                rotation = 270
-+        elif (width > height and
-+              not no_autorotation and
-+              prefs['auto rotate depending on size'] in
-+                (constants.AUTOROTATE_WIDTH_90, constants.AUTOROTATE_WIDTH_270)):
-+
-+            if prefs['auto rotate depending on size'] == constants.AUTOROTATE_WIDTH_90:
-+                rotation = 90
-+            else:
-+                rotation = 270
-+
-+        return rotation
-+
-     def _page_available(self, page):
-         """ Called whenever a new page is ready for displaying. """
-         # Refresh display when currently opened page becomes available.
-@@ -623,6 +647,14 @@
-         fitmode.set_scale_up(prefs['stretch'])
-         self.zoom.set_fit_mode(fitmode)
- 
-+    def change_autorotation(self, radioaction=None, *args):
-+        """ Switches between automatic rotation modes, depending on which
-+        radiobutton is currently activated. """
-+        if radioaction:
-+            prefs['auto rotate depending on size'] = radioaction.get_current_value()
-+
-+        self.draw_image()
-+
-     def change_stretch(self, toggleaction, *args):
-         """ Toggles stretching small images. """
-         prefs['stretch'] = toggleaction.get_active()
diff --git a/media-gfx/mcomix/mcomix-0.99-r1.ebuild b/media-gfx/mcomix/mcomix-0.99-r1.ebuild
deleted file mode 100644
index 1897059fa936..000000000000
--- a/media-gfx/mcomix/mcomix-0.99-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# 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-0.99-r1.ebuild,v 1.1 2013/01/01 03:04:56 dirtyepic Exp $
-
-EAPI="3"
-
-SUPPORT_PYTHON_ABIS=1
-PYTHON_USE_WITH="sqlite"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils 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
-	x11-libs/gdk-pixbuf
-	!media-gfx/comix"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-auto-rotate.patch
-}
-
-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-r1.ebuild b/media-gfx/mcomix/mcomix-1.00-r1.ebuild
new file mode 100644
index 000000000000..d73cd3705b98
--- /dev/null
+++ b/media-gfx/mcomix/mcomix-1.00-r1.ebuild
@@ -0,0 +1,48 @@
+# 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-r1.ebuild,v 1.1 2013/07/08 05:19:47 dirtyepic Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_6,2_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/pygtk-2.14[${PYTHON_USEDEP}]
+	virtual/jpeg
+	virtual/python-imaging[${PYTHON_USEDEP}]
+	x11-libs/gdk-pixbuf
+	!media-gfx/comix"
+
+DOCS=( ChangeLog README )
+
+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
+}