[x11-misc/revelation] Rev bump to fix broken icons and deprecation warnings.

6 files changed, 254 insertions, 1 deletions

diff --git a/x11-misc/revelation/ChangeLog b/x11-misc/revelation/ChangeLog
index d1bb6cb..b6b7096 100644
--- a/x11-misc/revelation/ChangeLog
+++ b/x11-misc/revelation/ChangeLog
@@ -2,6 +2,16 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*revelation-0.4.12_rc20100629-r1 (11 Jan 2011)
+
+  11 Jan 2011; Dustin Polke <dustin.polke@uni-siegen.de>
+  +revelation-0.4.12_rc20100629-r1.ebuild,
+  +files/revelation-0.4.12_rc20100629-fix-icons.patch,
+  +files/revelation-0.4.12_rc20100629-gtktooltip.patch,
+  +files/revelation-0.4.12_rc20100629-hashlib.patch:
+  Fix broken icons with newer gnome-icon-theme; port to new functions of
+  deprecated functions.
+
 *revelation-0.4.12_rc20100629 (10 Jan 2011)
 
   10 Jan 2011; Dustin Polke <dustin.polke@uni-siegen.de>
diff --git a/x11-misc/revelation/Manifest b/x11-misc/revelation/Manifest
index ee7a348..e1bfb33 100644
--- a/x11-misc/revelation/Manifest
+++ b/x11-misc/revelation/Manifest
@@ -1,7 +1,12 @@
 AUX revelation-0.4.12_rc20100629-build.patch 1525 RMD160 54c9d345b0994bf2c95960a62131ebd6d03d2fb4 SHA1 f99eab65aa4092ae428d1e20a0bd92e43bc0a20e SHA256 750cd2ede1f57ce5d9bfa363da53d0982b7805045bfc6405d067f8152721ffb1
 AUX revelation-0.4.12_rc20100629-fix-gettext.patch 372 RMD160 412d2bcd4d3aafc8123e794a6f2bbd0a956f2056 SHA1 0703d1580ea4bf92d39cbe5092f7bc66d3f639cd SHA256 d6be9e52493daeba51bcde5bd35fb82c2d5db1393b054e88ca5e9701d30a9fa6
+AUX revelation-0.4.12_rc20100629-fix-icons.patch 3986 RMD160 6f299ead088a29b359572e94982225ce294c9184 SHA1 ed6ef17cee956095fbca4e5c70919204e0156805 SHA256 0f81c46c96757e2fe6fdaebf5d4dcfc3c2633d41fb2ee9f4dd344e960dfde819
+AUX revelation-0.4.12_rc20100629-gtktooltip.patch 972 RMD160 45995904bcbdf14b2e1cf9cf2b6696c573569b34 SHA1 a4add6ef9c521dbbea01371d6e076f787d893b1e SHA256 f18d70f3b59876e752c9a2cfc38cccbdb1029a9004cb71b2dccfcffdea389b73
+AUX revelation-0.4.12_rc20100629-hashlib.patch 2137 RMD160 fc8ac560514b3f1c0cb9b4f26c499bc9455fe632 SHA1 783bd2bf56f4ce1122265aec3a8adee142ce5ae6 SHA256 a155bbfa4e4c5206581d84012ffec1b1921caf9efaea3c4654334c47a9872e2e
 AUX revelation-0.4.12_rc20100629-list-index.patch 448 RMD160 588992a9529f526599baf631197fce7bb2ab53bf SHA1 5e13f8684a494f96ebddbf9bdc0e84c8b34ad808 SHA256 5c9cfd02d056eca99ac99aecc3040da02de99a9bb4194aecf58f900ecd582817
+DIST revelation-0.4.12_rc20100629-icons.tar.bz2 8164 RMD160 737719c188dc2d6f338b53a3414fa2fcd156a7b3 SHA1 62ce83966bc799c7453eb0adccc8b9a14f258b22 SHA256 25769f46212f76c2853a9c547123ac73f3adee8c4d3efca28d7deaccd4d4ed5a
 DIST revelation-0.4.12_rc20100629.tar.bz2 2339018 RMD160 ed05827e5abe06179a57492df2a6cf79c21b9a7e SHA1 20af126d72fdae56d5656a7cdb3ab73b433f59bb SHA256 6da0e2238782c1a8f6c9ba1230d043d18384d2018f4c433547851c6dc87e4e0a
+EBUILD revelation-0.4.12_rc20100629-r1.ebuild 2009 RMD160 c0e1179d4aee3d4ca274ef17051d8e6af7b90f6d SHA1 389ecb91dc72f43db2dd51991c7b167a0641fc60 SHA256 6b78d4081de58659136a43d22de905bd780282d24e62f73db1a3f307cbc8ba15
 EBUILD revelation-0.4.12_rc20100629.ebuild 1399 RMD160 56980fc61feb00b138c7c4c700a5c46c73b6c66d SHA1 66af0a8dbbcc0398414c1fafa072cc9caa56a82b SHA256 f7d0c6711d65a0be98755c81c0463c1ab23ef6482e2835033f2cf3c32435737c
