Revision bump to fix EAPI value and add upstream'd patch for docdir/examples. Directly to stable due to only docs file location changing.

Package-Manager: portage-2.1.10.4/cvs/Linux i686
RepoMan-Options: --force

4 files changed, 91 insertions, 7 deletions

diff --git a/app-admin/lsyncd/ChangeLog b/app-admin/lsyncd/ChangeLog
index 79e29340c8fa..56c3e0adcca8 100644
--- a/app-admin/lsyncd/ChangeLog
+++ b/app-admin/lsyncd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/lsyncd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/ChangeLog,v 1.16 2011/07/26 15:09:26 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/ChangeLog,v 1.17 2011/07/26 15:41:16 darkside Exp $
+
+*lsyncd-2.0.4-r1 (26 Jul 2011)
+
+  26 Jul 2011; Jeremy Olexa <darkside@gentoo.org> -lsyncd-2.0.4.ebuild,
+  +lsyncd-2.0.4-r1.ebuild, +files/lsyncd-2.0.4-examplesdir.patch:
+  Revision bump to fix EAPI value and add upstream'd patch for docdir/examples.
+  Directly to stable due to only docs file location changing.
 
   26 Jul 2011; Jeremy Olexa <darkside@gentoo.org> -lsyncd-2.0.3.ebuild:
   remove old version
diff --git a/app-admin/lsyncd/Manifest b/app-admin/lsyncd/Manifest
index bdb4784375b1..c8447ec70c28 100644
--- a/app-admin/lsyncd/Manifest
+++ b/app-admin/lsyncd/Manifest
@@ -1,4 +1,5 @@
+AUX lsyncd-2.0.4-examplesdir.patch 1754 RMD160 b10cff0c0701fe176a1953cb75322afe6b0d3efe SHA1 692b7e6cce613f2a64a0a491e5a3c9618e8af3bf SHA256 9e8a9cce7f8728d8c9a63515577b2062aa77ac435a5399f8e78fae1de92978fa
 DIST lsyncd-2.0.4.tar.gz 129308 RMD160 5b04718d182e512b7a7e98d84a42090f6e94ec0a SHA1 9583be02df82a5ad780b8003b699302cc99d9e0d SHA256 053a21654fda4618f6b5f1ca079b01cd88bc7b779a9c671ed003b966d91315a9
-EBUILD lsyncd-2.0.4.ebuild 602 RMD160 350cc71f57652277e56798b8d35740dba5a5c27b SHA1 9c799b39cfc57cc4eda1ff06e7e195c3bcb75fa8 SHA256 31ad08229e9c934ae1e21f21c599aeb788292fef7c114c1693abd4e5afda49e4
-MISC ChangeLog 2233 RMD160 1787e6b85bac776fcae31672c46a6ea82eff2702 SHA1 c0041ac5b2b1bc72ce18464b98bec78adbb7728c SHA256 b2102dd2350d010449973711361d04aa0cd970c80777efcc2ca09a47724e6f30
+EBUILD lsyncd-2.0.4-r1.ebuild 753 RMD160 772551bbb7ab48c465e5767047ca63f6f0d9e401 SHA1 b1716a6722fa0e84fdf8518f12cdd9469b537b3c SHA256 1aa21aa0c69edd6993d959637bc0e511de7c8fed8c8c9c6952eb73b27f666565
+MISC ChangeLog 2546 RMD160 01fea76f0006104e043a48fb5489a97b50bd9418 SHA1 961ea918b4e82d4e86f81ec3415b0075573539fd SHA256 92c49e8e285f259a83c9086e704330132b7ccaf553115af4689b0914922e63a7
 MISC metadata.xml 230 RMD160 4361d4bf4e13285b396998d2ea5588b6137cfedf SHA1 8d0a9e98c0f3030da933db9699257cd84ca1520d SHA256 7ea0e04e60c02e127e50136f77a8d192b4b6aa4c32f339d7ce04262dc4b89a7b
