Misc fixes (bug 254360, bug 71033 and bug 272945), ebuild and patch from Naohiro Aota (naota@elisp.net)

(Portage version: 13596-svn/cvs/Linux x86_64)

4 files changed, 136 insertions, 61 deletions

diff --git a/x11-themes/fvwm-crystal/ChangeLog b/x11-themes/fvwm-crystal/ChangeLog
index c63a562a79d1..468519ab7a42 100644
--- a/x11-themes/fvwm-crystal/ChangeLog
+++ b/x11-themes/fvwm-crystal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/fvwm-crystal
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.58 2008/12/07 22:01:35 patrick Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.59 2009/06/26 20:04:35 tommy Exp $
+
+*fvwm-crystal-3.0.6-r1 (26 Jun 2009)
+
+  26 Jun 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -fvwm-crystal-3.0.6.ebuild, +fvwm-crystal-3.0.6-r1.ebuild,
+  +files/fvwm-crystal.apps.patch:
+  Misc fixes (bug 254360, bug 71033 and bug 272945), ebuild and patch from
+  Naohiro Aota (naota@elisp.net)
 
 *fvwm-crystal-3.0.6 (07 Dec 2008)
 
diff --git a/x11-themes/fvwm-crystal/files/fvwm-crystal.apps.patch b/x11-themes/fvwm-crystal/files/fvwm-crystal.apps.patch
new file mode 100644
index 000000000000..19f34237be9e
--- /dev/null
+++ b/x11-themes/fvwm-crystal/files/fvwm-crystal.apps.patch
@@ -0,0 +1,74 @@
+--- bin/fvwm-crystal.apps~	2009-05-24 17:38:56.000000000 +0900
++++ bin/fvwm-crystal.apps	2009-05-24 17:49:44.000000000 +0900
+@@ -102,7 +102,7 @@
+ 	group = OptionGroup(parser, "General creation options", "Options definig what should be generated")
+ #	group.add_option('-g', '--generate', action = 'store', choices=['all','menus','panel','topapps'], dest='generate', default='all', metavar='WHAT',
+ #		help = "what should be generated. aviable options are: all, menus, panel, topapps. default is all.")
+-	group.add_option('--with', action = 'append', type='string', dest='with', metavar='DIRECTORY',
++	group.add_option('--with', action = 'append', type='string', dest='with_only', metavar='DIRECTORY',
+ 		help = 'generate entries only for defined entries (directories or files)')
+ 	group.add_option('--without', action = 'append', type='string', dest='without', metavar='DIRECTORY',
+ 		help = 'do NOT use defined entries (directories or files) for generating output.')
+@@ -206,12 +206,12 @@
+ #end of parseArgv
+ 
+ 
+-def getAppsData(databases=[database],checkExecs=False,searchIconsIn='',sortOrder='prio',minLength=3,with=None,without=None,rootName='/Applications',topInSub=True,fileIcon='default.png',dirIcon='directory.png'):
++def getAppsData(databases=[database],checkExecs=False,searchIconsIn='',sortOrder='prio',minLength=3,with_only=None,without=None,rootName='/Applications',topInSub=True,fileIcon='default.png',dirIcon='directory.png'):
+ 	"""Read application databases from directories.
+ 	if checkExecs is True then use exec_field from file name to check access before adding it to database
+ 	if searchIconsIn is provided then use this path to check icons existence
+ 	sortOrder defines sorting order for entries
+-	with is a list of entries (relative to the database root) that should be read
++	with_only is a list of entries (relative to the database root) that should be read
+ 	without is a list of entries (relative to the database root or absolute targets for symlinks) that should be left out
+ 	"""
+ 
+@@ -235,7 +235,7 @@
+ 					return True
+ 		return False
+ 
+-	def get_entry(root,dir,cat,sort,check,with,without,realcat):
++	def get_entry(root,dir,cat,sort,check,with_only,without,realcat):
+ 		if not os.path.isdir(os.path.join(root,dir)) or not os.access(os.path.join(root,dir),os.R_OK):
+ 			yield None
+ 		for entry in os.listdir(os.path.join(root,dir)):
+@@ -268,9 +268,9 @@
+ 					if not checkFileAccess(test):
+ 						continue
+ 
+-				if with and len(with)>0:
++				if with_only and len(with_only)>0:
+ 					cont=False
+-					for i,v in enumerate(with):
++					for i,v in enumerate(with_only):
+ 						if not (os.path.join(cat,name).startswith(v) or os.path.join(cat,name.replace('_',' ')).startswith(v)):
+ 							cont=True
+ 							break
+@@ -305,7 +305,7 @@
+ 					x = realcat[:]
+ 					x.extend([prio,name])
+ 					if access:
+-						for sub in get_entry(root,os.path.join(dir,entry),os.path.join(cat,name).replace(' ','_'),sort,check,with,without,x):
++						for sub in get_entry(root,os.path.join(dir,entry),os.path.join(cat,name).replace(' ','_'),sort,check,with_only,without,x):
+ 							yield sub
+ 				elif os.path.isfile(file):
+ 					if sort=='name' or sort=='rname':
+@@ -327,7 +327,7 @@
+ 				db=os.path.abspath(os.path.expanduser(databases[i]))
+ 				if not os.path.isdir(db) or not os.access(db,os.R_OK):
+ 					continue
+-				for entry in get_entry(db,'',os.path.join('/',rootName),sortOrder,checkExecs,with,without,[0,rootName]):
++				for entry in get_entry(db,'',os.path.join('/',rootName),sortOrder,checkExecs,with_only,without,[0,rootName]):
+ 					if not entry:
+ 						continue
+ 					if not entry[5]:
+@@ -850,7 +850,7 @@
+ if params[0].database and len(params[0].database)>0:
+ 	database=params[0].database
+ 
+-apps=getAppsData(database,checkExecs=params[0].checkExecs,searchIconsIn=params[0].iconPath,sortOrder=params[0].sortOrder,minLength=params[0].subLength,with=params[0].with,without=params[0].without,rootName=params[0].rootCat,topInSub=params[0].topInSub,fileIcon=params[0].fileDefault,dirIcon=params[0].dirDefault)
++apps=getAppsData(database,checkExecs=params[0].checkExecs,searchIconsIn=params[0].iconPath,sortOrder=params[0].sortOrder,minLength=params[0].subLength,with_only=params[0].with_only,without=params[0].without,rootName=params[0].rootCat,topInSub=params[0].topInSub,fileIcon=params[0].fileDefault,dirIcon=params[0].dirDefault)
+ 
+ ########################## DEBUG ################################
+ if params[0].verbosity > 1:
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild
new file mode 100644
index 000000000000..481fe530204b
--- /dev/null
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r1.ebuild,v 1.1 2009/06/26 20:04:35 tommy Exp $
+
+inherit eutils
+
+DESCRIPTION="Configurable and full featured theme for FVWM, with lots of transparency"
+HOMEPAGE="http://fvwm-crystal.org/"
+SRC_URI="http://download.gna.org/${PN}/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+RDEPEND=">=x11-wm/fvwm-2.5.13
+	dev-lang/python
+	media-gfx/imagemagick
+	|| ( x11-misc/stalonetray x11-misc/trayer )
+	|| ( x11-misc/habak x11-misc/hsetroot )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	find . -type d -name '.svn' -prune -exec rm -rf {} ';' || die
+	epatch "${FILESDIR}/fvwm-crystal.apps.patch"
+}
+
+src_install() {
+	einstall || die "einstall failed"
+
+	dodoc AUTHORS README INSTALL NEWS ChangeLog doc/* || die
+
+	docinto examples
+	dodoc addons/* || die
+
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/fvwm-crystal || die
+
+	insinto /usr/share/xsessions
+	doins addons/fvwm-crystal.desktop || die
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Configuration examples can be found in ${ROOT}usr/share/doc/${PF}/examples/"
+	einfo
+	einfo "Many applications can extend functionality of fvwm-crystal."
+	einfo "They are listed in the INSTALL file in ${ROOT}usr/share/doc/${PF}."
+	einfo
+	ewarn "In this release, all hyphens (-) in names of env variables"
+	ewarn "used by FVWM-Crystal have been replaced by underscores (_)."
+	ewarn "You may need to update your configuration."
+}
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6.ebuild
deleted file mode 100644
index 4a92b9dc605c..000000000000
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6.ebuild,v 1.1 2008/12/07 22:01:35 patrick Exp $
-
-inherit eutils
-
-DESCRIPTION="Configurable and full featured theme for FVWM, with lots of transparency."
-HOMEPAGE="http://fvwm-crystal.org/"
-SRC_URI="http://download.gna.org/${PN}/${PV}/${P}.tar.gz
-	mirror://gentoo/${PN}-3.0.5-envfix.patch.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-RDEPEND=">=x11-wm/fvwm-2.5.13
-	media-gfx/imagemagick
-	|| ( x11-misc/stalonetray x11-misc/trayer )
-	|| ( x11-misc/habak x11-misc/hsetroot )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	#epatch "${WORKDIR}/${PN}-3.0.5-envfix.patch"
-	sed -e 's/MenuPosition-/MenuPosition_/g' \
-		-i bin/fvwm-crystal.apps
-}
-
-src_compile() {
-	einfo "There is nothing to compile."
-}
-
-src_install() {
-	einstall || die "einstall failed"
-
-	dodoc AUTHORS README INSTALL NEWS ChangeLog doc/*
-
-	insinto /usr/share/doc/${PF}
-	doins -r addons
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/fvwm-crystal
-
-	insinto /usr/share/xsessions
-	doins addons/fvwm-crystal.desktop
-}
-
-pkg_postinst() {
-	elog
-	elog "After installation, execute following commands:"
-	elog " $ cp -r /usr/share/doc/${PF}/addons/Xresources ~/.Xresources"
-	elog " $ cp -r /usr/share/doc/${PF}/addons/Xsession ~/.xinitrc"
-	elog
-	elog "Many applications can extend functionality of fvwm-crystal."
-	elog "They are listed in /usr/share/doc/${PF}/INSTALL.gz."
-	elog
-	ewarn "In this release, all hyphens (-) in names of env variables"
-	ewarn "used by FVWM-Crystal have been replaced by underscores (_)."
-	ewarn "You may need to update your configuration."
-}