Version bump. Thanks to Dror Levin for developing this ebuild in qting-edge overlay.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

7 files changed, 200 insertions, 2 deletions

diff --git a/app-arch/q7z/ChangeLog b/app-arch/q7z/ChangeLog
index add01fb919bd..87d9cfd3af28 100644
--- a/app-arch/q7z/ChangeLog
+++ b/app-arch/q7z/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-arch/q7z
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/q7z/ChangeLog,v 1.5 2009/06/01 22:41:17 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/q7z/ChangeLog,v 1.6 2009/06/06 23:28:35 yngwin Exp $
+
+*q7z-0.8.0 (06 Jun 2009)
+
+  06 Jun 2009; Ben de Groot <yngwin@gentoo.org>
+  +files/0.8.0-fix_7z_flags.patch, +q7z-0.8.0.ebuild,
+  +files/0.8.0-fix_imports.patch, +files/0.8.0-fix_paths.patch,
+  +files/0.8.0-init.py:
+  Version bump. Thanks to Dror Levin for developing this ebuild in
+  qting-edge overlay.
 
 *q7z-0.7.1-r1 (01 Jun 2009)
 
diff --git a/app-arch/q7z/Manifest b/app-arch/q7z/Manifest
index cebbae904149..31d9f1b72c0d 100644
--- a/app-arch/q7z/Manifest
+++ b/app-arch/q7z/Manifest
@@ -1,5 +1,11 @@
+AUX 0.8.0-fix_7z_flags.patch 635 RMD160 81b9e6272ebe127d2f7fd8a314584bb3799b8577 SHA1 32c3c2578ba084afc743f3906f160f8bb4956e27 SHA256 151efdfa15ea39ed95802f6ef734e33ce489f1ce0e1b19a0c63b9c4d808f8110
+AUX 0.8.0-fix_imports.patch 532 RMD160 f29f4e82d7a95670eb7acf98b2a6efe4f90ad7a4 SHA1 3afcb18366ecfc2ee6ecc154c8132ff22efae2ad SHA256 31fbe456fe79fdba7141ea4a5a11b22ef2e1196620c3bc1f1924a4552773a6c4
+AUX 0.8.0-fix_paths.patch 2283 RMD160 ea4e7a361298165decae8beb213f70c5770e1a49 SHA1 7404ad156993a5cec5d5cb2e5dff9813f423b984 SHA256 a6e04c18c57249367d5ea4fd7f1adcbb83c1f018fb250b3ab2c24a67165e5834
+AUX 0.8.0-init.py 1 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 SHA1 adc83b19e793491b1c6ea0fd8b46cd9f32e592fc SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b
 DIST Q7Z-0.7.1.tar.bz2 178867 RMD160 370b0a82a929d3efb46b80a1dc8a83d6fb387ed7 SHA1 b105e498f3799f3104e4c345051b7ec15b313258 SHA256 5e54c7d66f3d7a180d022c0b28d7dae5685500c4b2005fce748201719fecfde9
+DIST Q7Z-0.8.0.tar.bz2 177144 RMD160 63b4506a832e45cc98c2d041b5f9a26dce4aed18 SHA1 632a68d50b9ec9d1e1b2b796d0c812bd14dec609 SHA256 3dd799028b4eac2d6d2654d52824363b1c1e814c8cbf0a764d29b948cf8a6678
 EBUILD q7z-0.7.1-r1.ebuild 796 RMD160 9c44b21cf074803aa58588581d1eba882465d495 SHA1 01840f362590e5c445123d9cab3f07df4affbd20 SHA256 e7a80c43c62234ff31ea938e4de2fa64db059ab27a4fd41d8cb16acae674f958
 EBUILD q7z-0.7.1.ebuild 781 RMD160 96e79e22ea643d5c53ddf18effda3696e97f2878 SHA1 a21ea39ddaf97ce9aa8fb90d356706d59c1bddca SHA256 d50e04ea65a64989de669c579b3f529e8c90d13733720da952caaf714ca59fcb
-MISC ChangeLog 777 RMD160 69b292a8555d9db1838b1bd0a861044bfdc82d87 SHA1 17ba75ed88166cd41b53768c0565775c8908a9a9 SHA256 af728fe60c3cc7630f65b83b684650ebee2d6a080e53eebeda9f834954ed5e48
+EBUILD q7z-0.8.0.ebuild 1781 RMD160 23ebfcbe2e72af06e0d2add2dd51643f83257530 SHA1 756775c0b11397e3d2a6c5bd2c47b5a177855155 SHA256 b8571d7ac595d315362cd40e5d8e16514345bd97059d2b485a34985b71967493
+MISC ChangeLog 1081 RMD160 04ea3eabda7a69da0193480cdef738ec060fb53e SHA1 e6ab3bb1f14973a074c0ea24119363397004e37c SHA256 3d9b2a2b3b47855ce87157f2cd621ab28dd95ae0d24e0d73072c91b16c87470f
 MISC metadata.xml 157 RMD160 84dc01e4115bf31e84059fa795c95e94ad39df23 SHA1 fe6fa39ce2ba5cd6a8e7da28113fe05e22b5a39a SHA256 a2ffc792d4df94c3f8088e329c4bf74804540c2797f3e24ab0030acbdfd4b535