diff --git a/app-admin/lsyncd/files/lsyncd-2.0.4-examplesdir.patch b/app-admin/lsyncd/files/lsyncd-2.0.4-examplesdir.patch
new file mode 100644
index 000000000000..69a40cf2822f
--- /dev/null
+++ b/app-admin/lsyncd/files/lsyncd-2.0.4-examplesdir.patch
@@ -0,0 +1,68 @@
+From 1e5d8178d56742e5a4a418f56c3a76f84a9fa2eb Mon Sep 17 00:00:00 2001
+From: axkibe <axkibe@400ab1ff-c753-0410-929a-795a28144dcc>
+Date: Tue, 19 Jul 2011 13:29:19 +0000
+Subject: [PATCH] some header changes to work with older systems. expose readdir to user scripts. write examples into doc dir
+
+git-svn-id: http://lsyncd.googlecode.com/svn/trunk@574 400ab1ff-c753-0410-929a-795a28144dcc
+---
+ Makefile.am |    2 +-
+ lsyncd.c    |    1 +
+ lsyncd.h    |    4 ++++
+ lsyncd.lua  |    1 +
+ 4 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 77bfe12..025a6ed 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -11,7 +11,7 @@ endif
+ #endif
+ 
+ lsyncd_LDADD = $(LUA_LIBS)
+-exampledir = $(datarootdir)/doc/@PACKAGE@
++exampledir = $(docdir)/
+ dist_example_DATA = \
+ 	examples/lbash.lua \
+ 	examples/lecho.lua \
+diff --git a/lsyncd.c b/lsyncd.c
+index 5132804..a591eb2 100644
+--- a/lsyncd.c
++++ b/lsyncd.c
+@@ -30,6 +30,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <strings.h>
+ #include <syslog.h>
+ #include <math.h>
+ #include <time.h>
+diff --git a/lsyncd.h b/lsyncd.h
+index 841a1a8..a9ab31c 100644
+--- a/lsyncd.h
++++ b/lsyncd.h
+@@ -11,6 +11,10 @@
+ #ifndef LSYNCD_H
+ #define LSYNCD_H
+ 
++/* some older machines need this to see pselect */
++#define _BSD_SOURCE 1
++#define _XOPEN_SOURCE 600
++
+ /* includes needed for headerfile */
+ #include "config.h"
+ 
+diff --git a/lsyncd.lua b/lsyncd.lua
+index b28a743..b1cc586 100644
+--- a/lsyncd.lua
++++ b/lsyncd.lua
+@@ -38,6 +38,7 @@ _l = nil
+ log       = lsyncd.log
+ terminate = lsyncd.terminate
+ now       = lsyncd.now
++readdir   = lsyncd.readdir
+ -- just to safe from userscripts changing this.
+ local log       = log
+ local terminate = terminate
+-- 
+1.7.3.4
+
diff --git a/app-admin/lsyncd/lsyncd-2.0.4.ebuild b/app-admin/lsyncd/lsyncd-2.0.4-r1.ebuild
index e5df8cffcb3f..a9bf414ddd88 100644
--- a/app-admin/lsyncd/lsyncd-2.0.4.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.0.4-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/lsyncd-2.0.4.ebuild,v 1.3 2011/06/02 13:29:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/lsyncd/lsyncd-2.0.4-r1.ebuild,v 1.1 2011/07/26 15:41:16 darkside Exp $
 
-EAPI=2
+EAPI=3
 
-inherit base
+inherit base autotools
 
 DESCRIPTION="Live Syncing (Mirror) Daemon"
 HOMEPAGE="http://code.google.com/p/lsyncd/"
@@ -19,6 +19,14 @@ DEPEND="dev-lang/lua"
 RDEPEND="${DEPEND}
 	net-misc/rsync"
 
+PATCHES=( "${FILESDIR}/${P}-examplesdir.patch" )
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
 src_configure() {
-	econf --with-runner="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	econf \
+		--with-runner="${EPREFIX}/usr/$(get_libdir)/${PN}" \
+		--docdir=/usr/share/doc/${P}
 }