Drop old

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

5 files changed, 6 insertions, 187 deletions

diff --git a/x11-themes/fvwm-crystal/ChangeLog b/x11-themes/fvwm-crystal/ChangeLog
index bc8288f81784..de93aeb5fa42 100644
--- a/x11-themes/fvwm-crystal/ChangeLog
+++ b/x11-themes/fvwm-crystal/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-themes/fvwm-crystal
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.76 2013/12/24 12:53:42 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.77 2013/12/27 14:00:55 pinkbyte Exp $
+
+  27 Dec 2013; Sergey Popov <pinkbyte@gentoo.org>
+  -fvwm-crystal-3.0.6-r2.ebuild, -files/fvwm-crystal,
+  -files/fvwm-crystal.apps.patch, -files/fvwm-crystal-build.patch:
+  Drop old
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> fvwm-crystal-3.2.3.ebuild:
   Stable for x86, wrt bug #474474
diff --git a/x11-themes/fvwm-crystal/files/fvwm-crystal b/x11-themes/fvwm-crystal/files/fvwm-crystal
deleted file mode 100644
index e6e8bb040f29..000000000000
--- a/x11-themes/fvwm-crystal/files/fvwm-crystal
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/usr/bin/fvwm2
diff --git a/x11-themes/fvwm-crystal/files/fvwm-crystal-build.patch b/x11-themes/fvwm-crystal/files/fvwm-crystal-build.patch
deleted file mode 100644
index 60a098afa833..000000000000
--- a/x11-themes/fvwm-crystal/files/fvwm-crystal-build.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- Makefile
-+++ Makefile
-@@ -10,15 +10,15 @@
- all:
- 	@echo "There is nothing to compile."
- 
--install: uninstall correctpath
-+install: install-doc
- 	@echo Installing fvwm-crystal $(RELEASE) to $(prefix)
--	mkdir -p $(prefix)/bin $(prefix)/share/fvwm-crystal/fvwm 
-+	mkdir -p $(DESTDIR)$(prefix)/bin $(DESTDIR)$(prefix)/share/fvwm-crystal/fvwm 
- 
--	install -m 755 bin/fvwm-crystal.apps bin/fvwm-crystal.wallpaper bin/fvwm-crystal bin/fvwm-crystal.generate-menu bin/fvwm-crystal.infoline bin/fvwm-crystal.mplayer-wrapper $(prefix)/bin
--	cp -d -r fvwm/* $(prefix)/share/fvwm-crystal/fvwm/
-+	install -m 755 bin/fvwm-crystal.apps bin/fvwm-crystal.wallpaper bin/fvwm-crystal bin/fvwm-crystal.generate-menu bin/fvwm-crystal.infoline bin/fvwm-crystal.mplayer-wrapper $(DESTDIR)$(prefix)/bin
-+	cp -d -r fvwm/* $(DESTDIR)$(prefix)/share/fvwm-crystal/fvwm/
- 
--	mkdir -p $(prefix)/share/man/man1
--	cp -d -r man/* $(prefix)/share/man/man1
-+	mkdir -p $(DESTDIR)$(prefix)/share/man/man1
-+	cp -d -r man/* $(DESTDIR)$(prefix)/share/man/man1
- 
- uninstall:
- 	@echo "Uninstalling previously installed fvwm-crystal"
-@@ -188,17 +188,12 @@
- 	tar czf "../fvwm-crystal-minimal-$(RELEASE).tar.gz" "fvwm-crystal-minimal-$(RELEASE)"
- 	rm -rf "fvwm-crystal-minimal-$(RELEASE)"
- 
--# It is needed to adjust some path inside fvwm-crystal.generate-menu since this file must know the install path
--correctpath:
--	sed -i 's:FC_MENUBASEROOT="/usr/share:FC_MENUBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu
--	sed -i 's:FC_ICONBASEROOT="/usr/share:FC_ICONBASEROOT="$(prefix)/share:' bin/fvwm-crystal.generate-menu
--
- uninstall-doc:
- 	-rm -rf $(docdir)
- 	-rm -rf $(addondir)
- 
- install-doc:
--	mkdir -p $(addondir) $(docdir)
--	install -m 644 addons/* $(addondir)
--	install -m 644 AUTHORS COPYING NEWS ChangeLog README INSTALL $(docdir)
--	install -m 644 doc/* $(docdir)
-+	mkdir -p $(DESTDIR)$(addondir) $(DESTDIR)$(docdir)
-+	install -m 644 addons/* $(DESTDIR)$(addondir)
-+	install -m 644 AUTHORS NEWS ChangeLog README $(DESTDIR)$(docdir)
-+	install -m 644 doc/* $(DESTDIR)$(docdir)
diff --git a/x11-themes/fvwm-crystal/files/fvwm-crystal.apps.patch b/x11-themes/fvwm-crystal/files/fvwm-crystal.apps.patch
deleted file mode 100644
index 19f34237be9e..000000000000
--- a/x11-themes/fvwm-crystal/files/fvwm-crystal.apps.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- 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-r2.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r2.ebuild
deleted file mode 100644
index 737cdfd5a7ca..000000000000
--- a/x11-themes/fvwm-crystal/fvwm-crystal-3.0.6-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 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-r2.ebuild,v 1.4 2012/07/29 17:48:29 armin76 Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.7"
-
-inherit eutils python
-
-DESCRIPTION="Configurable and full featured theme for FVWM, with lots of transparency"
-HOMEPAGE="http://gna.org/projects/fvwm-crystal/"
-SRC_URI="http://download.gna.org/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE=""
-
-RDEPEND="|| ( media-gfx/imagemagick[png] media-gfx/graphicsmagick[imagemagick,png] )
-	x11-apps/xwd
-	|| ( x11-misc/habak x11-misc/hsetroot )
-	|| ( x11-misc/stalonetray x11-misc/trayer )
-	>=x11-wm/fvwm-2.6.2[png]"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	find . -type d -name '.svn' -prune -exec rm -rf {} ';' || die
-	python_convert_shebangs -r 2 bin fvwm/scripts #317041
-	epatch \
-		"${FILESDIR}"/${PN}.apps.patch \
-		"${FILESDIR}"/${PN}-build.patch
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		addondir="/usr/share/doc/${PF}/addons" \
-		docdir="/usr/share/doc/${PF}" \
-		prefix="/usr" \
-		install
-
-	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/fvwm-crystal
-
-	insinto /usr/share/xsessions
-	doins addons/fvwm-crystal.desktop
-}
-
-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."
-}