diff --git a/app-arch/q7z/files/0.8.0-fix_7z_flags.patch b/app-arch/q7z/files/0.8.0-fix_7z_flags.patch
new file mode 100644
index 000000000000..bc6f2140f825
--- /dev/null
+++ b/app-arch/q7z/files/0.8.0-fix_7z_flags.patch
@@ -0,0 +1,21 @@
+diff -ur Q7Z-orig/Source/Thread.py Q7Z/Source/Thread.py
+--- Q7Z-orig/Source/Thread.py	2009-04-23 10:12:24.000000000 +0300
++++ Q7Z/Source/Thread.py	2009-05-29 03:46:02.541667405 +0300
+@@ -220,7 +220,7 @@
+ 				sExt = ".exe"
+ 
+ 			# Recursive
+-			slCmdArgs.append( "-r" )
++			#slCmdArgs.append( "-r" )
+ 
+ 			# Exclusions
+ 			slWildcards = QtCore.QStringList( Settings.User.Syntax.sExclusions.split( ' ' ) )
+@@ -549,7 +549,7 @@
+ 			slCmdArgs.append( "-y" )
+ 
+ 			# Recursive
+-			slCmdArgs.append( "-r" )
++			#slCmdArgs.append( "-r" )
+ 
+ 			# Exclusions
+ 			slWildcards = QtCore.QStringList( Settings.User.Syntax.sExclusions.split( ' ' ) )
diff --git a/app-arch/q7z/files/0.8.0-fix_imports.patch b/app-arch/q7z/files/0.8.0-fix_imports.patch
new file mode 100644
index 000000000000..a7d06b53c9c4
--- /dev/null
+++ b/app-arch/q7z/files/0.8.0-fix_imports.patch
@@ -0,0 +1,24 @@
+diff -ur Q7Z-orig/Bin/Q7Z.pyw Q7Z/Bin/Q7Z.pyw
+--- Q7Z-orig/Bin/Q7Z.pyw	2008-06-29 03:11:21.000000000 +0300
++++ Q7Z/Bin/Q7Z.pyw	2009-05-30 00:29:09.712445008 +0300
+@@ -11,7 +11,7 @@
+ ### Imports
+ 
+ # Q7Z
+-import	Main
++import	q7z.Main as Main
+ 
+ 
+ ### Execution
+diff -ur Q7Z-orig/Source/Q7Z.pyw Q7Z/Source/Q7Z.pyw
+--- Q7Z-orig/Source/Q7Z.pyw	2008-06-29 03:11:21.000000000 +0300
++++ Q7Z/Source/Q7Z.pyw	2009-05-30 00:29:09.712445008 +0300
+@@ -11,7 +11,7 @@
+ ### Imports
+ 
+ # Q7Z
+-import	Main
++import	q7z.Main as Main
+ 
+ 
+ ### Execution
diff --git a/app-arch/q7z/files/0.8.0-fix_paths.patch b/app-arch/q7z/files/0.8.0-fix_paths.patch
new file mode 100644
index 000000000000..150a2184e17b
--- /dev/null
+++ b/app-arch/q7z/files/0.8.0-fix_paths.patch
@@ -0,0 +1,61 @@
+diff -ur Q7Z-orig/Source/Settings.py Q7Z/Source/Settings.py
+--- Q7Z-orig/Source/Settings.py	2009-04-23 01:38:10.000000000 +0300
++++ Q7Z/Source/Settings.py	2009-05-30 00:42:50.391474549 +0300
+@@ -39,7 +39,7 @@
+ 
+ # Application
+ Application				= QtCore.QObject()
+-Application.sName		= "Q7Z"
++Application.sName		= "q7z"
+ Application.sVersion	= QtCore.QString( "0.8.0" )
+ Application.sDomain		= "k7z.sourceforge.net"
+ Application.sCurrent	= "/7Z/" + Application.sName + "/Current.txt"
+@@ -98,10 +98,10 @@
+ Path				= QtCore.QObject()
+ Path.sSep			= QtCore.QString( QtCore.QDir.separator() )
+ Path.App				= QtCore.QObject()
+-Path.App.sPrefix	= ""
++Path.App.sPrefix	= "/usr/share/" + Application.sName
+ Path.App.sSBin		= ""
+-Path.App.sInstall		= "/share/" + Application.sName
+-Path.App.sConfig		= Env.sHome + '/.config/' + Author.sName + Path.sSep + Application.sName + Path.sSep
++Path.App.sInstall		= ""
++Path.App.sConfig		= Path.App.sPrefix
+ Path.KDE			= QtCore.QObject()
+ Path.KDE.sAutoStart	= ""
+ Path.KDE.sConfig	= ""
+@@ -270,20 +270,20 @@
+ 		# Misc
+ 		Path.KDE.sAutoStart = Path.KDE.sLocalPrefix + "/Autostart/"
+ 
+-		# Installation
+-		# KDE
+-		if QtCore.QFile.exists( Path.Sys.sPrefix + Path.App.sInstall + "/Source/" ) :
+-			Path.App.sPrefix	= Path.Sys.sPrefix
+-			Path.App.sSBin		= Path.App.sPrefix + "/sbin"
+-		# User
+-		elif QtCore.QFile.exists( Path.Local.sPrefix + Path.App.sInstall + "/Source/" ) :
+-			Path.App.sPrefix	= Path.Local.sPrefix
+-			Path.App.sSBin		= Path.App.sPrefix + "/sbin"
+-		# Local
+-		else :
+-			Path.App.sPrefix	= os.path.realpath( os.path.dirname( __file__ ) ) + "/../"
+-			Path.App.sSBin		= Path.App.sPrefix + "/Bin"
+-			Path.App.sInstall	= ""
++#		# Installation
++#		# KDE
++#		if QtCore.QFile.exists( Path.Sys.sPrefix + Path.App.sInstall + "/Source/" ) :
++#			Path.App.sPrefix	= Path.Sys.sPrefix
++#			Path.App.sSBin		= Path.App.sPrefix + "/sbin"
++#		# User
++#		elif QtCore.QFile.exists( Path.Local.sPrefix + Path.App.sInstall + "/Source/" ) :
++#			Path.App.sPrefix	= Path.Local.sPrefix
++#			Path.App.sSBin		= Path.App.sPrefix + "/sbin"
++#		# Local
++#		else :
++#			Path.App.sPrefix	= os.path.realpath( os.path.dirname( __file__ ) ) + "/../"
++#			Path.App.sSBin		= Path.App.sPrefix + "/Bin"
++#			Path.App.sInstall	= ""
+ 
+ 		# Proxy
+ 		if Env.sProxy != "" :
diff --git a/app-arch/q7z/files/0.8.0-init.py b/app-arch/q7z/files/0.8.0-init.py
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/app-arch/q7z/files/0.8.0-init.py
@@ -0,0 +1 @@
+
diff --git a/app-arch/q7z/q7z-0.8.0.ebuild b/app-arch/q7z/q7z-0.8.0.ebuild
new file mode 100644
index 000000000000..81a8fda10ab7
--- /dev/null
+++ b/app-arch/q7z/q7z-0.8.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/q7z/q7z-0.8.0.ebuild,v 1.1 2009/06/06 23:28:35 yngwin Exp $
+
+EAPI="2"
+NEED_PYTHON="2.5"
+inherit eutils python
+
+MY_PN="Q7Z"
+
+DESCRIPTION="A GUI frontend for p7zip"
+HOMEPAGE="http://code.google.com/p/k7z/"
+SRC_URI="http://k7z.googlecode.com/files/${MY_PN}-${PV}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="app-arch/p7zip
+	dev-python/PyQt4[X]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}/Build"
+
+src_prepare() {
+	cd ..
+
+	# fix paths used at runtime
+	epatch "${FILESDIR}/${PV}-fix_paths.patch"
+	# remove '-r' flag from 7z as it's not supposed to be used
+	epatch "${FILESDIR}/${PV}-fix_7z_flags.patch"
+	# fix imports to reference the q7z package
+	epatch "${FILESDIR}/${PV}-fix_imports.patch"
+
+	# patch menu entry to have correct name
+	mv "Desktop/Menu/${MY_PN}.desktop" "Desktop/Menu/${PN}.desktop"
+	sed -i "s/${MY_PN}/${PN}/" "Desktop/Menu/${PN}.desktop" \
+		|| die "sed failed"
+
+	cd Source
+	mv "${MY_PN}.pyw" "${PN}.pyw"
+}
+
+src_install() {
+	python_version
+
+	cd ..
+
+	insinto "$(python_get_sitedir)/${PN}"
+	doins Source/*.py || die
+	newins "${FILESDIR}/${PV}-init.py" __init__.py || die
+
+	insinto "/usr/share/${PN}/Options"
+	doins Options/* || die
+	insinto "/usr/share/${PN}/Profiles"
+	doins Desktop/Profiles/* || die
+
+	dobin "Source/${PN}.pyw" || die
+	dosym "/usr/bin/${PN}.pyw" "/usr/bin/${PN}" || die
+
+	# install menu entry
+	insinto /usr/share/icons/hicolor/32x32/apps
+	newins "Image/apps/${MY_PN}.png" "${PN}.png" || die
+	domenu "Desktop/Menu/${PN}.desktop" || die
+}
+
+pkg_postinst() {
+	python_mod_optimize "$(python_get_sitedir)/${PN}"
+}
+
+pkg_postrm() {
+	python_mod_cleanup
+}