Take maintainership. Revision bump. Reorder patches. Add separate init script. Fix INOTIFY check. Remove old ebuilds/patches.

(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

5 files changed, 219 insertions, 270 deletions

diff --git a/sys-process/incron/files/incron-0.5.7-gcc43.patch b/sys-process/incron/files/incron-0.5.7-gcc43.patch
deleted file mode 100644
index b6a813c9a925..000000000000
--- a/sys-process/incron/files/incron-0.5.7-gcc43.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/appargs.cpp
-+++ b/appargs.cpp
-@@ -19,6 +19,7 @@
-  * 
-  */
- 
-+#include <string.h>
- 
- #include "strtok.h"
- 
---- a/icd-main.cpp
-+++ b/icd-main.cpp
-@@ -23,6 +23,7 @@
- #include <errno.h>
- #include <sys/poll.h>
- #include <sys/stat.h>
-+#include <string.h>
- 
- #include "inotify-cxx.h"
- #include "appinst.h"
---- a/ict-main.cpp
-+++ b/ict-main.cpp
-@@ -25,6 +25,7 @@
- #include <fcntl.h>
- #include <stdlib.h>
- #include <limits.h>
-+#include <string.h>
- 
- #include "inotify-cxx.h"
- #include "appargs.h"
---- a/incroncfg.cpp
-+++ b/incroncfg.cpp
-@@ -17,6 +17,8 @@
- #include <fstream>
- #include <sstream>
- 
-+#include <string.h>
-+
- #include "incroncfg.h"
- 
- 
---- a/usertable.cpp
-+++ b/usertable.cpp
-@@ -25,6 +25,7 @@
- #include <grp.h>
- #include <stdlib.h>
- #include <sys/stat.h>
-+#include <string.h>
- 
- #include "usertable.h"
- #include "incroncfg.h"
diff --git a/sys-process/incron/files/incron-0.5.7-gentoo.patch b/sys-process/incron/files/incron-0.5.7-gentoo.patch
deleted file mode 100644
index 0bfe26cfe82c..000000000000
--- a/sys-process/incron/files/incron-0.5.7-gentoo.patch
+++ /dev/null
@@ -1,219 +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.7-gentoo.patch,v 1.2 2007/12/19 20:56:38 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.example
-===================================================================
---- incron-0.5.7.orig/incron.conf.example
-+++ /dev/null
-@@ -1,72 +0,0 @@
--#
--# *** 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
--#
--# Example:
--# system_table_dir = /var/spool/incron.systables
--
--
--# Parameter:   user_table_dir
--# Meaning:     user table directory
--# Description: This directory is examined by incrond for user table files.
--# Default:     /var/spool/incron
--#
--# Example:
--# user_table_dir = /var/spool/incron.usertables
--
--
--# Parameter:   allowed_users
--# Meaning:     allowed users list file
--# Description: This file contains users allowed to use incron.
--# Default:     /etc/incron.allow
--#
--# Example:
--# 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
--#
--# Example:
--# 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
--#
--# Example:
--# lockfile_dir = /tmp
--
--
--# 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
--#
--# Example:
--# lockfile_name = incron.lock
--
--
--# Parameter:   editor
--# Meaning:     editor executable
--# Description: This name or path is used to run as an editor for editting
--#              user tables.
--# Default:     vim
--#
--# Example:
--# editor = nano
--
-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
new file mode 100644
index 000000000000..0a040012ca78
--- /dev/null
+++ b/sys-process/incron/files/incron-0.5.9-Makefile.patch
@@ -0,0 +1,119 @@
+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
new file mode 100644
index 000000000000..3492edaea936
--- /dev/null
+++ b/sys-process/incron/files/incron-0.5.9-gcc44.patch
@@ -0,0 +1,79 @@
+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/files/incrond.init b/sys-process/incron/files/incrond.init
new file mode 100644
index 000000000000..498f8b34acbb
--- /dev/null
+++ b/sys-process/incron/files/incrond.init
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/incron/files/incrond.init,v 1.1 2011/01/31 15:14:12 idl0r Exp $
+
+depend() {
+	use clock logger
+	need localmount
+}
+
+start() {
+	ebegin "Starting incrond"
+	start-stop-daemon --start --pidfile /var/run/incrond.pid --exec /usr/sbin/incrond -- -f /etc/incron.conf
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping incrond"
+	start-stop-daemon --stop --pidfile /var/run/incrond.pid
+	eend $?
+}