Cleanup

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)

7 files changed, 7 insertions, 476 deletions

diff --git a/sys-process/incron/ChangeLog b/sys-process/incron/ChangeLog
index f2b4d9f41a29..4f261121b006 100644
--- a/sys-process/incron/ChangeLog
+++ b/sys-process/incron/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/incron
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/incron/ChangeLog,v 1.21 2012/04/17 16:08:03 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/incron/ChangeLog,v 1.22 2012/10/30 20:22:04 idl0r Exp $
+
+  30 Oct 2012; Christian Ruppert <idl0r@gentoo.org> -incron-0.5.8.ebuild,
+  -incron-0.5.9-r1.ebuild, -files/incron-0.5.8-gcc44.patch,
+  -files/incron-0.5.8-gentoo.patch, -files/incron-0.5.9-Makefile.patch,
+  -files/incron-0.5.9-gcc44.patch:
+  Cleanup
 
   17 Apr 2012; Brent Baude <ranger@gentoo.org> incron-0.5.10.ebuild:
   Marking incron-0.5.10 ppc for bug 412181
diff --git a/sys-process/incron/files/incron-0.5.8-gcc44.patch b/sys-process/incron/files/incron-0.5.8-gcc44.patch
deleted file mode 100644
index b46b54d391e4..000000000000
--- a/sys-process/incron/files/incron-0.5.8-gcc44.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ur incron-0.5.8.orig/appargs.cpp incron-0.5.8/appargs.cpp
---- incron-0.5.8.orig/appargs.cpp	2008-12-29 18:31:09.000000000 +0200
-+++ incron-0.5.8/appargs.cpp	2009-07-30 14:40:39.000000000 +0300
-@@ -19,6 +19,7 @@
-  * 
-  */
- 
-+#include <stdio.h>
- 
- #include <cstring>
- 
-diff -ur incron-0.5.8.orig/icd-main.cpp incron-0.5.8/icd-main.cpp
---- incron-0.5.8.orig/icd-main.cpp	2008-12-29 18:31:09.000000000 +0200
-+++ incron-0.5.8/icd-main.cpp	2009-07-30 14:38:36.000000000 +0300
-@@ -13,6 +13,7 @@
-  *  
-  */
- 
-+#include <stdio.h>
- #include <map>
- #include <signal.h>
- #include <wait.h>
-diff -ur incron-0.5.8.orig/incroncfg.cpp incron-0.5.8/incroncfg.cpp
---- incron-0.5.8.orig/incroncfg.cpp	2008-12-29 18:31:09.000000000 +0200
-+++ incron-0.5.8/incroncfg.cpp	2009-07-30 14:41:31.000000000 +0300
-@@ -181,7 +181,7 @@
- 
- bool IncronCfg::IsComment(const char* s)
- {
--  char* sx = strchr(s, '#');
-+  const char* sx = strchr(s, '#');
-   if (sx == NULL)
-     return false;
-     
-diff -ur incron-0.5.8.orig/inotify-cxx.cpp incron-0.5.8/inotify-cxx.cpp
---- incron-0.5.8.orig/inotify-cxx.cpp	2008-12-29 18:31:09.000000000 +0200
-+++ incron-0.5.8/inotify-cxx.cpp	2009-07-30 14:39:06.000000000 +0300
-@@ -19,7 +19,7 @@
-  * 
-  */
-  
--
-+#include <stdio.h>
- #include <errno.h>
- #include <unistd.h>
- #include <fcntl.h>
-diff -ur incron-0.5.8.orig/usertable.cpp incron-0.5.8/usertable.cpp
---- incron-0.5.8.orig/usertable.cpp	2008-12-29 18:31:09.000000000 +0200
-+++ incron-0.5.8/usertable.cpp	2009-07-30 14:38:50.000000000 +0300
-@@ -16,7 +16,7 @@
-  * 
-  */
- 
--
-+#include <stdio.h>
- #include <pwd.h>
- #include <syslog.h>
- #include <errno.h>
diff --git a/sys-process/incron/files/incron-0.5.8-gentoo.patch b/sys-process/incron/files/incron-0.5.8-gentoo.patch
deleted file mode 100644
index 70a9a9af3054..000000000000
--- a/sys-process/incron/files/incron-0.5.8-gentoo.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-Index: incron-0.5.7/Makefile
-===================================================================
---- incron-0.5.7.orig/Makefile
-+++ incron-0.5.7/Makefile
-@@ -1,15 +1,16 @@
- 
--PREFIX = /usr/local
--USERDATADIR = /var/spool/incron
--SYSDATADIR = /etc/incron.d
--CFGDIR = /etc
--MANPATH = /usr/share/man
-+PREFIX = $(DESTDIR)usr
-+USERDATADIR = $(DESTDIR)var/spool/incron
-+SYSDATADIR = $(DESTDIR)etc/incron.d
-+CFGDIR = $(DESTDIR)etc
-+MANPATH = $(DESTDIR)usr/share/man
-+INITDIR = $(DESTDIR)etc/init.d
- RELEASE = incron-`cat VERSION`
- RELEASEDIR = /tmp/$(RELEASE)
- 
- USER = root
- 
--CXX = g++
-+CXX := g++
- INSTALL = install
- 
- OPTIMIZE = -O2
-@@ -17,8 +18,8 @@ DEBUG = -g0
- WARNINGS = -Wall
- CXXAUX = -pipe
- 
--CXXFLAGS = $(OPTIMIZE) $(DEBUG) $(WARNINGS) $(CXXAUX)
--LDFLAGS = $(WARNINGS)
-+CXXFLAGS := $(OPTIMIZE) $(DEBUG) $(WARNINGS) $(CXXAUX)
-+LDFLAGS += $(WARNINGS)
- 
- PROGRAMS = incrond incrontab
- 
-@@ -45,11 +46,15 @@ distclean: clean
- 
- install:	all install-man
- 	[ -d $(PREFIX) ]
-+	$(INSTALL) -m 0755 -d $(PREFIX)/bin
-+	$(INSTALL) -m 0755 -d $(PREFIX)/sbin
-+	$(INSTALL) -m 0755 -d $(INITDIR)/
- 	$(INSTALL) -m 04755 -o $(USER) incrontab $(PREFIX)/bin/
- 	$(INSTALL) -m 0755 incrond $(PREFIX)/sbin/
- 	$(INSTALL) -m 0755 -o $(USER) -d $(USERDATADIR)
- 	$(INSTALL) -m 0755 -o $(USER) -d $(SYSDATADIR)
--	$(INSTALL) -m 0644 -o $(USER) incron.conf.example $(CFGDIR)
-+	$(INSTALL) -m 0644 -o $(USER) incron.conf $(CFGDIR)
-+	$(INSTALL) -m 0755 incrond-init.d $(INITDIR)/incrond
- 
- install-man:	incrontab.1 incrontab.5 incrond.8 incron.conf.5
- 	$(INSTALL) -m 0755 -d $(MANPATH)/man1
-Index: incron-0.5.7/incrond-init.d
-===================================================================
---- /dev/null
-+++ incron-0.5.7/incrond-init.d
-@@ -0,0 +1,21 @@
-+#!/sbin/runscript
-+# Copyright 1999-2007 Gentoo Foundation
-+# Distributed under the terms of the GNU General Public License v2
-+# $Header: /var/cvsroot/gentoo-x86/sys-process/incron/files/incron-0.5.8-gentoo.patch,v 1.1 2009/03/24 09:10:08 hollow Exp $
-+
-+depend() {
-+	use clock logger
-+	need localmount
-+}
-+
-+start() {
-+	ebegin "Starting incrond"
-+	start-stop-daemon --start --quiet --exec /usr/sbin/incrond -- -f /etc/incron.conf
-+	eend $?
-+}
-+
-+stop() {
-+	ebegin "Stopping incrond"
-+	start-stop-daemon --stop --quiet --pidfile /var/run/incrond.pid
-+	eend $?
-+}
-Index: incron-0.5.7/incron.conf
-===================================================================
---- /dev/null
-+++ incron-0.5.7/incron.conf
-@@ -0,0 +1,56 @@
-+#
-+# *** incron example configuration file ***
-+# 
-+# (c) Lukas Jelinek, 2007
-+# 
-+
-+# Parameter:   system_table_dir
-+# Meaning:     system table directory
-+# Description: This directory is examined by incrond for system table files.
-+# Default:     /etc/incron.d
-+system_table_dir = /etc/incron.d
-+
-+
-+# Parameter:   user_table_dir
-+# Meaning:     user table directory
-+# Description: This directory is examined by incrond for user table files.
-+# Default:     /var/spool/incron
-+user_table_dir = /var/spool/incron
-+
-+
-+# Parameter:   allowed_users
-+# Meaning:     allowed users list file
-+# Description: This file contains users allowed to use incron.
-+# Default:     /etc/incron.allow
-+allowed_users = /etc/incron.allow
-+
-+
-+# Parameter:   denied_users
-+# Meaning:     denied users list file
-+# Description: This file contains users denied to use incron.
-+# Default:     /etc/incron.deny
-+denied_users = /etc/incron.deny
-+
-+
-+# Parameter:   lockfile_dir
-+# Meaning:     application lock file directory
-+# Description: This directory is used for creating a lock avoiding to run
-+#              multiple instances of incrond.
-+# Default:     /var/run
-+lockfile_dir = /var/run
-+
-+
-+# Parameter:   lockfile_name
-+# Meaning:     application lock file name base
-+# Description: This name (appended by '.pid') is used for creating a lock
-+#              avoiding to run multiple instances of incrond.
-+# Default:     incrond
-+lockfile_name = incrond
-+
-+
-+# Parameter:   editor
-+# Meaning:     editor executable
-+# Description: This name or path is used to run as an editor for editting
-+#              user tables.
-+# Default:     vim
-+editor = nano
diff --git a/sys-process/incron/files/incron-0.5.9-Makefile.patch b/sys-process/incron/files/incron-0.5.9-Makefile.patch
deleted file mode 100644
index 0a040012ca78..000000000000
--- a/sys-process/incron/files/incron-0.5.9-Makefile.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-From 3f4e9ad5e9cf57fabdcaa3c1bc296b449c061a1b Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Mon, 31 Jan 2011 16:00:34 +0100
-Subject: [PATCH 2/2] Some improvements
-
-Respect DESTDIR.
-Don't override CXX/CXXFLAGS/LDFLAGS.
-Create all necessary directories during install.
-Install the example configuration into $(PREFIX)/share/doc/... instead of /etc.
----
- Makefile |   57 +++++++++++++++++++++++++++++----------------------------
- 1 files changed, 29 insertions(+), 28 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index ded8e68..3ffc854 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,15 +1,15 @@
--
- PREFIX = /usr/local
- USERDATADIR = /var/spool/incron
- SYSDATADIR = /etc/incron.d
- CFGDIR = /etc
--MANPATH = /usr/share/man
-+MANPATH = $(PREFIX)/share/man
- RELEASE = incron-`cat VERSION`
- RELEASEDIR = /tmp/$(RELEASE)
-+DOCDIR = $(PREFIX)/share/doc/$(RELEASE)/
- 
- USER = root
- 
--CXX = g++
-+CXX ?= g++
- INSTALL = install
- 
- OPTIMIZE = -O2
-@@ -17,8 +17,8 @@ DEBUG = -g0
- WARNINGS = -Wall
- CXXAUX = -pipe
- 
--CXXFLAGS = $(OPTIMIZE) $(DEBUG) $(WARNINGS) $(CXXAUX)
--LDFLAGS = $(WARNINGS)
-+CXXFLAGS ?= $(OPTIMIZE) $(DEBUG) $(CXXAUX)
-+CXXFLAGS += $(WARNINGS)
- 
- PROGRAMS = incrond incrontab
- 
-@@ -29,10 +29,10 @@ INCRONTAB_OBJ = ict-main.o incrontab.o inotify-cxx.o strtok.o incroncfg.o apparg
- all:	$(PROGRAMS)
- 
- incrond:	$(INCROND_OBJ)
--	$(CXX) $(LDFLAGS) -o $@ $(INCROND_OBJ)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(INCROND_OBJ)
- 
- incrontab:	$(INCRONTAB_OBJ)
--	$(CXX) $(LDFLAGS) -o $@ $(INCRONTAB_OBJ)
-+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $(INCRONTAB_OBJ)
- 
- .cpp.o:
- 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) -o $@ $<
-@@ -44,33 +44,34 @@ clean:
- distclean: clean
- 
- install:	all install-man
--	[ -d $(PREFIX) ]
--	$(INSTALL) -m 04755 -o $(USER) incrontab $(PREFIX)/bin/
--	$(INSTALL) -m 0755 incrond $(PREFIX)/sbin/
--	$(INSTALL) -m 0755 -o $(USER) -d $(USERDATADIR)
--	$(INSTALL) -m 0755 -o $(USER) -d $(SYSDATADIR)
--	$(INSTALL) -m 0644 -o $(USER) incron.conf.example $(CFGDIR)
-+	$(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/bin/
-+	$(INSTALL) -m 0755 -d $(DESTDIR)$(PREFIX)/sbin/
-+	$(INSTALL) -m 0755 -d $(DESTDIR)$(DOCDIR)/
-+	$(INSTALL) -m 04755 -o $(USER) incrontab $(DESTDIR)$(PREFIX)/bin/
-+	$(INSTALL) -m 0755 incrond $(DESTDIR)$(PREFIX)/sbin/
-+	$(INSTALL) -m 0755 -o $(USER) -d $(DESTDIR)$(USERDATADIR)
-+	$(INSTALL) -m 0755 -o $(USER) -d $(DESTDIR)$(SYSDATADIR)
-+	$(INSTALL) -m 0644 incron.conf.example $(DESTDIR)$(DOCDIR)/
- 
- install-man:	incrontab.1 incrontab.5 incrond.8 incron.conf.5
--	$(INSTALL) -m 0755 -d $(MANPATH)/man1
--	$(INSTALL) -m 0755 -d $(MANPATH)/man5
--	$(INSTALL) -m 0755 -d $(MANPATH)/man8
--	$(INSTALL) -m 0644 incrontab.1 $(MANPATH)/man1
--	$(INSTALL) -m 0644 incrontab.5 $(MANPATH)/man5
--	$(INSTALL) -m 0644 incrond.8 $(MANPATH)/man8
--	$(INSTALL) -m 0644 incron.conf.5 $(MANPATH)/man5
-+	$(INSTALL) -m 0755 -d $(DESTDIR)$(MANPATH)/man1
-+	$(INSTALL) -m 0755 -d $(DESTDIR)$(MANPATH)/man5
-+	$(INSTALL) -m 0755 -d $(DESTDIR)$(MANPATH)/man8
-+	$(INSTALL) -m 0644 incrontab.1 $(DESTDIR)$(MANPATH)/man1
-+	$(INSTALL) -m 0644 incrontab.5 $(DESTDIR)$(MANPATH)/man5
-+	$(INSTALL) -m 0644 incrond.8 $(DESTDIR)$(MANPATH)/man8
-+	$(INSTALL) -m 0644 incron.conf.5 $(DESTDIR)$(MANPATH)/man5
- 
- uninstall:	uninstall-man
--	[ -d $(PREFIX) ]
--	rm -f $(PREFIX)/bin/incrontab
--	rm -f $(PREFIX)/sbin/incrond
--	rm -f $(CFGDIR)/incron.conf.example
-+	rm -f $(DESTDIR)$(PREFIX)/bin/incrontab
-+	rm -f $(DESTDIR)$(PREFIX)/sbin/incrond
-+	rm -rf $(DESTDIR)$(DOCDIR)/
- 
- uninstall-man:
--	rm -f $(MANPATH)/man1/incrontab.1
--	rm -f $(MANPATH)/man5/incrontab.5
--	rm -f $(MANPATH)/man8/incrond.8
--	rm -f $(MANPATH)/man5/incron.conf.5
-+	rm -f $(DESTDIR)$(MANPATH)/man1/incrontab.1
-+	rm -f $(DESTDIR)$(MANPATH)/man5/incrontab.5
-+	rm -f $(DESTDIR)$(MANPATH)/man8/incrond.8
-+	rm -f $(DESTDIR)$(MANPATH)/man5/incron.conf.5
- 
- update:		uninstall install
- 
--- 
-1.7.3.4
-
diff --git a/sys-process/incron/files/incron-0.5.9-gcc44.patch b/sys-process/incron/files/incron-0.5.9-gcc44.patch
deleted file mode 100644
index 3492edaea936..000000000000
--- a/sys-process/incron/files/incron-0.5.9-gcc44.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 09eee740a4b962b4d8140b3256bddc62b6cd8cb5 Mon Sep 17 00:00:00 2001
-From: Christian Ruppert <idl0r@gentoo.org>
-Date: Mon, 31 Jan 2011 15:04:10 +0100
-Subject: [PATCH 1/2] GCC 4.4 fixes
-
-http://bts.aiken.cz/view.php?id=385
-http://bts.aiken.cz/view.php?id=447
----
- appargs.cpp   |    1 +
- appinst.h     |    1 +
- incroncfg.cpp |    2 +-
- incroncfg.h   |    1 +
- inotify-cxx.h |    1 +
- 5 files changed, 5 insertions(+), 1 deletions(-)
-
-diff --git a/appargs.cpp b/appargs.cpp
-index 3bac9b7..ac238b2 100644
---- a/appargs.cpp
-+++ b/appargs.cpp
-@@ -21,6 +21,7 @@
- 
- 
- #include <cstring>
-+#include <cstdio>
- 
- #include "strtok.h"
- 
-diff --git a/appinst.h b/appinst.h
-index d5f2cbe..bdbc8e7 100644
---- a/appinst.h
-+++ b/appinst.h
-@@ -23,6 +23,7 @@
- 
- 
- #include <string>
-+#include <cstdio>
- 
- 
- #define APPLOCK_BASEDIR "/var/run"
-diff --git a/incroncfg.cpp b/incroncfg.cpp
-index 6ff4d76..54fcfc5 100644
---- a/incroncfg.cpp
-+++ b/incroncfg.cpp
-@@ -181,7 +181,7 @@ bool IncronCfg::ParseLine(const char* s, std::string& rKey, std::string& rVal)
- 
- bool IncronCfg::IsComment(const char* s)
- {
--  char* sx = strchr(s, '#');
-+  const char* sx = strchr(s, '#');
-   if (sx == NULL)
-     return false;
-     
-diff --git a/incroncfg.h b/incroncfg.h
-index 5d2c5b2..12aaf7d 100644
---- a/incroncfg.h
-+++ b/incroncfg.h
-@@ -19,6 +19,7 @@
- 
- 
- #include <cstring>
-+#include <cstdio>
- #include <map>
- 
- /// Configuration class.
-diff --git a/inotify-cxx.h b/inotify-cxx.h
-index bb3a0e6..1d98bd7 100644
---- a/inotify-cxx.h
-+++ b/inotify-cxx.h
-@@ -30,6 +30,7 @@
- #include <string>
- #include <deque>
- #include <map>
-+#include <cstdio>
- 
- // Please ensure that the following headers take the right place
- #include <sys/syscall.h>
--- 
-1.7.3.4
-
diff --git a/sys-process/incron/incron-0.5.8.ebuild b/sys-process/incron/incron-0.5.8.ebuild
deleted file mode 100644
index ef4686f0a725..000000000000
--- a/sys-process/incron/incron-0.5.8.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/incron/incron-0.5.8.ebuild,v 1.6 2009/11/08 20:08:42 nixnut Exp $
-
-EAPI="2"
-
-inherit eutils linux-info toolchain-funcs
-
-DESCRIPTION="inotify based cron daemon"
-HOMEPAGE="http://incron.aiken.cz/"
-SRC_URI="http://inotify.aiken.cz/download/incron/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-CONFIG_CHECK="~INOTIFY"
-ERROR_INOTIFY="Recompile your kernel with inotify support - CONFIG_INOTIFY"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-gcc44.patch
-}
-
-src_compile() {
-	emake CXX=$(tc-getCXX) CXXFLAGS="${CXXFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc CHANGELOG README TODO
-}
diff --git a/sys-process/incron/incron-0.5.9-r1.ebuild b/sys-process/incron/incron-0.5.9-r1.ebuild
deleted file mode 100644
index feb5adc22f29..000000000000
--- a/sys-process/incron/incron-0.5.9-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/incron/incron-0.5.9-r1.ebuild,v 1.6 2012/01/09 19:05:54 ranger Exp $
-
-EAPI="3"
-
-inherit eutils linux-info toolchain-funcs
-
-DESCRIPTION="inotify based cron daemon"
-HOMEPAGE="http://incron.aiken.cz/"
-SRC_URI="http://inotify.aiken.cz/download/incron/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-# < 2.6.18 => INOTIFY, >= 2.6.18 => INOTIFY_USER
-# It should be ok to expect at least 2.6.18
-CONFIG_CHECK="~INOTIFY_USER"
-
-src_prepare() {
-	# http://bts.aiken.cz/view.php?id=385
-	# http://bts.aiken.cz/view.php?id=447
-	epatch "${FILESDIR}"/${P}-gcc44.patch
-
-	# http://bts.aiken.cz/view.php?id=512
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-}
-
-src_compile() {
-	emake CXX=$(tc-getCXX) || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX=/usr DOCDIR=/usr/share/doc/${PF} install || die "emake install failed"
-
-	newinitd "${FILESDIR}/incrond.init" incrond || die
-
-	dodoc CHANGELOG README TODO
-}