-MISC ChangeLog 496 RMD160 2a944aca6de7b15e12eb07756bce7501e5aabca7 SHA1 c0f007181460bee314f085fdf24c7ce700bb6db3 SHA256 ce2c2b1bec3c47f92480351447db30dd13a41dd72c50c3db8ebebaf5215120f5
+MISC ChangeLog 906 RMD160 b782b777a80489a674892fb85e77eb4d145a0970 SHA1 669eb70721bcb251823f2c626ee01b0170a85e85 SHA256 00e16097bdc8e036d91be2fc034b53e69f3a76a1f86a938c94bc6bfeb2c00301
 MISC metadata.xml 262 RMD160 19c2cf23c68a7bbdc992167f93ee7903424207b5 SHA1 97d9cec673c3c3f712ad2818cc2170ef125d2a1f SHA256 0e2ccb0c1fa932b0a99b1569ab320b92bc8967c73ca655c7887e7cf5a375d3bd
diff --git a/x11-misc/revelation/files/revelation-0.4.12_rc20100629-fix-icons.patch b/x11-misc/revelation/files/revelation-0.4.12_rc20100629-fix-icons.patch
new file mode 100644
index 0000000..d48b565
--- /dev/null
+++ b/x11-misc/revelation/files/revelation-0.4.12_rc20100629-fix-icons.patch
@@ -0,0 +1,51 @@
+--- a/src/lib/ui.py
++++ b/src/lib/ui.py
+@@ -86,16 +86,16 @@ ICON_SIZE_TREEVIEW		= gtk.ICON_SIZE_MENU
+ STOCK_ICONS			= (
+ 	( STOCK_REVELATION,		"revelation",			( ICON_SIZE_APPLET, ICON_SIZE_LOGO, gtk.ICON_SIZE_DIALOG, gtk.ICON_SIZE_MENU )),
+ 	( STOCK_REVELATION_LOCKED,	"revelation-locked",		( ICON_SIZE_APPLET, ICON_SIZE_LOGO, gtk.ICON_SIZE_DIALOG, gtk.ICON_SIZE_MENU )),
+-	( STOCK_ENTRY_CREDITCARD,	"stock_creditcard",		( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
+-	( STOCK_ENTRY_CRYPTOKEY,	"stock_keyring",		( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
+-	( STOCK_ENTRY_DATABASE,		"stock_data-sources",		( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
+-	( STOCK_ENTRY_DOOR,		"stock_exit",			( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
+-	( STOCK_ENTRY_EMAIL,		"stock_mail",			( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
++	( STOCK_ENTRY_CREDITCARD,	"revelation-creditcard",	( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
++	( STOCK_ENTRY_CRYPTOKEY,	"revelation-keyring",		( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
++	( STOCK_ENTRY_DATABASE,		"revelation-data-sources",	( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
++	( STOCK_ENTRY_DOOR,		"gtk-quit",			( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
++	( STOCK_ENTRY_EMAIL,		"emblem-mail",			( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
+ 	( STOCK_ENTRY_FTP,		"system-file-manager",		( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
+ 	( STOCK_ENTRY_GENERIC,		"stock_lock",			( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
+ 	( STOCK_ENTRY_PHONE,		"stock_cell-phone",		( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
+ 	( STOCK_ENTRY_SHELL,		"gnome-terminal",		( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
+-	( STOCK_ENTRY_WEBSITE,		"stock_hyperlink-toolbar",	( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
++	( STOCK_ENTRY_WEBSITE,		"revelation-hyperlink-toolbar",	( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
+ 	( STOCK_ENTRY_FOLDER,		"stock_folder",			( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
+ 	( STOCK_ENTRY_FOLDER_OPEN,	"stock_folder",			( ICON_SIZE_DATAVIEW, ICON_SIZE_DROPDOWN, ICON_SIZE_ENTRY, ICON_SIZE_TREEVIEW )),
+ )
+@@ -103,13 +103,13 @@ STOCK_ICONS			= (
+ STOCK_ITEMS = (
+ 	( STOCK_CONTINUE,		_('_Continue'),			"stock_test-mode" ),
+ 	( STOCK_DISCARD,		_('_Discard'),			gtk.STOCK_DELETE ),
+-	( STOCK_EDIT,			_('_Edit'),			"stock_edit" ),
++	( STOCK_EDIT,			_('_Edit'),			gtk.STOCK_EDIT ),
+ 	( STOCK_EXPORT,			_('_Export'),			gtk.STOCK_EXECUTE ),
+ 	( STOCK_FOLDER,			'',				"stock_folder" ),
+ 	( STOCK_GENERATE,		_('_Generate'),			gtk.STOCK_EXECUTE ),
+ 	( STOCK_GOTO,			_('_Go to'),			gtk.STOCK_JUMP_TO ),
+ 	( STOCK_IMPORT,			_('_Import'),			gtk.STOCK_CONVERT ),
+-	( STOCK_LOCK,			_('_Lock'),			"stock_lock" ),
++	( STOCK_LOCK,			_('_Lock'),			"changes-prevent" ),
+ 	( STOCK_NEW_ENTRY,		_('_Add Entry'),		gtk.STOCK_ADD ),
+ 	( STOCK_NEW_FOLDER,		_('_Add Folder'),		"stock_folder" ),
+ 	( STOCK_NEXT,			_('Next'),			gtk.STOCK_GO_DOWN ),
+@@ -122,8 +122,8 @@ STOCK_ITEMS = (
+ 	( STOCK_REMOVE,			_('Re_move'),			gtk.STOCK_DELETE ),
+ 	( STOCK_REPLACE,		_('_Replace'),			gtk.STOCK_SAVE_AS ),
+ 	( STOCK_UNKNOWN,		_('Unknown'),			gtk.STOCK_DIALOG_QUESTION ),
+-	( STOCK_UNLOCK,			_('_Unlock'),			"stock_lock-open" ),
+-	( STOCK_UPDATE,			_('_Update'),			"stock_edit" ),
++	( STOCK_UNLOCK,			_('_Unlock'),			"changes-allow" ),
++	( STOCK_UPDATE,			_('_Update'),			"gtk-edit" ),
+ 	( STOCK_WARNING,		'',				"stock_dialog-warning" ),
+ )
diff --git a/x11-misc/revelation/files/revelation-0.4.12_rc20100629-gtktooltip.patch b/x11-misc/revelation/files/revelation-0.4.12_rc20100629-gtktooltip.patch
new file mode 100644
index 0000000..9651843
--- /dev/null
+++ b/x11-misc/revelation/files/revelation-0.4.12_rc20100629-gtktooltip.patch
@@ -0,0 +1,38 @@
+--- src/lib/ui.py.orig
++++ src/lib/ui.py
+@@ -371,7 +371,7 @@ class Toolbar(gtk.Toolbar):
+ 	def __init__(self):
+ 		gtk.Toolbar.__init__(self)
+ 
+-		self.tooltips	= gtk.Tooltips()
++		self.tooltips	= gtk.Tooltip()
+ 
+ 
+ 	def append_space(self):
+@@ -390,7 +390,7 @@ class Toolbar(gtk.Toolbar):
+ 		toolitem.add(widget)
+ 
+ 		if tooltip != None:
+-			toolitem.set_tooltip(self.tooltips, tooltip)
++			self.tooltips.set_text(tooltip)
+ 
+ 		self.insert(toolitem, -1)
+ 
+@@ -782,7 +782,7 @@ class IconEntry(Alignment):
+ 	def __init__(self, text = None):
+ 		Alignment.__init__(self)
+ 
+-		self.tooltips	= gtk.Tooltips()
++		self.tooltips	= gtk.Tooltip()
+ 		self.icon	= None
+ 		self.icontip	= None
+ 
+@@ -917,7 +917,7 @@ class IconEntry(Alignment):
+ 		"Sets the icon for the entry"
+ 
+ 		if tooltip != self.icontip:
+-			self.tooltips.set_tip(self.iconebox, tooltip)
++			self.tooltips.set_text(tooltip)
+ 			self.icontip = tooltip
+ 
+ 		if self.icon != None and self.icon.get_stock()[0] == stock:
diff --git a/x11-misc/revelation/files/revelation-0.4.12_rc20100629-hashlib.patch b/x11-misc/revelation/files/revelation-0.4.12_rc20100629-hashlib.patch
new file mode 100644
index 0000000..5710bc3
--- /dev/null
+++ b/x11-misc/revelation/files/revelation-0.4.12_rc20100629-hashlib.patch
@@ -0,0 +1,73 @@
+--- src/bundle/AfSplitter.py.orig
++++ src/bundle/AfSplitter.py
+@@ -38,7 +38,8 @@ http://www.gnu.org/copyleft/gpl.html
+ """
+ 
+ 
+-import sha, string, math, struct
++import string, math, struct
++from hashlib import sha1
+ from Crypto.Util.randpool import RandomPool
+ from Crypto.Cipher import XOR
+ 
+@@ -73,7 +74,7 @@ def _diffuse(block, size, digest):
+ 
+ 	return ret
+ 
+-def AFSplit(data, stripes, digestmod=sha):
++def AFSplit(data, stripes, digestmod=sha1):
+ 	"""AF-Split data using digestmod.  Returned data size will be len(data) * stripes"""
+ 
+ 	blockSize = len(data)
+@@ -100,7 +101,7 @@ def AFSplit(data, stripes, digestmod=sha
+ 	ret += _xor(bufblock, data)
+ 	return ret
+ 
+-def AFMerge(data, stripes, digestmod=sha):
++def AFMerge(data, stripes, digestmod=sha1):
+ 	"""AF-Merge data using digestmod.  len(data) must be a multiple of stripes"""
+ 
+ 	if len(data) % stripes != 0:
+--- src/bundle/PBKDFv2.py.orig
++++ src/bundle/PBKDFv2.py
+@@ -31,7 +31,8 @@ http://www.gnu.org/copyleft/gpl.html
+ 
+ """
+ 
+-import struct, string, math, sha, hmac # RFC2104
++import struct, string, math, hmac # RFC2104
++from hashlib import sha1
+ from Crypto.Cipher import XOR
+ 
+ ################ PBKDFv2
+@@ -49,7 +50,7 @@ class PBKDFv2:
+         self.hLen = 20
+         
+     ################ makeKey
+-    def makeKey(self, P, S, c, dkLen, digestmod=sha):
++    def makeKey(self, P, S, c, dkLen, digestmod=sha1):
+         """
+            Input:   P         password, an octet string
+                     S         salt, an octet string
+--- src/bundle/luks.py.orig
++++ src/bundle/luks.py
+@@ -61,8 +61,9 @@ Foundation, Inc., 59 Temple Place - Suit
+ http://www.gnu.org/copyleft/gpl.html
+ """
+ 
+-import os, math, struct, stat, sha, md5
++import os, math, struct, stat
+ 
++from hashlib import sha1, md5
+ from Crypto.Util.randpool import RandomPool
+ from Crypto.Cipher import *
+ from Crypto.Hash import *
+@@ -538,7 +539,7 @@ class LuksFile:
+ 	def _check_hash(self, hashSpec):
+ 		"""Internal function to check for a valid hash specification"""
+ 		if hashSpec == "sha1":
+-			hash = sha
++			hash = sha1
+ 		elif hashSpec == "sha256":
+ 			hash = SHA256
+ 		elif hashSpec == "md5":
diff --git a/x11-misc/revelation/revelation-0.4.12_rc20100629-r1.ebuild b/x11-misc/revelation/revelation-0.4.12_rc20100629-r1.ebuild
new file mode 100644
index 0000000..3279f92
--- /dev/null
+++ b/x11-misc/revelation/revelation-0.4.12_rc20100629-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/revelation/revelation-0.4.11-r2.ebuild,v 1.7 2010/05/28 18:00:57 arfrever Exp $
+
+EAPI="2"
+
+inherit autotools eutils multilib python gnome2
+
+DESCRIPTION="A password manager for GNOME"
+HOMEPAGE="http://oss.codepoet.no/revelation/"
+SRC_URI="http://home.arcor.de/dpolke/distfiles/${P}.tar.bz2
+	http://home.arcor.de/dpolke/distfiles/${P}-icons.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-python/pygtk
+	dev-python/pycrypto
+	dev-python/gnome-applets-python
+	dev-python/gconf-python
+	dev-python/gnome-vfs-python
+	dev-python/libbonobo-python
+	dev-python/libgnome-python
+	sys-libs/cracklib
+	x11-themes/gnome-icon-theme"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	gnome2_src_prepare
+	ln -sf $(type -P true) py-compile
+	mv src/wrap/crack/crack.c{.in,} || die
+	epatch \
+		"${FILESDIR}"/${P}-list-index.patch \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-fix-gettext.patch \
+		"${FILESDIR}"/${P}-fix-icons.patch \
+		"${FILESDIR}"/${P}-hashlib.patch \
+		"${FILESDIR}"/${P}-gtktooltip.patch
+	eautoreconf
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-dependency-tracking \
+		--disable-desktop-update \
+		--disable-mime-update
+}
+
+src_install() {
+	DOCS="AUTHORS NEWS README TODO" \
+	gnome2_src_install
+	python_clean_installation_image
+
+	# Install additional icons removed from stock
+	pushd "${WORKDIR}" > /dev/null
+	local iconsdir="/usr/share/icons/hicolor"
+	insinto ${iconsdir}/16x16/categories
+	doins ${PN}-data-sources.png ${PN}-hyperlink-toolbar.png || die
+	insinto ${iconsdir}/24x24/categories
+	doins ${PN}-test-mode.png || die
+	insinto ${iconsdir}/48x48/categories
+	doins ${PN}-creditcard.png ${PN}-keyring.png || die
+	popd > /dev/null
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	python_mod_optimize $(python_get_sitedir)/${PN}
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+	python_mod_cleanup $(python_get_sitedir)/${PN}
+}