* [gentoo-commits] proj/gentoo-PENDING:master commit in: net-analyzer/ssldump/files/, dev-lisp/ecls/files/, media-video/dvbsnoop/files/, ...
@ 2015-08-08 22:35 Robin H. Johnson
0 siblings, 0 replies; only message in thread
From: Robin H. Johnson @ 2015-08-08 22:35 UTC (permalink / raw
To: gentoo-commits
commit: c235b29f6685c9ea28f7a8c72feaaa4a11d488d2
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 8 22:34:55 2015 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Aug 8 22:34:55 2015 +0000
URL: https://gitweb.gentoo.org/proj/gentoo-PENDING.git/commit/?id=c235b29f
Add some keyword cleanups.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
app-admin/puppet-lint/metadata.xml | 2 +-
app-backup/sarab/files/README.Gentoo | 2 +-
app-benchmarks/httperf/files/httperf-0.8-optional-ssl.diff | 2 +-
app-benchmarks/httperf/files/httperf-0.8-respect-DESTDIR.diff | 2 +-
app-crypt/bestcrypt/files/bcrypt3 | 2 +-
app-editors/gvim/files/gvimrc-r1 | 2 +-
app-editors/neovim/files/nvimrc | 2 +-
app-editors/vim-core/files/vimrc-r4 | 2 +-
app-eselect/eselect-blas/files/blas.eselect.5 | 2 +-
app-eselect/eselect-cblas/files/cblas.eselect.5 | 2 +-
app-eselect/eselect-lapack/files/lapack.eselect.5 | 2 +-
app-eselect/eselect-wxwidgets/files/wxwin.m4-2.9 | 2 +-
dev-java/dynalang/files/build.xml | 2 +-
dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch | 2 +-
dev-libs/fcgi/files/fcgi-2.4.0-clientdata-pointer.patch | 2 +-
dev-libs/libhome/files/libhome-0.10.2-ldap_deprecated.patch | 2 +-
dev-lisp/ecls/files/README.Gentoo | 2 +-
dev-perl/perltidy/files/perltidy-20130922.0.0-CVE-2014-2277.patch | 2 +-
dev-php/ming-php/files/php_ext-config.m4 | 2 +-
dev-python/happydoc/files/happydoc-3.1-setup.py | 2 +-
dev-python/python-levenshtein/files/genextdoc.py | 2 +-
dev-util/lockrun/files/lockrun.c-20120508 | 2 +-
dev-util/yacc/files/yacc-1.9.1-CVE-2008-3196.patch | 2 +-
games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch | 2 +-
licenses/GPL-2-with-MySQL-FLOSS-exception | 2 +-
licenses/Opendylan | 2 +-
licenses/Stuffit | 2 +-
licenses/URI | 2 +-
licenses/W3C-document | 2 +-
licenses/atheros-hal | 2 +-
licenses/codehaus-classworlds | 2 +-
licenses/codehaus-groovy | 2 +-
mail-filter/procmail/files/procmail-prefix.patch | 2 +-
mail-mta/sendmail/files/sendmail-procmail.mc | 2 +-
mail-mta/sendmail/files/sendmail.mc-r1 | 2 +-
media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch | 2 +-
media-video/dvbsnoop/files/dvbsnoop-1.4.50-crc32.patch | 4 ++--
media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch | 4 ++--
media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch | 4 ++--
net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch | 6 +++---
net-analyzer/nepenthes/files/nepenthes-0.2.2-curl_types_h.patch | 6 +++---
net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch | 2 +-
net-analyzer/ssldump/files/ssldump-0.9-includes.patch | 6 +++---
net-dialup/pptpclient/files/pptp_fe.pl | 2 +-
net-dialup/pptpclient/files/xpptp_fe.pl | 2 +-
net-dialup/rp-l2tp/files/rp-l2tp-0.4-gentoo.patch | 4 ++--
net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch | 4 ++--
net-dialup/rp-pppoe/files/rp-pppoe-3.8-configure.patch | 4 ++--
net-dns/opendnssec/opendnssec-1.3.17.ebuild | 2 +-
net-dns/opendnssec/opendnssec-1.3.18.ebuild | 2 +-
net-dns/opendnssec/opendnssec-1.4.4.ebuild | 2 +-
net-dns/opendnssec/opendnssec-1.4.6.ebuild | 2 +-
net-dns/pdnsd/files/pdnsd.conf.test | 2 +-
net-irc/bip/files/bip.vim | 2 +-
net-misc/capiisdnmon/files/capiisdnmon-0.42-gcc44.patch | 2 +-
net-misc/netkit-telnetd/files/netkit-telnetd-0.17-gentoo.patch | 2 +-
net-print/cups/files/cups-1.7.2-systemd-socket-2.patch | 4 ++--
sci-biology/vienna-rna/files/vienna-rna-1.8.4-implicits.patch | 2 +-
| 4 ++--
sci-libs/gdal/files/gdal-1.11.1-poppler-0.31.0-support.patch | 2 +-
sci-libs/libdap/files/libdap-3.11.3-gcc-4.7.patch | 2 +-
sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch | 2 +-
sci-libs/shapelib/files/stdlib_include_fix.patch | 4 ++--
sci-misc/gt-itm/files/gt-itm-implicits.patch | 2 +-
scripts/bootstrap.sh | 2 +-
sys-apps/gawk/files/filefuncs/filefuncs.c | 2 +-
sys-apps/less/files/lesspipe.sh | 2 +-
sys-apps/lshw/files/lshw-02.16b-gentoo.patch | 2 +-
sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff | 4 ++--
sys-auth/nss_ldap/files/nss_ldap-254-nss_getgrent_skipmembers.patch | 2 +-
sys-auth/nss_ldap/files/nss_ldap-265-fbsd.patch | 2 +-
sys-auth/nss_ldap/nss_ldap-258.ebuild | 2 +-
sys-auth/nss_ldap/nss_ldap-259.ebuild | 2 +-
sys-auth/nss_ldap/nss_ldap-261.ebuild | 2 +-
sys-auth/nss_ldap/nss_ldap-262.ebuild | 2 +-
sys-auth/nss_ldap/nss_ldap-264-r1.ebuild | 2 +-
sys-auth/nss_ldap/nss_ldap-264.ebuild | 2 +-
sys-auth/nss_ldap/nss_ldap-265-r1.ebuild | 2 +-
sys-auth/nss_ldap/nss_ldap-265-r2.ebuild | 2 +-
sys-auth/nss_ldap/nss_ldap-265-r4.ebuild | 2 +-
sys-auth/nss_ldap/nss_ldap-265-r5.ebuild | 2 +-
sys-auth/nss_ldap/nss_ldap-265.ebuild | 2 +-
sys-devel/binutils-config/files/binutils-config-1.9 | 2 +-
sys-devel/binutils-config/files/binutils-config-2 | 2 +-
sys-devel/binutils-config/files/binutils-config-3 | 2 +-
sys-devel/binutils-config/files/binutils-config-4 | 2 +-
sys-devel/gcc-config/files/wrapper-1.5.1.c | 2 +-
sys-devel/gcc-config/files/wrapper-1.5.2.c | 2 +-
sys-freebsd/freebsd-pam-modules/files/README.pamd | 2 +-
sys-fs/e2fsprogs/files/fsck_ext2fs.8 | 2 +-
sys-fs/e2fsprogs/files/fsck_ext2fs.c | 2 +-
sys-fs/hfsutils/files/largerthan2gb.patch | 2 +-
sys-process/pidof-bsd/files/pidof-bsd-20050501-gfbsd.patch | 2 +-
www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-s4u2proxy.patch | 4 ++--
.../files/freeradius-dialupadmin-1.80-gentoo.patch | 2 +-
www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch | 2 +-
96 files changed, 113 insertions(+), 113 deletions(-)
diff --git a/app-admin/puppet-lint/metadata.xml b/app-admin/puppet-lint/metadata.xml
index 7cf1c1e..e2e74b8 100644
--- a/app-admin/puppet-lint/metadata.xml
+++ b/app-admin/puppet-lint/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!--
-# $Id$
+$Id$
-->
<pkgmetadata>
<herd>sysadmin</herd>
diff --git a/app-backup/sarab/files/README.Gentoo b/app-backup/sarab/files/README.Gentoo
index 0d43eae..680a395 100644
--- a/app-backup/sarab/files/README.Gentoo
+++ b/app-backup/sarab/files/README.Gentoo
@@ -1,4 +1,4 @@
--*- outline -*- # $Id$
+-*- outline -*- $Id$
Gentoo GNU/Linux specific notes for SaraB
-----------------------------------------
diff --git a/app-benchmarks/httperf/files/httperf-0.8-optional-ssl.diff b/app-benchmarks/httperf/files/httperf-0.8-optional-ssl.diff
index bba5a28..018fa03 100644
--- a/app-benchmarks/httperf/files/httperf-0.8-optional-ssl.diff
+++ b/app-benchmarks/httperf/files/httperf-0.8-optional-ssl.diff
@@ -1,4 +1,4 @@
-diff --exclude='*~' --exclude='.*' -I '# $Id$
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN httperf-0.8.orig/configure.in httperf-0.8/configure.in
--- httperf-0.8.orig/configure.in 2005-08-17 15:51:17.000000000 -0400
+++ httperf-0.8/configure.in 2005-08-17 16:06:20.000000000 -0400
@@ -39,8 +39,14 @@
diff --git a/app-benchmarks/httperf/files/httperf-0.8-respect-DESTDIR.diff b/app-benchmarks/httperf/files/httperf-0.8-respect-DESTDIR.diff
index d39ffa0..f905224 100644
--- a/app-benchmarks/httperf/files/httperf-0.8-respect-DESTDIR.diff
+++ b/app-benchmarks/httperf/files/httperf-0.8-respect-DESTDIR.diff
@@ -1,4 +1,4 @@
-diff --exclude='*~' --exclude='.*' -I '# $Id$
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN httperf-0.8.orig/Makefile.in httperf-0.8/Makefile.in
--- httperf-0.8.orig/Makefile.in 2005-08-17 16:07:21.000000000 -0400
+++ httperf-0.8/Makefile.in 2005-08-17 16:34:50.000000000 -0400
@@ -51,9 +51,10 @@
diff --git a/app-crypt/bestcrypt/files/bcrypt3 b/app-crypt/bestcrypt/files/bcrypt3
index c8a099f..8f6dd38 100644
--- a/app-crypt/bestcrypt/files/bcrypt3
+++ b/app-crypt/bestcrypt/files/bcrypt3
@@ -4,7 +4,7 @@
#
# Version: 1.2
#
-# Revision: # $Id$
+# Revision: $Id$
#
# Author: Jetico Inc. (support@jetico.com)
#
diff --git a/app-editors/gvim/files/gvimrc-r1 b/app-editors/gvim/files/gvimrc-r1
index 6544f7b..dcad07d 100644
--- a/app-editors/gvim/files/gvimrc-r1
+++ b/app-editors/gvim/files/gvimrc-r1
@@ -2,7 +2,7 @@ scriptencoding utf-8
" ^^ Please leave the above line at the start of the file.
" Default configuration file for gvim
-" # $Id$
+" $Id$
"
" Written by Aron Griffis <agriffis@gentoo.org>
"
diff --git a/app-editors/neovim/files/nvimrc b/app-editors/neovim/files/nvimrc
index d96fb9a..316d867 100644
--- a/app-editors/neovim/files/nvimrc
+++ b/app-editors/neovim/files/nvimrc
@@ -1,6 +1,6 @@
" Default Gentoo configuration file for neovim
" Based on the default vimrc shipped by Gentoo with app-editors/vim-core
-" # $Id$
+" $Id$
" You can override any of these settings on a global basis via the
" "/etc/vim/nvimrc.local" file, and on a per-user basis via "~/.nvimrc".
diff --git a/app-editors/vim-core/files/vimrc-r4 b/app-editors/vim-core/files/vimrc-r4
index 584dc5f..07fffcc 100644
--- a/app-editors/vim-core/files/vimrc-r4
+++ b/app-editors/vim-core/files/vimrc-r4
@@ -2,7 +2,7 @@ scriptencoding utf-8
" ^^ Please leave the above line at the start of the file.
" Default configuration file for Vim
-" # $Id$
+" $Id$
" Written by Aron Griffis <agriffis@gentoo.org>
" Modified by Ryan Phillips <rphillips@gentoo.org>
diff --git a/app-eselect/eselect-blas/files/blas.eselect.5 b/app-eselect/eselect-blas/files/blas.eselect.5
index b319a55..1b41851 100644
--- a/app-eselect/eselect-blas/files/blas.eselect.5
+++ b/app-eselect/eselect-blas/files/blas.eselect.5
@@ -64,4 +64,4 @@ Danny van Dyk <kugelfang@gentoo.org>
.br
Donnie Berkholz <spyderous@gentoo.org>
.SH "REVISION"
-# $Id$
+$Id$
diff --git a/app-eselect/eselect-cblas/files/cblas.eselect.5 b/app-eselect/eselect-cblas/files/cblas.eselect.5
index 877cf1a..c27f1f1 100644
--- a/app-eselect/eselect-cblas/files/cblas.eselect.5
+++ b/app-eselect/eselect-cblas/files/cblas.eselect.5
@@ -64,4 +64,4 @@ Danny van Dyk <kugelfang@gentoo.org>
.br
Donnie Berkholz <spyderous@gentoo.org>
.SH "REVISION"
-# $Id$
+$Id$
diff --git a/app-eselect/eselect-lapack/files/lapack.eselect.5 b/app-eselect/eselect-lapack/files/lapack.eselect.5
index b0647a5..b682486 100644
--- a/app-eselect/eselect-lapack/files/lapack.eselect.5
+++ b/app-eselect/eselect-lapack/files/lapack.eselect.5
@@ -64,4 +64,4 @@ Danny van Dyk <kugelfang@gentoo.org>
.br
Donnie Berkholz <spyderous@gentoo.org>
.SH "REVISION"
-# $Id$
+$Id$
diff --git a/app-eselect/eselect-wxwidgets/files/wxwin.m4-2.9 b/app-eselect/eselect-wxwidgets/files/wxwin.m4-2.9
index dbd23a3..4c01ae4 100644
--- a/app-eselect/eselect-wxwidgets/files/wxwin.m4-2.9
+++ b/app-eselect/eselect-wxwidgets/files/wxwin.m4-2.9
@@ -3,7 +3,7 @@ dnl Author: wxWidgets development team,
dnl Francesco Montorsi,
dnl Bob McCown (Mac-testing)
dnl Creation date: 24/11/2001
-dnl RCS-ID: # $Id$
+dnl RCS-ID: $Id$
dnl ---------------------------------------------------------------------------
dnl ===========================================================================
diff --git a/dev-java/dynalang/files/build.xml b/dev-java/dynalang/files/build.xml
index 74e87b7..6929334 100644
--- a/dev-java/dynalang/files/build.xml
+++ b/dev-java/dynalang/files/build.xml
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- # $Id$
+<!-- $Id$ -->
<property name="project.name" value="JVM Dynamic Languages Metaobject Protocol"/>
<property name="artifact.name" value="dynalang-mop"/>
<property name="revision" value="0.4"/>
diff --git a/dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch b/dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch
index 0486a13..210a178 100644
--- a/dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch
+++ b/dev-java/jaxme/files/jaxme-0.5.2-fix_marshallers.patch
@@ -3,7 +3,7 @@ diff -ur ws-jaxme-0.5.2-old/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.
+++ ws-jaxme-0.5.2/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java 2009-04-05 00:43:39.498597962 +0300
@@ -45,7 +45,7 @@
* @author <a href="mailto:joe@ispsoft.de">Jochen Wiedmann</a>
- * @version # $Id$
+ * @version $Id$
*/
-public class JMMarshallerImpl extends JMControllerImpl implements JMMarshaller {
+public abstract class JMMarshallerImpl extends JMControllerImpl implements JMMarshaller {
diff --git a/dev-libs/fcgi/files/fcgi-2.4.0-clientdata-pointer.patch b/dev-libs/fcgi/files/fcgi-2.4.0-clientdata-pointer.patch
index fdf6056..ba47937 100644
--- a/dev-libs/fcgi/files/fcgi-2.4.0-clientdata-pointer.patch
+++ b/dev-libs/fcgi/files/fcgi-2.4.0-clientdata-pointer.patch
@@ -2,7 +2,7 @@ Index: fcgi-2.4.0/cgi-fcgi/cgi-fcgi.c
===================================================================
--- fcgi-2.4.0.orig/cgi-fcgi/cgi-fcgi.c
+++ fcgi-2.4.0/cgi-fcgi/cgi-fcgi.c
-@@ -21,6 +21,7 @@ static const char rcsid[] = "# $Id$
+@@ -21,6 +21,7 @@ static const char rcsid[] = "$Id: cgi-fc
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/dev-libs/libhome/files/libhome-0.10.2-ldap_deprecated.patch b/dev-libs/libhome/files/libhome-0.10.2-ldap_deprecated.patch
index 316dd55..a966451 100644
--- a/dev-libs/libhome/files/libhome-0.10.2-ldap_deprecated.patch
+++ b/dev-libs/libhome/files/libhome-0.10.2-ldap_deprecated.patch
@@ -3,7 +3,7 @@ Index: libhome-0.10.2/hldap.c
--- libhome-0.10.2.orig/hldap.c
+++ libhome-0.10.2/hldap.c
@@ -27,6 +27,7 @@ static char const rcsid[] UNUSED =
- "# $Id$
+ "$Id: libhome-0.10.2-ldap_deprecated.patch,v 1.1 2009/07/05 19:25:41 hollow Exp $";
#define passwd system_passwd
+#define LDAP_DEPRECATED 1
diff --git a/dev-lisp/ecls/files/README.Gentoo b/dev-lisp/ecls/files/README.Gentoo
index b287358..65031ab 100644
--- a/dev-lisp/ecls/files/README.Gentoo
+++ b/dev-lisp/ecls/files/README.Gentoo
@@ -1,4 +1,4 @@
--*- outline -*- # $Id$
+-*- outline -*- $Id$
Gentoo GNU/Linux specific notes for ECL
---------------------------------------
diff --git a/dev-perl/perltidy/files/perltidy-20130922.0.0-CVE-2014-2277.patch b/dev-perl/perltidy/files/perltidy-20130922.0.0-CVE-2014-2277.patch
index 471b91d..f52e3f6 100644
--- a/dev-perl/perltidy/files/perltidy-20130922.0.0-CVE-2014-2277.patch
+++ b/dev-perl/perltidy/files/perltidy-20130922.0.0-CVE-2014-2277.patch
@@ -12,7 +12,7 @@ Last-Update: 2010-03-29
+use File::Temp qw(tempfile);
BEGIN {
- ( $VERSION = q(# $Id$
+ ( $VERSION = q($Id: perltidy-20130922.0.0-CVE-2014-2277.patch,v 1.1 2014/03/11 18:40:27 civil Exp $) ) =~ s/^.*\s+(\d+)\/(\d+)\/(\d+).*$/$1$2$3/; # all one line for MakeMaker
@@ -235,35 +236,6 @@
return undef;
}
diff --git a/dev-php/ming-php/files/php_ext-config.m4 b/dev-php/ming-php/files/php_ext-config.m4
index 662b2d6..794d2cc 100644
--- a/dev-php/ming-php/files/php_ext-config.m4
+++ b/dev-php/ming-php/files/php_ext-config.m4
@@ -1,5 +1,5 @@
dnl
-dnl # $Id$
+dnl $Id$
dnl
PHP_LIBDIR=lib
diff --git a/dev-python/happydoc/files/happydoc-3.1-setup.py b/dev-python/happydoc/files/happydoc-3.1-setup.py
index 7fa2f65..56ae383 100644
--- a/dev-python/happydoc/files/happydoc-3.1-setup.py
+++ b/dev-python/happydoc/files/happydoc-3.1-setup.py
@@ -35,7 +35,7 @@ __rcs_info__ = {
# Creation Information
#
'module_name' : '$RCSfile: happydoc-3.1-setup.py,v $',
- 'rcs_id' : '# $Id$
+ 'rcs_id' : '$Id$',
'creator' : 'Doug Hellmann <doug@hellfly.net>',
'project' : 'HappyDoc',
'created' : 'Sat, 03-Feb-2001 12:51:26 EST',
diff --git a/dev-python/python-levenshtein/files/genextdoc.py b/dev-python/python-levenshtein/files/genextdoc.py
index 1f36ded..8692297 100644
--- a/dev-python/python-levenshtein/files/genextdoc.py
+++ b/dev-python/python-levenshtein/files/genextdoc.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
# Simple Python extension module doc generator.
-# @(#) # $Id$
+# @(#) $Id$
# Written by Yeti <yeti@physics.muni.cz>
# This program is in the public domain.
import re, sys, types, inspect
diff --git a/dev-util/lockrun/files/lockrun.c-20120508 b/dev-util/lockrun/files/lockrun.c-20120508
index c58b811..0b0034d 100644
--- a/dev-util/lockrun/files/lockrun.c-20120508
+++ b/dev-util/lockrun/files/lockrun.c-20120508
@@ -1,5 +1,5 @@
/*
- * # $Id$
+ * $Id$
*
* written by : Stephen J. Friedl
* Software Consultant
diff --git a/dev-util/yacc/files/yacc-1.9.1-CVE-2008-3196.patch b/dev-util/yacc/files/yacc-1.9.1-CVE-2008-3196.patch
index d859912..2fbb83c 100644
--- a/dev-util/yacc/files/yacc-1.9.1-CVE-2008-3196.patch
+++ b/dev-util/yacc/files/yacc-1.9.1-CVE-2008-3196.patch
@@ -13,7 +13,7 @@ Index: yacc-1.9.1/skeleton.c
+++ yacc-1.9.1/skeleton.c
@@ -18,6 +18,7 @@ char *banner[] =
"/*static char yysccsid[] = \"from: @(#)yaccpar 1.9 (Berkeley) 02/21/93\";*/",
- "static char yyrcsid[] = \"# $Id$
+ "static char yyrcsid[] = \"$Id: yacc-1.9.1-CVE-2008-3196.patch,v 1.1 2008/10/04 18:57:18 rbu Exp $\";",
"#endif",
+ "#include <string.h>",
"#define YYBYACC 1",
diff --git a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
index c782360..1853593 100644
--- a/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
+++ b/games-fps/quake2-icculus/files/quake2-icculus-0.16.1-alsa.patch
@@ -1,7 +1,7 @@
--- src/linux/snd_alsa.c.old
+++ src/linux/snd_alsa.c
@@ -22,13 +22,22 @@
- # $Id$
+ $Id: quake2-icculus-0.16.1-alsa.patch,v 1.2 2015/03/27 06:40:34 mr_bones_ Exp $
*/
-#define BUFFER_SIZE 4096
diff --git a/licenses/GPL-2-with-MySQL-FLOSS-exception b/licenses/GPL-2-with-MySQL-FLOSS-exception
index 98f58f8..3bc9093 100644
--- a/licenses/GPL-2-with-MySQL-FLOSS-exception
+++ b/licenses/GPL-2-with-MySQL-FLOSS-exception
@@ -96,7 +96,7 @@ redistribute a copy of the Program exclusively under the terms of the GPL by
removing the FLOSS Exception notice from that copy of the Program, provided
that the copy has never been modified by you or any third party.
-# $Id$
+$Id$
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
diff --git a/licenses/Opendylan b/licenses/Opendylan
index bd4fb2d..8416fb0 100644
--- a/licenses/Opendylan
+++ b/licenses/Opendylan
@@ -72,5 +72,5 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
---
-# $Id$
+$Id$
diff --git a/licenses/Stuffit b/licenses/Stuffit
index 13fbce6..0bdcf84 100644
--- a/licenses/Stuffit
+++ b/licenses/Stuffit
@@ -56,5 +56,5 @@ Server, multiple user and site licenses are available, please visit:
or contact: sales@aladdinsys.com
-# $Id$
+$Id$
diff --git a/licenses/URI b/licenses/URI
index 60bbb08..a368e51 100644
--- a/licenses/URI
+++ b/licenses/URI
@@ -1,5 +1,5 @@
- # $Id$
+ $Id$
(c) Copyright 1994-2000 by
The University of Rhode Island and The Massachusetts Institute of Technology
diff --git a/licenses/W3C-document b/licenses/W3C-document
index 3a40e64..1b18791 100644
--- a/licenses/W3C-document
+++ b/licenses/W3C-document
@@ -62,5 +62,5 @@ site-policy@w3.org.
Joseph Reagle <site-policy@w3.org>
-Last revised # $Id$
+Last revised $Id$
slesch Exp $
diff --git a/licenses/atheros-hal b/licenses/atheros-hal
index 151df6c..fa8b038 100644
--- a/licenses/atheros-hal
+++ b/licenses/atheros-hal
@@ -38,5 +38,5 @@ redistribution with changes.
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGES.
*
- * # $Id$
+ * $Id$
*/
diff --git a/licenses/codehaus-classworlds b/licenses/codehaus-classworlds
index 53eb2eb..a8e9a98 100644
--- a/licenses/codehaus-classworlds
+++ b/licenses/codehaus-classworlds
@@ -1,7 +1,7 @@
/*
- # $Id$
+ $Id$
Copyright 2002 (C) The Codehaus. All Rights Reserved.
diff --git a/licenses/codehaus-groovy b/licenses/codehaus-groovy
index 1e069f6..0f6cb23 100644
--- a/licenses/codehaus-groovy
+++ b/licenses/codehaus-groovy
@@ -1,7 +1,7 @@
/*
- # $Id$
+ $Id$
Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
diff --git a/mail-filter/procmail/files/procmail-prefix.patch b/mail-filter/procmail/files/procmail-prefix.patch
index 671b2d8..6063b92 100644
--- a/mail-filter/procmail/files/procmail-prefix.patch
+++ b/mail-filter/procmail/files/procmail-prefix.patch
@@ -83,7 +83,7 @@
+#! @GENTOO_PORTAGE_EPREFIX@/bin/sh
:
# Copyright (c) 1990-1997, S.R. van den Berg, The Netherlands
- ## $Id$
+ # $Id$
@@ -1416,20 +1416,10 @@
found=no
diff --git a/mail-mta/sendmail/files/sendmail-procmail.mc b/mail-mta/sendmail/files/sendmail-procmail.mc
index b916333..af994ae 100644
--- a/mail-mta/sendmail/files/sendmail-procmail.mc
+++ b/mail-mta/sendmail/files/sendmail-procmail.mc
@@ -1,7 +1,7 @@
divert(-1)
divert(0)dnl
include(`/usr/share/sendmail-cf/m4/cf.m4')dnl
-VERSIONID(`# $Id$
+VERSIONID(`$Id$')dnl
OSTYPE(linux)dnl
DOMAIN(generic)dnl
FEATURE(`smrsh',`/usr/sbin/smrsh')dnl
diff --git a/mail-mta/sendmail/files/sendmail.mc-r1 b/mail-mta/sendmail/files/sendmail.mc-r1
index a7360e6..dbc09b0 100644
--- a/mail-mta/sendmail/files/sendmail.mc-r1
+++ b/mail-mta/sendmail/files/sendmail.mc-r1
@@ -1,7 +1,7 @@
divert(-1)
divert(0)dnl
include(`/usr/share/sendmail-cf/m4/cf.m4')dnl
-VERSIONID(`# $Id$
+VERSIONID(`$Id$')dnl
OSTYPE(linux)dnl
DOMAIN(generic)dnl
FEATURE(`smrsh',`/usr/sbin/smrsh')dnl
diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch b/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch
index de0141f..20e5987 100644
--- a/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch
+++ b/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch
@@ -22,7 +22,7 @@ Subject: fix tiff build switch
+++ xpaint-2.9.10.2/rw/readWriteTIFF.c
@@ -14,6 +14,8 @@
- /* # $Id$
+ /* $Id$ */
+#ifdef HAVE_TIFF
+
diff --git a/media-video/dvbsnoop/files/dvbsnoop-1.4.50-crc32.patch b/media-video/dvbsnoop/files/dvbsnoop-1.4.50-crc32.patch
index f19a904..eb663a4 100644
--- a/media-video/dvbsnoop/files/dvbsnoop-1.4.50-crc32.patch
+++ b/media-video/dvbsnoop/files/dvbsnoop-1.4.50-crc32.patch
@@ -1,7 +1,7 @@
diff -rupN dvbsnoop-1.4.50-origdeb/src/misc/crc32.c dvbsnoop-1.4.50/src/misc/crc32.c
--- dvbsnoop-1.4.50-origdeb/src/misc/crc32.c 2006-01-02 21:24:04.000000000 +0200
+++ dvbsnoop-1.4.50/src/misc/crc32.c 2010-01-19 13:21:37.000000000 +0200
-@@ -17,14 +17,14 @@ # $Id$
+@@ -17,14 +17,14 @@ $Id$
@@ -34,7 +34,7 @@ diff -rupN dvbsnoop-1.4.50-origdeb/src/misc/crc32.c dvbsnoop-1.4.50/src/misc/crc
diff -rupN dvbsnoop-1.4.50-origdeb/src/misc/crc32.h dvbsnoop-1.4.50/src/misc/crc32.h
--- dvbsnoop-1.4.50-origdeb/src/misc/crc32.h 2006-01-02 21:24:04.000000000 +0200
+++ dvbsnoop-1.4.50/src/misc/crc32.h 2010-01-19 13:21:37.000000000 +0200
-@@ -19,8 +19,9 @@ # $Id$
+@@ -19,8 +19,9 @@ $Id$
#ifndef __CRC32_H
#define __CRC32_H
diff --git a/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch
index 34532b7..de9f4b9 100644
--- a/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch
+++ b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir.patch
@@ -96,7 +96,7 @@ diff -Naur vdr-2.0.7.orig/args.c vdr-2.0.7/args.c
+ *
+ * Original version written by Lars Hanisch <dvb@flensrocker.de>.
+ *
-+ * # $Id$
++ * $Id$
+ */
+
+#include "args.h"
@@ -229,7 +229,7 @@ diff -Naur vdr-2.0.7.orig/args.h vdr-2.0.7/args.h
+ *
+ * Original version written by Lars Hanisch <dvb@flensrocker.de>.
+ *
-+ * # $Id$
++ * $Id$
+ */
+
+#ifndef __ARGS_H
diff --git a/media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch
index 51886ab..f7bae16 100644
--- a/media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch
+++ b/media-video/vdr/files/vdr-2.0.7_systemd_argsdir_vanilla.patch
@@ -96,7 +96,7 @@ diff -Naur vdr-2.0.7.orig/args.c vdr-2.0.7/args.c
+ *
+ * Original version written by Lars Hanisch <dvb@flensrocker.de>.
+ *
-+ * # $Id$
++ * $Id$
+ */
+
+#include "args.h"
@@ -229,7 +229,7 @@ diff -Naur vdr-2.0.7.orig/args.h vdr-2.0.7/args.h
+ *
+ * Original version written by Lars Hanisch <dvb@flensrocker.de>.
+ *
-+ * # $Id$
++ * $Id$
+ */
+
+#ifndef __ARGS_H
diff --git a/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch b/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch
index 18ebebc..83d0a35 100644
--- a/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch
+++ b/net-analyzer/ipcad/files/ipcad-3.7.3-signal_h.patch
@@ -1,7 +1,7 @@
--- a/main.c
+++ b/main.c
@@ -26,6 +26,8 @@
- * # $Id$
+ * $Id$
*/
+#include <signal.h> /* signal */
@@ -12,7 +12,7 @@
--- a/pps.c
+++ b/pps.c
@@ -26,6 +26,7 @@
- * # $Id$
+ * $Id$
*/
+#include <signal.h> /* sigprocmask */
@@ -22,7 +22,7 @@
--- a/servers.c
+++ b/servers.c
@@ -26,6 +26,8 @@
- * # $Id$
+ * $Id$
*/
+#include <signal.h> /* pthread_kill and sigprocmask */
diff --git a/net-analyzer/nepenthes/files/nepenthes-0.2.2-curl_types_h.patch b/net-analyzer/nepenthes/files/nepenthes-0.2.2-curl_types_h.patch
index cce2b54..39a6026 100644
--- a/net-analyzer/nepenthes/files/nepenthes-0.2.2-curl_types_h.patch
+++ b/net-analyzer/nepenthes/files/nepenthes-0.2.2-curl_types_h.patch
@@ -1,7 +1,7 @@
--- a/modules/submit-http/submit-http.hpp
+++ b/modules/submit-http/submit-http.hpp
@@ -29,7 +29,6 @@
- /* # $Id$
+ /* $Id$ */
#include <curl/curl.h>
-#include <curl/types.h> /* new for v7 */
@@ -21,7 +21,7 @@
--- a/modules/submit-http/HTTPSession.hpp
+++ b/modules/submit-http/HTTPSession.hpp
@@ -29,7 +29,6 @@
- /* # $Id$
+ /* $Id$ */
#include <curl/curl.h>
-#include <curl/types.h>
@@ -31,7 +31,7 @@
--- a/modules/download-curl/download-curl.hpp
+++ b/modules/download-curl/download-curl.hpp
@@ -28,7 +28,6 @@
- /* # $Id$
+ /* $Id$ */
#include <curl/curl.h>
-#include <curl/types.h> /* new for v7 */
diff --git a/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch b/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch
index ebb58a1..5ab0ece 100644
--- a/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch
+++ b/net-analyzer/netcat6/files/netcat6-1.0-unix-sockets.patch
@@ -225,7 +225,7 @@
+#include <unistd.h>
+#include <limits.h>
+
-+RCSID("@(#) # $Id$");
++RCSID("@(#) $Id$");
+
+
+int unixsocket_connect(const struct addrinfo *hints,
diff --git a/net-analyzer/ssldump/files/ssldump-0.9-includes.patch b/net-analyzer/ssldump/files/ssldump-0.9-includes.patch
index fa3741b..8ca06dc 100644
--- a/net-analyzer/ssldump/files/ssldump-0.9-includes.patch
+++ b/net-analyzer/ssldump/files/ssldump-0.9-includes.patch
@@ -1,7 +1,7 @@
--- a/common/lib/r_assoc.c
+++ b/common/lib/r_assoc.c
@@ -57,6 +57,7 @@
- static char *RCSSTRING="# $Id$
+ static char *RCSSTRING="$Id$";
#include <r_common.h>
+#include <string.h> /* memcpy() memcmp() */
@@ -11,7 +11,7 @@
--- a/common/lib/r_bitfield.c
+++ b/common/lib/r_bitfield.c
@@ -11,6 +11,7 @@
- static char *RCSSTRING="# $Id$
+ static char *RCSSTRING="$Id$";
#include <r_common.h>
+#include <string.h> /* memcpy() memset() */
@@ -21,7 +21,7 @@
--- a/common/lib/r_data.c
+++ b/common/lib/r_data.c
@@ -47,6 +47,7 @@
- static char *RCSSTRING="# $Id$
+ static char *RCSSTRING="$Id$";
#include <r_common.h>
+#include <string.h> /* memcmp() memcpy() memset() */
diff --git a/net-dialup/pptpclient/files/pptp_fe.pl b/net-dialup/pptpclient/files/pptp_fe.pl
index 28f56cc..01d291c 100644
--- a/net-dialup/pptpclient/files/pptp_fe.pl
+++ b/net-dialup/pptpclient/files/pptp_fe.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl
#
-# # $Id$
+# $Id$
#
# pptp_fe.pl, privileged portion of xpptp_fe.pl
# Copyright (C) 2001 Smoot Carl-Mitchell (smoot@tic.com)
diff --git a/net-dialup/pptpclient/files/xpptp_fe.pl b/net-dialup/pptpclient/files/xpptp_fe.pl
index 59dd595..c43a93a 100644
--- a/net-dialup/pptpclient/files/xpptp_fe.pl
+++ b/net-dialup/pptpclient/files/xpptp_fe.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
#
-# # $Id$
+# $Id$
#
# xpptp_fe.pl.pl, graphical user interface for PPTP configuration
# Copyright (C) 2001 Smoot Carl-Mitchell (smoot@tic.com)
diff --git a/net-dialup/rp-l2tp/files/rp-l2tp-0.4-gentoo.patch b/net-dialup/rp-l2tp/files/rp-l2tp-0.4-gentoo.patch
index 022804f..1138b37 100644
--- a/net-dialup/rp-l2tp/files/rp-l2tp-0.4-gentoo.patch
+++ b/net-dialup/rp-l2tp/files/rp-l2tp-0.4-gentoo.patch
@@ -106,7 +106,7 @@ diff -Nru rp-l2tp-0.4.orig/man/l2tp.conf.5 rp-l2tp-0.4/man/l2tp.conf.5
--- rp-l2tp-0.4.orig/man/l2tp.conf.5 2007-04-15 13:30:55.000000000 +0300
+++ rp-l2tp-0.4/man/l2tp.conf.5 2007-04-15 13:29:18.000000000 +0300
@@ -1,13 +1,13 @@
- .\" # $Id$
+ .\" $Id$
.\" LIC: GPL
-.TH L2TP.CONF 5 "11 March 2002"
+.TH RP-L2TPD.CONF 5 "11 March 2002"
@@ -139,7 +139,7 @@ diff -Nru rp-l2tp-0.4.orig/man/l2tpd.8 rp-l2tp-0.4/man/l2tpd.8
--- rp-l2tp-0.4.orig/man/l2tpd.8 2007-04-15 13:30:55.000000000 +0300
+++ rp-l2tp-0.4/man/l2tpd.8 2007-04-15 13:29:18.000000000 +0300
@@ -1,14 +1,14 @@
- .\" # $Id$
+ .\" $Id$
.\" LIC: GPL
-.TH L2TPD 8 "11 March 2002"
+.TH RP-L2TPD 8 "11 March 2002"
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch
index 549b092..265d15d 100644
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.10-autotools.patch
@@ -95,7 +95,7 @@ diff -Nru rp-pppoe-3.10.orig/src/plugin.c rp-pppoe-3.10/src/plugin.c
+++ rp-pppoe-3.10/src/plugin.c 2008-06-30 22:27:18.000000000 +0200
@@ -27,7 +27,6 @@
static char const RCSID[] =
- "# $Id$
+ "$Id$";
-#define _GNU_SOURCE 1
#include "pppoe.h"
@@ -106,7 +106,7 @@ diff -Nru rp-pppoe-3.10.orig/src/relay.c rp-pppoe-3.10/src/relay.c
+++ rp-pppoe-3.10/src/relay.c 2008-06-30 22:27:18.000000000 +0200
@@ -17,8 +17,6 @@
static char const RCSID[] =
- "# $Id$
+ "$Id$";
-#define _GNU_SOURCE 1 /* For SA_RESTART */
-
diff --git a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-configure.patch b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-configure.patch
index 0fa6d99..054d419 100644
--- a/net-dialup/rp-pppoe/files/rp-pppoe-3.8-configure.patch
+++ b/net-dialup/rp-pppoe/files/rp-pppoe-3.8-configure.patch
@@ -50,7 +50,7 @@ diff -Nru rp-pppoe-3.8.orig/src/plugin.c rp-pppoe-3.8/src/plugin.c
+++ rp-pppoe-3.8/src/plugin.c 2007-01-05 00:08:41.000000000 +0200
@@ -27,7 +27,6 @@
static char const RCSID[] =
- "# $Id$
+ "$Id$";
-#define _GNU_SOURCE 1
#include "pppoe.h"
@@ -61,7 +61,7 @@ diff -Nru rp-pppoe-3.8.orig/src/relay.c rp-pppoe-3.8/src/relay.c
+++ rp-pppoe-3.8/src/relay.c 2007-01-05 00:08:46.000000000 +0200
@@ -17,8 +17,6 @@
static char const RCSID[] =
- "# $Id$
+ "$Id$";
-#define _GNU_SOURCE 1 /* For SA_RESTART */
-
diff --git a/net-dns/opendnssec/opendnssec-1.3.17.ebuild b/net-dns/opendnssec/opendnssec-1.3.17.ebuild
index 8969834..eddc1dd 100644
--- a/net-dns/opendnssec/opendnssec-1.3.17.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.3.17.ebuild
@@ -162,7 +162,7 @@ src_install() {
# Remove subversion tags from config files to avoid useless config updates
sed -i \
- -e '/<!-- \# $Id$
+ -e '/<!-- \$Id:/ d' \
"${ED}"/etc/opendnssec/* || die
# install update scripts
diff --git a/net-dns/opendnssec/opendnssec-1.3.18.ebuild b/net-dns/opendnssec/opendnssec-1.3.18.ebuild
index 8969834..eddc1dd 100644
--- a/net-dns/opendnssec/opendnssec-1.3.18.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.3.18.ebuild
@@ -162,7 +162,7 @@ src_install() {
# Remove subversion tags from config files to avoid useless config updates
sed -i \
- -e '/<!-- \# $Id$
+ -e '/<!-- \$Id:/ d' \
"${ED}"/etc/opendnssec/* || die
# install update scripts
diff --git a/net-dns/opendnssec/opendnssec-1.4.4.ebuild b/net-dns/opendnssec/opendnssec-1.4.4.ebuild
index 83be016..118902c 100644
--- a/net-dns/opendnssec/opendnssec-1.4.4.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.4.4.ebuild
@@ -144,7 +144,7 @@ src_install() {
# Remove subversion tags from config files to avoid useless config updates
sed -i \
- -e '/<!-- \# $Id$
+ -e '/<!-- \$Id:/ d' \
"${ED}"/etc/opendnssec/* || die
# install update scripts
diff --git a/net-dns/opendnssec/opendnssec-1.4.6.ebuild b/net-dns/opendnssec/opendnssec-1.4.6.ebuild
index 83be016..118902c 100644
--- a/net-dns/opendnssec/opendnssec-1.4.6.ebuild
+++ b/net-dns/opendnssec/opendnssec-1.4.6.ebuild
@@ -144,7 +144,7 @@ src_install() {
# Remove subversion tags from config files to avoid useless config updates
sed -i \
- -e '/<!-- \# $Id$
+ -e '/<!-- \$Id:/ d' \
"${ED}"/etc/opendnssec/* || die
# install update scripts
diff --git a/net-dns/pdnsd/files/pdnsd.conf.test b/net-dns/pdnsd/files/pdnsd.conf.test
index 929d0d7..aa351f7 100644
--- a/net-dns/pdnsd/files/pdnsd.conf.test
+++ b/net-dns/pdnsd/files/pdnsd.conf.test
@@ -1,4 +1,4 @@
-// # $Id$
+// $Id$
global {
perm_cache=512;
diff --git a/net-irc/bip/files/bip.vim b/net-irc/bip/files/bip.vim
index 1a94b4f..b99ad1b 100644
--- a/net-irc/bip/files/bip.vim
+++ b/net-irc/bip/files/bip.vim
@@ -1,5 +1,5 @@
" Vim filetype detection file for bip config files
"
-" # $Id$
+" $Id$
au BufNewFile,BufRead bip.conf set filetype=bip
diff --git a/net-misc/capiisdnmon/files/capiisdnmon-0.42-gcc44.patch b/net-misc/capiisdnmon/files/capiisdnmon-0.42-gcc44.patch
index 31e1340..e16dcee 100644
--- a/net-misc/capiisdnmon/files/capiisdnmon-0.42-gcc44.patch
+++ b/net-misc/capiisdnmon/files/capiisdnmon-0.42-gcc44.patch
@@ -2,7 +2,7 @@ diff -ur capiisdnmon-0.42.orig/capiinfo.cpp capiisdnmon-0.42/capiinfo.cpp
--- capiisdnmon-0.42.orig/capiinfo.cpp 2005-01-31 01:55:40.000000000 +0200
+++ capiisdnmon-0.42/capiinfo.cpp 2009-08-10 13:45:13.000000000 +0300
@@ -10,6 +10,7 @@
- static const char capiinfo_cpp[] = "# $Id$
+ static const char capiinfo_cpp[] = "$Id$";
#include "capiinfo.h"
+#include <stdio.h>
diff --git a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-gentoo.patch b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-gentoo.patch
index 1306584..75e5f69 100644
--- a/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-gentoo.patch
+++ b/net-misc/netkit-telnetd/files/netkit-telnetd-0.17-gentoo.patch
@@ -37,7 +37,7 @@ diff -r -u netkit-telnet-0.17_orig/telnet/network.cc netkit-telnet-0.17/telnet/n
+++ netkit-telnet-0.17/telnet/network.cc 2002-04-05 09:22:52.000000000 +0200
@@ -37,6 +37,7 @@
char net_rcsid[] =
- "# $Id$
+ "$Id$";
+#include <stdlib.h>
#include <sys/types.h>
diff --git a/net-print/cups/files/cups-1.7.2-systemd-socket-2.patch b/net-print/cups/files/cups-1.7.2-systemd-socket-2.patch
index 0ddef47..f4e8640 100644
--- a/net-print/cups/files/cups-1.7.2-systemd-socket-2.patch
+++ b/net-print/cups/files/cups-1.7.2-systemd-socket-2.patch
@@ -30,7 +30,7 @@ diff -ruN cups-1.7.2.orig/config-scripts/cups-systemd.m4 cups-1.7.2/config-scrip
+++ cups-1.7.2/config-scripts/cups-systemd.m4 2014-04-15 13:24:45.592054459 +0200
@@ -0,0 +1,36 @@
+dnl
-+dnl "# $Id$
++dnl "$Id$"
+dnl
+dnl systemd stuff for CUPS.
+
@@ -63,7 +63,7 @@ diff -ruN cups-1.7.2.orig/config-scripts/cups-systemd.m4 cups-1.7.2/config-scrip
+AC_SUBST(SDLIBS)
+
+dnl
-+dnl "# $Id$
++dnl "$Id$"
+dnl
diff -ruN cups-1.7.2.orig/config.h.in cups-1.7.2/config.h.in
--- cups-1.7.2.orig/config.h.in 2014-02-27 16:57:59.000000000 +0100
diff --git a/sci-biology/vienna-rna/files/vienna-rna-1.8.4-implicits.patch b/sci-biology/vienna-rna/files/vienna-rna-1.8.4-implicits.patch
index 3e9c803..c3f5b52 100644
--- a/sci-biology/vienna-rna/files/vienna-rna-1.8.4-implicits.patch
+++ b/sci-biology/vienna-rna/files/vienna-rna-1.8.4-implicits.patch
@@ -25,7 +25,7 @@ Fix implicit function declarations and attempt to free non-heap obj
+extern void init_pf_circ_fold(int length);
/*@unused@*/
- static char UNUSED rcsid[] = "# $Id$
+ static char UNUSED rcsid[] = "$Id$";
--- Cluster/AS_main.c
+++ Cluster/AS_main.c
@@ -1,6 +1,7 @@
--git a/sci-libs/cdd+/files/cdd+-077a-headers.patch b/sci-libs/cdd+/files/cdd+-077a-headers.patch
index f4e6709..c6ceb93 100644
--- a/sci-libs/cdd+/files/cdd+-077a-headers.patch
+++ b/sci-libs/cdd+/files/cdd+-077a-headers.patch
@@ -36,7 +36,7 @@ diff -u -p -r1.1.1.1 Rational.h
--- Rational.h 2008/12/15 01:19:52 1.1.1.1
+++ Rational.h 2008/12/15 01:27:08
@@ -17,6 +17,7 @@
- #define _POLYMAKE_GMP_RATIONAL_H "$Project: polymake $# $Id$
+ #define _POLYMAKE_GMP_RATIONAL_H "$Project: polymake $$Id$
#include <Integer.h>
+#include <cstring>
@@ -60,7 +60,7 @@ diff -u -p -r1.1.1.1 gmp_init.cc
--- gmp_init.cc 2008/12/15 01:19:52 1.1.1.1
+++ gmp_init.cc 2008/12/15 01:23:45
@@ -16,6 +16,7 @@
- #ident "$Project: polymake $# $Id$
+ #ident "$Project: polymake $$Id$
#include <memory>
+#include <cstring>
diff --git a/sci-libs/gdal/files/gdal-1.11.1-poppler-0.31.0-support.patch b/sci-libs/gdal/files/gdal-1.11.1-poppler-0.31.0-support.patch
index ce326b3..7700c24 100644
--- a/sci-libs/gdal/files/gdal-1.11.1-poppler-0.31.0-support.patch
+++ b/sci-libs/gdal/files/gdal-1.11.1-poppler-0.31.0-support.patch
@@ -21,7 +21,7 @@ diff -urpN gdal-1.11.1.orig/frmts/pdf/pdfio.cpp gdal-1.11.1/frmts/pdf/pdfio.cpp
+++ gdal-1.11.1/frmts/pdf/pdfio.cpp 2015-02-19 13:55:58.715589318 -0800
@@ -39,13 +39,25 @@
- CPL_CVSID("# $Id$
+ CPL_CVSID("$Id$");
+
+#ifdef POPPLER_BASE_STREAM_HAS_TWO_ARGS
diff --git a/sci-libs/libdap/files/libdap-3.11.3-gcc-4.7.patch b/sci-libs/libdap/files/libdap-3.11.3-gcc-4.7.patch
index 51cbc81..a0d411b 100644
--- a/sci-libs/libdap/files/libdap-3.11.3-gcc-4.7.patch
+++ b/sci-libs/libdap/files/libdap-3.11.3-gcc-4.7.patch
@@ -5,7 +5,7 @@ diff --git a/ResponseBuilder.cc b/ResponseBuilder.cc
index 1135678..0356172 100644
--- a/ResponseBuilder.cc
+++ b/ResponseBuilder.cc
-@@ -41,6 +41,7 @@ static char rcsid[] not_used = { "# $Id$
+@@ -41,6 +41,7 @@ static char rcsid[] not_used = { "$Id
#include <string>
#include <sstream>
#include <cstring>
diff --git a/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch b/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch
index daebe3d..a30aafc 100644
--- a/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch
+++ b/sci-libs/netcdf/files/netcdf-4.1.1-implicits.patch
@@ -63,7 +63,7 @@ Fix implicit function declarations
--- libncdap3/ncdap3.c
+++ libncdap3/ncdap3.c
@@ -4,6 +4,7 @@
- * # $Id$
+ * $Id$
*********************************************************************/
#include "config.h"
+#include "netcdf3.h"
diff --git a/sci-libs/shapelib/files/stdlib_include_fix.patch b/sci-libs/shapelib/files/stdlib_include_fix.patch
index 3cc16d7..ce0b575 100644
--- a/sci-libs/shapelib/files/stdlib_include_fix.patch
+++ b/sci-libs/shapelib/files/stdlib_include_fix.patch
@@ -2,7 +2,7 @@
+++ shpcreate.c 2009-09-15 20:20:31.310673754 -0700
@@ -51,6 +51,7 @@
static char rcsid[] =
- "# $Id$
+ "$Id$";
+#include <stdlib.h>
#include "shapefil.h"
@@ -12,7 +12,7 @@
+++ shpdump.c 2009-09-15 20:20:29.654673421 -0700
@@ -67,6 +67,7 @@
static char rcsid[] =
- "# $Id$
+ "$Id$";
+#include <stdlib.h>
#include "shapefil.h"
diff --git a/sci-misc/gt-itm/files/gt-itm-implicits.patch b/sci-misc/gt-itm/files/gt-itm-implicits.patch
index 16b742d..7618354 100644
--- a/sci-misc/gt-itm/files/gt-itm-implicits.patch
+++ b/sci-misc/gt-itm/files/gt-itm-implicits.patch
@@ -10,7 +10,7 @@
#include <assert.h>
@@ -31,6 +32,9 @@
- static char geogId[]="# $Id$
+ static char geogId[]="$Id$";
+long fdiam(Graph *g);
+void die(s);
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 78ac7b0..b8512d2 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -56,7 +56,7 @@ v_echo() {
env "$@"
}
-cvsver="# $Id$"
+cvsver="$Id$"
cvsver=${cvsver##*,v }
cvsver=${cvsver%%Exp*}
cvsyear=${cvsver#* }
diff --git a/sys-apps/gawk/files/filefuncs/filefuncs.c b/sys-apps/gawk/files/filefuncs/filefuncs.c
index 308154a..fcab2a6 100644
--- a/sys-apps/gawk/files/filefuncs/filefuncs.c
+++ b/sys-apps/gawk/files/filefuncs/filefuncs.c
@@ -30,7 +30,7 @@
* Copyright 1999-2004 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
* Author: Martin Schlemmer <azarah@gentoo.org>, Nov 2002
- * # $Id$
+ * $Id$
*
* Extended with: do_symlink()
* do_unlink()
diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh
index 591771e..6edaa3c 100644
--- a/sys-apps/less/files/lesspipe.sh
+++ b/sys-apps/less/files/lesspipe.sh
@@ -236,7 +236,7 @@ if [[ -z $1 ]] ; then
elif [[ $1 == "-V" || $1 == "--version" ]] ; then
Id="cvsid"
cat <<-EOF
- # $Id$
+ $Id$
Copyright 2001-2013 Gentoo Foundation
Mike Frysinger <vapier@gentoo.org>
(with plenty of ideas stolen from other projects/distros)
diff --git a/sys-apps/lshw/files/lshw-02.16b-gentoo.patch b/sys-apps/lshw/files/lshw-02.16b-gentoo.patch
index 8a3c573..dfd2c89 100644
--- a/sys-apps/lshw/files/lshw-02.16b-gentoo.patch
+++ b/sys-apps/lshw/files/lshw-02.16b-gentoo.patch
@@ -139,7 +139,7 @@
date --utc +%Y%m%d%H%M%S > $@
--- lshw-B.02.16.orig/src/core/pci.cc
+++ lshw-B.02.16/src/core/pci.cc
-@@ -17,7 +17,7 @@ __ID("@(#) # $Id$
+@@ -17,7 +17,7 @@ __ID("@(#) $Id
#define PROC_BUS_PCI "/proc/bus/pci"
#define SYS_BUS_PCI "/sys/bus/pci"
diff --git a/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff b/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff
index 432c16c..70edf2f 100644
--- a/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff
+++ b/sys-apps/zorroutils/files/zorroutils-0.04-20021014.diff
@@ -5,8 +5,8 @@ diff -Nru zorroutils-0.04.orig/zorro.ids zorroutils-0.04/zorro.ids
# Maintained by Geert Uytterhoeven <zorro@linux-m68k.org>
# If you have any new entries, please send them to the maintainer.
#
--# # $Id$
-+# # $Id$
+-# $Id$
++# $Id$
#
# Manufacturers and Products. Please keep sorted.
diff --git a/sys-auth/nss_ldap/files/nss_ldap-254-nss_getgrent_skipmembers.patch b/sys-auth/nss_ldap/files/nss_ldap-254-nss_getgrent_skipmembers.patch
index 1b51c1d..68809bc 100644
--- a/sys-auth/nss_ldap/files/nss_ldap-254-nss_getgrent_skipmembers.patch
+++ b/sys-auth/nss_ldap/files/nss_ldap-254-nss_getgrent_skipmembers.patch
@@ -4,7 +4,7 @@ diff -c -r nss_ldap-250/ChangeLog nss_ldap-250.1/ChangeLog
***************
*** 1,6 ****
--- 1,13 ----
- # $Id$
+ $Id$
===============================================================
+ 250.1 Paul B. Henson <henson@acm.org>
diff --git a/sys-auth/nss_ldap/files/nss_ldap-265-fbsd.patch b/sys-auth/nss_ldap/files/nss_ldap-265-fbsd.patch
index b527e3f..1ae1171 100644
--- a/sys-auth/nss_ldap/files/nss_ldap-265-fbsd.patch
+++ b/sys-auth/nss_ldap/files/nss_ldap-265-fbsd.patch
@@ -131,7 +131,7 @@
+++ ldap-pwd.c 2008-12-06 00:37:30.216966282 +0100
@@ -21,7 +21,10 @@
static char rcsId[] =
- "# $Id$
+ "$Id$";
+#include <sys/types.h>
+#include <unistd.h>
diff --git a/sys-auth/nss_ldap/nss_ldap-258.ebuild b/sys-auth/nss_ldap/nss_ldap-258.ebuild
index ff94a99..b086629 100644
--- a/sys-auth/nss_ldap/nss_ldap-258.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-258.ebuild
@@ -32,7 +32,7 @@ src_unpack() {
#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
sed -i.orig \
- -e '/^ @(#)\# $Id$
+ -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
"${S}"/ldap.conf || die "failed to clean up initial version marker"
# fix head/tail stuff
ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
diff --git a/sys-auth/nss_ldap/nss_ldap-259.ebuild b/sys-auth/nss_ldap/nss_ldap-259.ebuild
index 54f0b80..b4d3fbe 100644
--- a/sys-auth/nss_ldap/nss_ldap-259.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-259.ebuild
@@ -32,7 +32,7 @@ src_unpack() {
#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
sed -i.orig \
- -e '/^ @(#)\# $Id$
+ -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
"${S}"/ldap.conf || die "failed to clean up initial version marker"
# fix head/tail stuff
ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
diff --git a/sys-auth/nss_ldap/nss_ldap-261.ebuild b/sys-auth/nss_ldap/nss_ldap-261.ebuild
index e07b00e..823ea94 100644
--- a/sys-auth/nss_ldap/nss_ldap-261.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-261.ebuild
@@ -32,7 +32,7 @@ src_unpack() {
#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
sed -i.orig \
- -e '/^ @(#)\# $Id$
+ -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
"${S}"/ldap.conf || die "failed to clean up initial version marker"
# fix head/tail stuff
ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
diff --git a/sys-auth/nss_ldap/nss_ldap-262.ebuild b/sys-auth/nss_ldap/nss_ldap-262.ebuild
index e07b00e..823ea94 100644
--- a/sys-auth/nss_ldap/nss_ldap-262.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-262.ebuild
@@ -32,7 +32,7 @@ src_unpack() {
#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
sed -i.orig \
- -e '/^ @(#)\# $Id$
+ -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
"${S}"/ldap.conf || die "failed to clean up initial version marker"
# fix head/tail stuff
ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
diff --git a/sys-auth/nss_ldap/nss_ldap-264-r1.ebuild b/sys-auth/nss_ldap/nss_ldap-264-r1.ebuild
index 3cbe255..0f60d80 100644
--- a/sys-auth/nss_ldap/nss_ldap-264-r1.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-264-r1.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
sed -i.orig \
- -e '/^ @(#)\# $Id$
+ -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
"${S}"/ldap.conf || die "failed to clean up initial version marker"
# fix head/tail stuff
diff --git a/sys-auth/nss_ldap/nss_ldap-264.ebuild b/sys-auth/nss_ldap/nss_ldap-264.ebuild
index 5a59d49..5b4782b 100644
--- a/sys-auth/nss_ldap/nss_ldap-264.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-264.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
sed -i.orig \
- -e '/^ @(#)\# $Id$
+ -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
"${S}"/ldap.conf || die "failed to clean up initial version marker"
# fix head/tail stuff
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild
index cdec4c6..abd731b 100644
--- a/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
sed -i.orig \
- -e '/^ @(#)\# $Id$
+ -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
"${S}"/ldap.conf || die "failed to clean up initial version marker"
# fix head/tail stuff
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild
index 7efc83b..816c6f2 100644
--- a/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-265-r2.ebuild
@@ -46,7 +46,7 @@ src_prepare() {
EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
sed -i.orig \
- -e '/^ @(#)\# $Id$
+ -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
"${S}"/ldap.conf
# fix head/tail stuff
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r4.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r4.ebuild
index 01acea4..fadc3ca 100644
--- a/sys-auth/nss_ldap/nss_ldap-265-r4.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-265-r4.ebuild
@@ -46,7 +46,7 @@ src_prepare() {
EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
sed -i.orig \
- -e '/^ @(#)\# $Id$
+ -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
"${S}"/ldap.conf
# fix head/tail stuff
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
index 7b90022..01dd3ec 100644
--- a/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-265-r5.ebuild
@@ -50,7 +50,7 @@ src_prepare() {
EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
sed -i.orig \
- -e '/^ @(#)\# $Id$
+ -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
"${S}"/ldap.conf
# fix head/tail stuff
diff --git a/sys-auth/nss_ldap/nss_ldap-265.ebuild b/sys-auth/nss_ldap/nss_ldap-265.ebuild
index 9fc2d22..cc441c3 100644
--- a/sys-auth/nss_ldap/nss_ldap-265.ebuild
+++ b/sys-auth/nss_ldap/nss_ldap-265.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
sed -i.orig \
- -e '/^ @(#)\# $Id$
+ -e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
"${S}"/ldap.conf || die "failed to clean up initial version marker"
# fix head/tail stuff
diff --git a/sys-devel/binutils-config/files/binutils-config-1.9 b/sys-devel/binutils-config/files/binutils-config-1.9
index b521e53..8a371d4 100755
--- a/sys-devel/binutils-config/files/binutils-config-1.9
+++ b/sys-devel/binutils-config/files/binutils-config-1.9
@@ -334,7 +334,7 @@ while [[ $# -gt 0 ]] ; do
exit 0
;;
-V|--version)
- cvsver="# $Id$"
+ cvsver="$Id$"
cvsver=${cvsver##*binutils-config-}
bver=${cvsver%%,v *}
cvsver=${cvsver#* }
diff --git a/sys-devel/binutils-config/files/binutils-config-2 b/sys-devel/binutils-config/files/binutils-config-2
index 0d1e3ad..48b9d51 100755
--- a/sys-devel/binutils-config/files/binutils-config-2
+++ b/sys-devel/binutils-config/files/binutils-config-2
@@ -358,7 +358,7 @@ while [[ $# -gt 0 ]] ; do
;;
-V|--version)
unset Header
- cvsver="# $Id$"
+ cvsver="$Id$"
cvsver=${cvsver##*binutils-config-}
bver=${cvsver%%,v *}
cvsver=${cvsver#* }
diff --git a/sys-devel/binutils-config/files/binutils-config-3 b/sys-devel/binutils-config/files/binutils-config-3
index b1eb1d0..a9e9412 100755
--- a/sys-devel/binutils-config/files/binutils-config-3
+++ b/sys-devel/binutils-config/files/binutils-config-3
@@ -416,7 +416,7 @@ while [[ $# -gt 0 ]] ; do
-h|--help) usage 0 ;;
-V|--version)
unset Header
- cvsver="# $Id$"
+ cvsver="$Id$"
cvsver=${cvsver##*binutils-config-}
bver=${cvsver%%,v *}
cvsver=${cvsver#* }
diff --git a/sys-devel/binutils-config/files/binutils-config-4 b/sys-devel/binutils-config/files/binutils-config-4
index 4b4d872..18fc00d 100755
--- a/sys-devel/binutils-config/files/binutils-config-4
+++ b/sys-devel/binutils-config/files/binutils-config-4
@@ -384,7 +384,7 @@ while [[ $# -gt 0 ]] ; do
-h|--help) usage 0 ;;
-V|--version)
unset Header
- cvsver="# $Id$"
+ cvsver="$Id$"
cvsver=${cvsver##*binutils-config-}
bver=${cvsver%%,v *}
cvsver=${cvsver#* }
diff --git a/sys-devel/gcc-config/files/wrapper-1.5.1.c b/sys-devel/gcc-config/files/wrapper-1.5.1.c
index 4d8acec..e2e8029 100644
--- a/sys-devel/gcc-config/files/wrapper-1.5.1.c
+++ b/sys-devel/gcc-config/files/wrapper-1.5.1.c
@@ -1,7 +1,7 @@
/*
* Copyright 1999-2008 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * # $Id$
+ * $Id$
* Author: Martin Schlemmer <azarah@gentoo.org>
* az's lackey: Mike Frysinger <vapier@gentoo.org>
*/
diff --git a/sys-devel/gcc-config/files/wrapper-1.5.2.c b/sys-devel/gcc-config/files/wrapper-1.5.2.c
index 6ea1318..d83da30 100644
--- a/sys-devel/gcc-config/files/wrapper-1.5.2.c
+++ b/sys-devel/gcc-config/files/wrapper-1.5.2.c
@@ -1,7 +1,7 @@
/*
* Copyright 1999-2011 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * # $Id$
+ * $Id$
* Author: Martin Schlemmer <azarah@gentoo.org>
* az's lackey: Mike Frysinger <vapier@gentoo.org>
*/
diff --git a/sys-freebsd/freebsd-pam-modules/files/README.pamd b/sys-freebsd/freebsd-pam-modules/files/README.pamd
index 1b94e5b..10da6cc 100644
--- a/sys-freebsd/freebsd-pam-modules/files/README.pamd
+++ b/sys-freebsd/freebsd-pam-modules/files/README.pamd
@@ -60,4 +60,4 @@ particular service and module type may result in surprising behaviour.
To get the intended semantics, add a "required" entry listing the
pam_deny module at the end of the chain.
-# $Id$
+$Id$
diff --git a/sys-fs/e2fsprogs/files/fsck_ext2fs.8 b/sys-fs/e2fsprogs/files/fsck_ext2fs.8
index fdd20ab..54d269b 100644
--- a/sys-fs/e2fsprogs/files/fsck_ext2fs.8
+++ b/sys-fs/e2fsprogs/files/fsck_ext2fs.8
@@ -7,7 +7,7 @@
.\" License: This file may be redistributed in accordance with the terms
.\" of the GNU General Public License v2.
.\"
-.\" Upstream # $Id$
+.\" Upstream $Id$
.\" $FreeBSD: ports/sysutils/e2fsprogs/files/fsck_ext2fs.8,v 1.1 2006/07/04 15:47:51 leeym Exp $
.\"
.SH NAME
diff --git a/sys-fs/e2fsprogs/files/fsck_ext2fs.c b/sys-fs/e2fsprogs/files/fsck_ext2fs.c
index 624f652..c0a35de 100644
--- a/sys-fs/e2fsprogs/files/fsck_ext2fs.c
+++ b/sys-fs/e2fsprogs/files/fsck_ext2fs.c
@@ -6,7 +6,7 @@
*
* $FreeBSD: ports/sysutils/e2fsprogs/files/fsck_ext2fs.c,v 1.5 2006/07/04 15:47:51 leeym Exp $
*
- * Upstream: # $Id$
+ * Upstream: $Id$
*
* format: gindent -kr
*/
diff --git a/sys-fs/hfsutils/files/largerthan2gb.patch b/sys-fs/hfsutils/files/largerthan2gb.patch
index f9061d4..a688ff6 100644
--- a/sys-fs/hfsutils/files/largerthan2gb.patch
+++ b/sys-fs/hfsutils/files/largerthan2gb.patch
@@ -1,7 +1,7 @@
--- libhfs/os/unix.c-orig 1998-11-02 23:09:13.000000000 +0100
+++ libhfs/os/unix.c 2004-12-13 14:39:28.099124272 +0100
@@ -19,6 +19,11 @@
- * # $Id$
+ * $Id$
*/
+#ifdef __linux__
diff --git a/sys-process/pidof-bsd/files/pidof-bsd-20050501-gfbsd.patch b/sys-process/pidof-bsd/files/pidof-bsd-20050501-gfbsd.patch
index 4dad4ad..bb7a776 100644
--- a/sys-process/pidof-bsd/files/pidof-bsd-20050501-gfbsd.patch
+++ b/sys-process/pidof-bsd/files/pidof-bsd-20050501-gfbsd.patch
@@ -9,7 +9,7 @@ diff -u -r1.4 pidof.c
--- pidof.c 1 May 2005 16:26:19 -0000 1.4
+++ pidof.c 13 Sep 2005 16:11:08 -0000
@@ -26,6 +26,7 @@
- * # $Id$
+ * $Id$
*/
+#include <unistd.h>
diff --git a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-s4u2proxy.patch b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-s4u2proxy.patch
index 71bf464..eb13600 100644
--- a/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-s4u2proxy.patch
+++ b/www-apache/mod_auth_kerb/files/mod_auth_kerb-5.4-s4u2proxy.patch
@@ -37,7 +37,7 @@ KrbConstrainedDelegation. The default is off.
+
+The module itself will obtain and manage the necessary credentials.
+
- # $Id$
+ $Id$
diff -up --recursive mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.4/src/mod_auth_kerb.c
--- mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c 2011-12-09 17:55:05.000000000 -0500
+++ mod_auth_kerb-5.4/src/mod_auth_kerb.c 2012-03-01 14:19:40.000000000 -0500
@@ -70,7 +70,7 @@ diff -up --recursive mod_auth_kerb-5.4.orig/src/mod_auth_kerb.c mod_auth_kerb-5.
+ * Copyright (C) 2012 Red Hat
+ */
+
- #ident "# $Id$
+ #ident "$Id$"
#include "config.h"
@@ -49,6 +74,7 @@
diff --git a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-gentoo.patch b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-gentoo.patch
index 202b3b8..7501ba1 100644
--- a/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-gentoo.patch
+++ b/www-apps/freeradius-dialupadmin/files/freeradius-dialupadmin-1.80-gentoo.patch
@@ -2,7 +2,7 @@ diff -Nru freeradius-server-2.1.1.orig/dialup_admin/Makefile freeradius-server-2
--- freeradius-server-2.1.1.orig/dialup_admin/Makefile 2008-10-12 10:13:16.000000000 +0000
+++ freeradius-server-2.1.1/dialup_admin/Makefile 2008-10-12 10:16:16.000000000 +0000
@@ -4,7 +4,6 @@
- # Version: # $Id$
+ # Version: $Id$
#
-include ../Make.inc
diff --git a/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch b/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch
index e065519..0034c80 100644
--- a/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch
+++ b/www-servers/varnish/files/varnish-3.0.4-fix-automake-1.13.patch
@@ -2,7 +2,7 @@ diff -Naur varnish-3.0.4.orig/configure.ac varnish-3.0.4/configure.ac
--- varnish-3.0.4.orig/configure.ac 2013-06-14 04:39:32.000000000 -0400
+++ varnish-3.0.4/configure.ac 2013-06-21 08:48:32.000000000 -0400
@@ -4,7 +4,7 @@
- AC_REVISION([# $Id$
+ AC_REVISION([$Id: varnish-3.0.4-fix-automake-1.13.patch,v 1.1 2013/06/21 12:51:35 blueness Exp $])
AC_INIT([Varnish], [3.0.4], [varnish-dev@varnish-cache.org])
AC_CONFIG_SRCDIR(include/varnishapi.h)
-AM_CONFIG_HEADER(config.h)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2015-08-08 22:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-08 22:35 [gentoo-commits] proj/gentoo-PENDING:master commit in: net-analyzer/ssldump/files/, dev-lisp/ecls/files/, media-video/dvbsnoop/files/, Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox