Version bump wrt #196173, ebuild by Albert Zeyer <ich at az2000 dot de>

(Portage version: 2.1.4)

5 files changed, 22 insertions, 186 deletions

diff --git a/net-p2p/syrep/ChangeLog b/net-p2p/syrep/ChangeLog
index 0580443157ab..b90bb0060efd 100644
--- a/net-p2p/syrep/ChangeLog
+++ b/net-p2p/syrep/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-p2p/syrep
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/syrep/ChangeLog,v 1.3 2007/02/09 05:01:00 flameeyes Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/syrep/ChangeLog,v 1.4 2008/01/16 16:06:54 armin76 Exp $
+
+*syrep-0.9 (16 Jan 2008)
+
+  16 Jan 2008; Raúl Porcel <armin76@gentoo.org>
+  -files/syrep-0.6-gentoo.diff, -syrep-0.6.ebuild, +syrep-0.9.ebuild:
+  Version bump wrt #196173, ebuild by Albert Zeyer <ich at az2000 dot de>
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/net-p2p/syrep/files/digest-syrep-0.6 b/net-p2p/syrep/files/digest-syrep-0.6
deleted file mode 100644
index 6e67c10e2524..000000000000
--- a/net-p2p/syrep/files/digest-syrep-0.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 02e1faedfdd7bb23b5dfa8858b1f02dc syrep-0.6.tar.gz 143012
-RMD160 7d3b6608ec44cbe210bd6ffdfd087dcb5f831759 syrep-0.6.tar.gz 143012
-SHA256 e24ab3cc2cdc4517d5b0df36918e0be9a165d35c35074f0589fb472c157106ed syrep-0.6.tar.gz 143012
diff --git a/net-p2p/syrep/files/digest-syrep-0.9 b/net-p2p/syrep/files/digest-syrep-0.9
new file mode 100644
index 000000000000..12142892310a
--- /dev/null
+++ b/net-p2p/syrep/files/digest-syrep-0.9
@@ -0,0 +1,3 @@
+MD5 b8f1f5c206ad1e455d79e286a0e299ab syrep-0.9.tar.gz 192317
+RMD160 6f5666647688952d7b4eb8f71a94ba969ac4b77c syrep-0.9.tar.gz 192317
+SHA256 b4072bdd0eef99fdd57a0758e99be8d15917d0ba90cd67e1ffa0832de2568ed2 syrep-0.9.tar.gz 192317
diff --git a/net-p2p/syrep/files/syrep-0.6-gentoo.diff b/net-p2p/syrep/files/syrep-0.6-gentoo.diff
deleted file mode 100644
index 4d81af0ddbf5..000000000000
--- a/net-p2p/syrep/files/syrep-0.6-gentoo.diff
+++ /dev/null
@@ -1,172 +0,0 @@
-diff -urN syrep-0.6.orig/configure syrep-0.6/configure
---- syrep-0.6.orig/configure	2004-12-22 22:46:14.000000000 -0500
-+++ syrep-0.6/configure	2004-12-22 23:59:50.000772536 -0500
-@@ -2830,7 +2830,7 @@
- 
- # If using GCC specifiy some additional parameters
- if test "x$GCC" = "xyes" ; then
--   CFLAGS="$CFLAGS -pipe -Wall -W -Wno-unused-parameter"
-+   CFLAGS="$CFLAGS -Wall -W -Wno-unused-parameter"
- fi
- 
- if type -p stow > /dev/null && test -d /usr/local/stow ; then
-diff -urN syrep-0.6.orig/src/forget.c syrep-0.6/src/forget.c
---- syrep-0.6.orig/src/forget.c	2004-12-22 22:46:14.000000000 -0500
-+++ syrep-0.6/src/forget.c	2004-12-22 23:59:06.277419496 -0500
-@@ -168,7 +168,7 @@
- 
-     t = args.remember_arg*24*60*60;
-     time(&now);
--    limit = t > now ? 0 : now-t;
-+    limit = (time_t)t > now ? 0 : now-t;
- 
-     if (args.verbose_flag) {
-         fprintf(stderr, "Current time is %s", ctime(&now));
-diff -urN syrep-0.6.orig/src/merge.c syrep-0.6/src/merge.c
---- syrep-0.6.orig/src/merge.c	2004-12-22 22:46:14.000000000 -0500
-+++ syrep-0.6/src/merge.c	2004-12-22 23:59:06.277419496 -0500
-@@ -153,7 +153,7 @@
-     const char *p;
-     char *d;
-     
--    for (p = path, d = dst; *p && d-dst < l-1; p++) {
-+    for (p = path, d = dst; *p && d-dst < (signed)l-1; p++) {
-         if (*p == '/') {
-             *(d++) = '%';
-             *(d++) = '2';
-diff -urN syrep-0.6.orig/src/package.c syrep-0.6/src/package.c
---- syrep-0.6.orig/src/package.c	2004-12-22 22:46:14.000000000 -0500
-+++ syrep-0.6/src/package.c	2004-12-22 23:59:06.277419496 -0500
-@@ -181,7 +181,7 @@
-                 goto finish;
-             }
- 
--            if (n != t) {
-+            if (n != (ssize_t)t) {
-                 if ((r = (void*) p->write_z.next_in - d) > 0)
-                     r --;
- 
-@@ -212,7 +212,7 @@
-         size_t t = MIN(l, CBUFSIZE);
-         ssize_t n;
-         
--        if ((n = loop_read(sfd, buf, t)) != t) {
-+        if ((n = loop_read(sfd, buf, t)) != (ssize_t)t) {
-             fprintf(stderr, "read() : %s\n", n < 0 ? strerror(errno) : "EOF");
-             goto finish;
-         }
-@@ -245,10 +245,10 @@
-         size_t t = MIN(l, CBUFSIZE);
-         ssize_t n;
- 
--        if (package_read(p, buf, t) != t)
-+        if (package_read(p, buf, t) != (ssize_t)t)
-             goto finish;
-         
--        if ((n = loop_write(dfd, buf, t)) != t) {
-+        if ((n = loop_write(dfd, buf, t)) != (ssize_t)t) {
-             fprintf(stderr, "write() : %s\n", n < 0 ? strerror(errno) : "EOF");
-             goto finish;
-         }
-@@ -360,7 +360,7 @@
- 
-                 t = (void*) p->write_z.next_out - p->write_zbuf;
-                 if (t) {
--                    if ((n = loop_write(p->write_fd, p->write_zbuf, t)) != t) {
-+                    if ((n = loop_write(p->write_fd, p->write_zbuf, t)) != (ssize_t)t) {
-                         fprintf(stderr, "loop_write(): %s\n", n < 0 ? strerror(errno) : "EOF");
-                         r = -1;
-                         break;
-diff -urN syrep-0.6.orig/src/syrep.c syrep-0.6/src/syrep.c
---- syrep-0.6.orig/src/syrep.c	2004-12-22 22:46:14.000000000 -0500
-+++ syrep-0.6/src/syrep.c	2004-12-22 23:59:06.276419648 -0500
-@@ -262,7 +262,7 @@
-     if (args.inputs_num < 1)
-         fprintf(stderr, "WARNING: No repository or snapshot to specified!\n");
-     
--    for (i = 0; i < args.inputs_num; i++) {
-+    for (i = 0; (unsigned)i < args.inputs_num; i++) {
-         static char saved_cwd[PATH_MAX];
- 
-         if (args.local_temp_flag && isdirectory(args.inputs[i]) >= 1) {
-@@ -281,7 +281,7 @@
-             fprintf(stderr, "*** %s ***\n", path);
-         
-         if (m && args.output_directory_given) {
--            if (getcwd(saved_cwd, sizeof(saved_cwd)) < 0) {
-+            if (getcwd(saved_cwd, sizeof(saved_cwd)) == NULL) {
-                 fprintf(stderr, "getcwd(): %s\n", strerror(errno));
-                 return -1;
-             }
-@@ -304,7 +304,7 @@
-             }
-         }
- 
--        if (args.inputs_num > 1 && i < args.inputs_num-1)
-+        if (args.inputs_num > 1 && (unsigned)i < args.inputs_num-1)
-             fprintf(stderr, "\n");
-         
-         db_context_free(c);
-@@ -340,7 +340,7 @@
-         goto finish;
-     }
-     
--    for (i = 0; i < args.inputs_num; i++) {
-+    for (i = 0; (unsigned)i < args.inputs_num; i++) {
-         static char saved_cwd[PATH_MAX];
-         
-         if (isdirectory(args.inputs[i]) <= 0) {
-@@ -372,7 +372,7 @@
-                 cache = md_cache_open(p, args.ro_cache_flag);
-         }
- 
--        if (getcwd(saved_cwd, sizeof(saved_cwd)) < 0) {
-+        if (getcwd(saved_cwd, sizeof(saved_cwd)) == NULL) {
-             fprintf(stderr, "getcwd(): %s\n", strerror(errno));
-             goto finish;
-         }
-@@ -429,7 +429,7 @@
-     if (args.inputs_num < 1)
-         fprintf(stderr, "WARNING: No repository specified!\n");
-     
--    for (i = 0; i < args.inputs_num; i++) {
-+    for (i = 0; (unsigned)i < args.inputs_num; i++) {
- 
-         if (isdirectory(args.inputs[i]) <= 0) {
-             fprintf(stderr, "%s is not a directory\n", args.inputs[i]);
-@@ -442,7 +442,7 @@
-         if (cleanup(args.inputs[i]) < 0)
-             goto finish;
- 
--        if (args.inputs_num > 1 && i < args.inputs_num-1)
-+        if (args.inputs_num > 1 && (unsigned)i < args.inputs_num-1)
-             fprintf(stderr, "\n");
-     }
- 
-@@ -461,7 +461,7 @@
-     if (args.inputs_num < 1)
-         fprintf(stderr, "WARNING: No repository or snapshot to specified!\n");
-     
--    for (i = 0; i < args.inputs_num; i++) {
-+    for (i = 0; (unsigned)i < args.inputs_num; i++) {
-         if (args.local_temp_flag && isdirectory(args.inputs[i]) >= 1) {
-             const char *p = get_attached_filename(args.inputs[i], SYREP_TEMPDIR);
-             mkdir(p, 0777);
-@@ -483,7 +483,7 @@
-         if (forget(c, target) < 0)
-             goto finish;
- 
--        if (args.inputs_num > 1 && i < args.inputs_num-1)
-+        if (args.inputs_num > 1 && (unsigned)i < args.inputs_num-1)
-             fprintf(stderr, "\n");
-         
-         db_context_free(c);
-@@ -521,7 +521,7 @@
- static void free_args(void) {
-     int i;
-     
--    for (i = 0; i < args.inputs_num; i++)
-+    for (i = 0; (unsigned)i < args.inputs_num; i++)
-         free(args.inputs[i]);
- 
-     free(args.inputs);
diff --git a/net-p2p/syrep/syrep-0.6.ebuild b/net-p2p/syrep/syrep-0.9.ebuild
index 7210598430ba..7424b3d1e93f 100644
--- a/net-p2p/syrep/syrep-0.6.ebuild
+++ b/net-p2p/syrep/syrep-0.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/syrep/syrep-0.6.ebuild,v 1.2 2005/03/15 14:23:07 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/syrep/syrep-0.9.ebuild,v 1.1 2008/01/16 16:06:54 armin76 Exp $
 
-inherit eutils
+inherit eutils autotools
 
 DESCRIPTION="A p2p generic file repository synchronization tool that may be used to synchronize large file hierarchies bidirectionally by exchanging patch files."
 HOMEPAGE="http://0pointer.de/lennart/projects/syrep/"
@@ -14,15 +14,17 @@ KEYWORDS="~x86"
 IUSE="doc"
 
 DEPEND="sys-libs/zlib
-	>=sys-libs/db-4.2
+	>=sys-libs/db-4.3
 	doc? ( www-client/lynx )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-}
+	cd "${S}"
+
+	sed -i -e "s/#if (DB_VERSION_MAJOR != 4).*/#if (DB_VERSION_MAJOR != 4)/" configure.ac
 
+	eautoreconf
+}
 src_compile() {
 	econf \
 		$(use_enable doc lynx) \
@@ -34,8 +36,8 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-	cd ${S}/doc
+	emake DESTDIR="${D}" install || die "emake install failed"
+	cd "${S}"/doc
 	dodoc README *.txt
 	use doc && dohtml *.html *.css
 }