diff options
author | Christian Ruppert <idl0r@gentoo.org> | 2011-01-31 15:14:12 +0000 |
---|---|---|
committer | Christian Ruppert <idl0r@gentoo.org> | 2011-01-31 15:14:12 +0000 |
commit | 4e8aabf265e461b1fa97cb7d5034694fcbf257f8 (patch) | |
tree | 3cb250b455e790342c8859c4748453674bff3194 /sys-process | |
parent | Initial import (diff) | |
download | historical-4e8aabf265e461b1fa97cb7d5034694fcbf257f8.tar.gz historical-4e8aabf265e461b1fa97cb7d5034694fcbf257f8.tar.bz2 historical-4e8aabf265e461b1fa97cb7d5034694fcbf257f8.zip |
Take maintainership. Revision bump. Reorder patches. Add separate init script. Fix INOTIFY check. Remove old ebuilds/patches.
Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64
Diffstat (limited to 'sys-process')
-rw-r--r-- | sys-process/incron/ChangeLog | 14 | ||||
-rw-r--r-- | sys-process/incron/Manifest | 27 | ||||
-rw-r--r-- | sys-process/incron/files/incron-0.5.7-gcc43.patch | 51 | ||||
-rw-r--r-- | sys-process/incron/files/incron-0.5.7-gentoo.patch | 219 | ||||
-rw-r--r-- | sys-process/incron/files/incron-0.5.9-Makefile.patch | 119 | ||||
-rw-r--r-- | sys-process/incron/files/incron-0.5.9-gcc44.patch | 79 | ||||
-rw-r--r-- | sys-process/incron/files/incrond.init | 21 | ||||
-rw-r--r-- | sys-process/incron/incron-0.5.7.ebuild | 35 | ||||
-rw-r--r-- | sys-process/incron/incron-0.5.9-r1.ebuild | 43 | ||||
-rw-r--r-- | sys-process/incron/incron-0.5.9.ebuild | 33 | ||||
-rw-r--r-- | sys-process/incron/metadata.xml | 3 |
11 files changed, 296 insertions, 348 deletions
diff --git a/sys-process/incron/ChangeLog b/sys-process/incron/ChangeLog index 35a15f2544c0..185694a53ac3 100644 --- a/sys-process/incron/ChangeLog +++ b/sys-process/incron/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-process/incron -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/incron/ChangeLog,v 1.13 2010/03/04 19:47:36 hollow Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/incron/ChangeLog,v 1.14 2011/01/31 15:14:12 idl0r Exp $ + +*incron-0.5.9-r1 (31 Jan 2011) + + 31 Jan 2011; Christian Ruppert <idl0r@gentoo.org> -incron-0.5.7.ebuild, + -files/incron-0.5.7-gcc43.patch, -files/incron-0.5.7-gentoo.patch, + -incron-0.5.9.ebuild, +incron-0.5.9-r1.ebuild, + +files/incron-0.5.9-Makefile.patch, +files/incron-0.5.9-gcc44.patch, + +files/incrond.init, metadata.xml: + Take maintainership. Revision bump. Reorder patches. Add separate init + script. Fix INOTIFY check. Remove old ebuilds/patches. 04 Mar 2010; Benedikt Böhm <hollow@gentoo.org> metadata.xml: remove myself from metadata.xml diff --git a/sys-process/incron/Manifest b/sys-process/incron/Manifest index 83c325ed854e..f05dbda0715b 100644 --- a/sys-process/incron/Manifest +++ b/sys-process/incron/Manifest @@ -1,12 +1,25 @@ -AUX incron-0.5.7-gcc43.patch 836 RMD160 848409c26d0e2548ddd5d9a3d05037ff2676cbc4 SHA1 0efd2cc0d00bb304e2bd885496257fe87c572d46 SHA256 dcaa0cbbff465fa0d571614216523c12dedd8e13baf518a7657b4ff20c073523 -AUX incron-0.5.7-gentoo.patch 6076 RMD160 644e25e864f8a8b92b18f70b616b2579686708d8 SHA1 5c7b90c238fbf1136c5958a51202c07131983a73 SHA256 ccabc447f49e9a69ae8594e716a222e1298273239d9eadf3aa82598f35cfc69c +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX incron-0.5.8-gcc44.patch 1614 RMD160 30ec2a6161a3a317d2c359d6ac1dda7bbf143b82 SHA1 9dc6c9c25ae0234d9f77782b96554bcd532cbf3b SHA256 77842f88bba283e773446b08696ebf65800df775686fd9feab8629ac7b4ac8ee AUX incron-0.5.8-gentoo.patch 4100 RMD160 aba846fa138db6539881b80f84f6c32c04949ebc SHA1 c6bf094091d9ed355dc3641bfdfe3d1f0e298b32 SHA256 eda824666d7b25a96799daf1d8d9cfff02602fc722f92ce741db9b924bebe508 -DIST incron-0.5.7.tar.gz 177659 RMD160 b82d91f3e7bd75ac91aa3e07284df281e0695e3f SHA1 63d32a5d82b733c435fd3616bba7ff4c7029e3f1 SHA256 68c724a2d56b9341b0433e00be767676f61cb3b2eb68a51351238e117385ecd6 +AUX incron-0.5.9-Makefile.patch 3849 RMD160 da81f0c4e2aeae6d1a2857ca208a3703f06ffbde SHA1 7e07311d349600d81903a22017d6b9c306d956d6 SHA256 48f10fd1fdd1ff3b5d2ce86a660a919ba57e97b986b7423e5a132eb4b7a2262a +AUX incron-0.5.9-gcc44.patch 1713 RMD160 0ce1023ad6be067ed4159a3ec69a093bee186f90 SHA1 4056ed6ee2cdac552b9d6942595f0e0c53ba4b60 SHA256 8493cb188462b2502a8c3d0bf77a63a6d189d63f53131b1257dcc38a18ee0ae6 +AUX incrond.init 545 RMD160 c833872b8c3fa341242bcbf2ecd3fe8bdff1b631 SHA1 bdbe76a10b98ed0d8e5fee89a06ffc4bada8b15b SHA256 64ffff2202760e50af8a611a1949cb4f1ab9f21d70f2ff48e5c721013f78c987 DIST incron-0.5.8.tar.gz 172865 RMD160 f73b209be7eb638b20c5db76e1aed716d7244bf0 SHA1 b31e39326052534c87d2d703edfb84d4e284cf59 SHA256 761df34cba81ca8d26bdac4fce197829da053c9c30784b8285cce2aaf77c25bf DIST incron-0.5.9.tar.gz 173606 RMD160 3f5d1de6e6ae723364c7e0fa78d746fa0e82a43a SHA1 d06424e3706be0048473ef044f2c185cb6fa1d32 SHA256 0f8ab2d3fad9ec46e7c0ac4c791aa493a652c6966f879e7d0e05bb5f5a6d52b3 -EBUILD incron-0.5.7.ebuild 875 RMD160 053393878f56fbc5102d396d905d537e635b7c08 SHA1 7ae9b4483bfa9876d6c59d8b87f35411fd9be842 SHA256 4202dce799ec7843562f4e6b8e47bc7b96a224bda045f9616fe2d14ea65e3ff7 EBUILD incron-0.5.8.ebuild 861 RMD160 8cf88ed0ef1f837b74d871d41999b0f10d62d723 SHA1 709b99cde32efd29ac100bd2150c26d5e7d97519 SHA256 f666e4f85e1b511226a73c3232629468928f20483ec7423b6b516423f9943596 -EBUILD incron-0.5.9.ebuild 878 RMD160 1af95b01b112a8c82149b7a1cedb715e8d754ec9 SHA1 107a40efde42a31e55601e6cd94985c34dec6874 SHA256 368f1edab5652b1d52be58f3b719cd0716c0b4ddae205d5c4c9ac7a307ebb290 -MISC ChangeLog 1863 RMD160 367e9b162f93658af57c929fd18aaf265581aa11 SHA1 ee0a07b1bcd83234f5073e06b5d9fb9e6809d1f2 SHA256 a8353cb8d132b2f6d33111bf6691c32ec3fedc8ed396297d7a4fa925b95ddd4b -MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 +EBUILD incron-0.5.9-r1.ebuild 1047 RMD160 290fa74d683b3bf9f8240850976028536023de34 SHA1 5176d5ad44a0c3a573122464aec69714b6584be8 SHA256 c95cd75f5ee355ea3bee13b696d0e106a060ffeded1bb55713ed8e7e3d0a1dac +MISC ChangeLog 2325 RMD160 386814c8ddc66da0fa34c2648a64b6b5fee439fc SHA1 61127b603a748370adabad2a846e8ead7ca34603 SHA256 e831c0c5b9a8fbf76d107f9d6e8567ac83fdab1713400020d6242dad0f9efc19 +MISC metadata.xml 257 RMD160 bcab27442aaf8c70a69d3253c57da120baa73a23 SHA1 2a42cd4f8eb1680f401434a1cba9fb3822f54d59 SHA256 e88156268180b22aaa94aa0e5d1e9896c02c143f2f823ebb5b894b55ee1711f5 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.16 (GNU/Linux) + +iQEcBAEBCAAGBQJNRtHJAAoJEMOx0zmdw4Z1xuoIAJIqtHSbP3pwkgMoAgaK7wZf +Z6CNgboxPgoMIKKUPKEkFUfcHtWJwBoW30drJqea9nxWbq9DcBNeL+fl+DaUmZFT +pPmb0/uB37/Bw5oSsKEXezfgt/GZHGEe2GwUDKigbKNvR/Q17XcqsAHdQjW8bBUZ +0ktfXNUSfbScfXGEJBpOq79n9tzTKZmDeItCByMEWjbddDzHWO893bFskykEkmeN +nmwYpqNhzY0YPhVntEx7C3jh/Yhnc12/iqiyEQQARZYYJ/18M3Anq+fv3VOLk9Ai +q8JF5U4Vc776CjxIo6Z6XLhR3IOjny/FYGmCzFNNIwDzpirxgN8A44v+QTpn4BE= +=CmWi +-----END PGP SIGNATURE----- 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 $? +} diff --git a/sys-process/incron/incron-0.5.7.ebuild b/sys-process/incron/incron-0.5.7.ebuild deleted file mode 100644 index 80faeba80e43..000000000000 --- a/sys-process/incron/incron-0.5.7.ebuild +++ /dev/null @@ -1,35 +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.7.ebuild,v 1.4 2009/08/12 02:59:33 robbat2 Exp $ - -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="" - -DEPEND="" -RDEPEND="" - -CONFIG_CHECK="~INOTIFY" -ERROR_INOTIFY="Recompile your kernel with inotify support - CONFIG_INOTIFY" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-gentoo.patch - epatch "${FILESDIR}"/${P}-gcc43.patch -} - -src_compile() { - emake CXX=$(tc-getCXX) CXXFLAGS="${CXXFLAGS}" || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" -} diff --git a/sys-process/incron/incron-0.5.9-r1.ebuild b/sys-process/incron/incron-0.5.9-r1.ebuild new file mode 100644 index 000000000000..df1ec9ec7163 --- /dev/null +++ b/sys-process/incron/incron-0.5.9-r1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2011 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.1 2011/01/31 15:14:12 idl0r 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 + + epatch "${FILESDIR}"/${P}-Makefile.patch +} + +src_compile() { + emake CXX=$(tc-getCXX) || die "emake failed" +} + +src_install() { + emake DESTDIR="${D}" PREFIX=/usr install || die "emake install failed" + + newinitd "${FILESDIR}/incrond.init" incrond || die + + dodoc CHANGELOG README TODO +} diff --git a/sys-process/incron/incron-0.5.9.ebuild b/sys-process/incron/incron-0.5.9.ebuild deleted file mode 100644 index 18917d109d43..000000000000 --- a/sys-process/incron/incron-0.5.9.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.9.ebuild,v 1.1 2009/10/28 23:47:22 vapier 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}"/${PN}-0.5.8-gentoo.patch \ - "${FILESDIR}"/${PN}-0.5.8-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/metadata.xml b/sys-process/incron/metadata.xml index 9f3fdee2246b..ea6573a9fbf4 100644 --- a/sys-process/incron/metadata.xml +++ b/sys-process/incron/metadata.xml @@ -3,6 +3,7 @@ <pkgmetadata> <herd>no-herd</herd> <maintainer> - <email>maintainer-needed@gentoo.org</email> + <email>idl0r@gentoo.org</email> + <name>Christian Ruppert</name> </maintainer> </pkgmetadata> |