Thanks to Jalan who pointed out that a couple of files got left behind

  after removing the referencing ebuilds (bug #340102)
(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 6 insertions, 286 deletions

diff --git a/app-admin/ulogd/ChangeLog b/app-admin/ulogd/ChangeLog
index 34fbc13adb92..94dfe2a02647 100644
--- a/app-admin/ulogd/ChangeLog
+++ b/app-admin/ulogd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/ulogd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.64 2010/10/07 05:31:53 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/ulogd/ChangeLog,v 1.65 2010/10/15 19:33:54 wormo Exp $
+
+  15 Oct 2010; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  -files/ulogd-1.23-configure.in.patch, -files/configure-fixes.patch:
+  Thanks to Jalan who pointed out that a couple of files got left behind
+  after removing the referencing ebuilds (bug #340102)
 
 *ulogd-2.0.0_beta4 (07 Oct 2010)
 
diff --git a/app-admin/ulogd/files/configure-fixes.patch b/app-admin/ulogd/files/configure-fixes.patch
deleted file mode 100644
index 206404445ece..000000000000
--- a/app-admin/ulogd/files/configure-fixes.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- configure.in.orig	2007-01-21 15:37:46.000000000 +0100
-+++ configure.in	2007-01-22 21:23:34.000000000 +0100
-@@ -34,14 +34,14 @@
- dnl
- dnl test for MySQL
- dnl
--AC_ARG_WITH(mysql,
-- --with-mysql=<directory>		mysql installed in <directory>,[
--if test $withval != yes
--then
-+AC_ARG_WITH(mysql, AS_HELP_STRING([--with-mysql=<directory>],[mysql installed in <directory>]),[with_mysql=$withval
-+],[with_mysql=no])
-+if test $withval != yes -a $withval != no ; then
-         dir=$withval
- else
-         dir="/usr/local"
- fi
-+if test $withval != no; then
- mysqldir=""
- AC_MSG_CHECKING(for MySQL files)
- for d in $dir /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql
-@@ -108,8 +108,7 @@
- 	fi
- 
- fi      
--])      
--
-+fi
- 
- dnl
- dnl Check whether the user wants log IP-addresses as strings rather
-@@ -130,14 +129,16 @@
- dnl
- dnl test for PostgreSQL
- dnl
--AC_ARG_WITH(pgsql,
-- --with-pgsql=<directory>		pgsql installed in <directory>,[
--if test $withval != yes
-+
-+AC_ARG_WITH(pgsql, AS_HELP_STRING([--with-pgsql=<directory>],[pgsql installed in <directory>]),[with_mysql=$withval],[with_mysql=no])
-+if test $withval != yes -a $withval != no
- then
-         dir=$withval
- else
-         dir="/usr/local"
- fi
-+if test $withval = yes
-+then
- pgsqldir=""
- AC_MSG_CHECKING(for PGSQL files)
- for d in $dir /usr /usr/local /usr/local/pgsql /opt/pgsql /opt/packages/pgsql
-@@ -181,7 +182,7 @@
- 	AC_SUBST(PGSQL_LIB)
- 
- fi      
--])      
-+fi      
- 
- dnl
- dnl Check whether the user wants to log IP-addresses as strings rather
diff --git a/app-admin/ulogd/files/ulogd-1.23-configure.in.patch b/app-admin/ulogd/files/ulogd-1.23-configure.in.patch
deleted file mode 100644
index c6df5e0aedfa..000000000000
--- a/app-admin/ulogd/files/ulogd-1.23-configure.in.patch
+++ /dev/null
@@ -1,225 +0,0 @@
---- configure.in.orig	2005-02-16 16:23:32.000000000 +0500
-+++ configure.in	2008-01-25 23:42:04.000000000 +0500
-@@ -34,18 +34,18 @@
- dnl
- dnl test for MySQL
- dnl
--AC_ARG_WITH(mysql,
-- --with-mysql=<directory>		mysql installed in <directory>,[
--if test $withval != yes
--then
--        dir=$withval
--else
--        dir="/usr/local"
--fi
--mysqldir=""
-+AC_ARG_WITH(mysql, 
-+  AS_HELP_STRING([--with-mysql=DIR], [mysql installed in DIR]),
-+  [],
-+  [with_mysql=no])
-+
- AC_MSG_CHECKING(for MySQL files)
--for d in $dir /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql
--do
-+mysqldir=""
-+if test "$with_mysql" = no; then
-+  AC_MSG_RESULT(disabled)
-+else
-+  for d in $with_mysql /usr /usr/local /usr/local/mysql /opt/mysql /opt/packages/mysql
-+  do
-         if test -f $d/lib/mysql/libmysqlclient.so
-         then
-                 AC_MSG_RESULT(found mysql in $d)
-@@ -59,12 +59,12 @@
-                 mysqldir_suffix=
-                 break
-         fi
--done
-+  done
- 
--if test x$mysqldir = x
--then
-+  if test x$mysqldir = x
-+  then
-         AC_MSG_WARN(MySQL backend not used)
--else
-+  else
-         AC_DEFINE(HAVE_MYSQL)
-         MYSQLINCLUDES=${mysqldir}/include${mysqldir_suffix}
-         MYSQLLIBS=${mysqldir}/lib${mysqldir_suffix}
-@@ -107,8 +107,8 @@
- 		AC_MSG_RESULT(found new MySQL)
- 	fi
- 
--fi      
--])      
-+  fi      
-+fi
- 
- 
- dnl
-@@ -117,31 +117,31 @@
- dnl feature is only used in ulogd_MYSQL.c, there are no checks in any
- dnl way.
- dnl
--
- AC_ARG_WITH(mysql-log-ip-as-string,
-- --with-mysql-log-ip-as-string		log IPs as string rather than as
--					unsigned long-integer.
--,[
--   EXTRA_MYSQL_DEF="${EXTRA_MYSQL_DEF} -DIP_AS_STRING=1"
--   AC_MSG_WARN(the use of --with-mysql-log-ip-as-string is discouraged)
--])
-+  AS_HELP_STRING([--with-mysql-log-ip-as-string],
-+    [log IPs as string rather than as unsigned long-integer]),
-+  [
-+    EXTRA_MYSQL_DEF="${EXTRA_MYSQL_DEF} -DIP_AS_STRING=1"
-+    AC_MSG_WARN(the use of --with-mysql-log-ip-as-string is discouraged)
-+  ])
- 
- 
- dnl
- dnl test for PostgreSQL
- dnl
--AC_ARG_WITH(pgsql,
-- --with-pgsql=<directory>		pgsql installed in <directory>,[
--if test $withval != yes
-+AC_ARG_WITH(pgsql, 
-+  AS_HELP_STRING([--with-pgsql=DIR],[pgsql installed in DIR]),
-+  [],
-+  [with_pgsql=no])
-+  
-+AC_MSG_CHECKING(for PGSQL files)
-+pgsqldir=""
-+if test $with_pgsql = no
- then
--        dir=$withval
-+  AC_MSG_RESULT(disabled)
- else
--        dir="/usr/local"
--fi
--pgsqldir=""
--AC_MSG_CHECKING(for PGSQL files)
--for d in $dir /usr /usr/local /usr/local/pgsql /opt/pgsql /opt/packages/pgsql
--do
-+  for d in $with_pgsql /usr /usr/local /usr/local/pgsql /opt/pgsql /opt/packages/pgsql
-+  do
-         if test -f $d/lib/pgsql/libpq.so
-         then
-                 AC_MSG_RESULT(found pgsql in $d)
-@@ -153,12 +153,11 @@
-                 pgsqldir=$d
-                 break
-         fi
--done
-+  done
- 
--if test x$pgsqldir = x
--then
-+  if test x$pgsqldir = x; then
-         AC_MSG_WARN(PGSQL backend not used)
--else
-+  else
-         AC_DEFINE(HAVE_PGSQL)
- 	for i in include include/postgresql include/pgsql
- 	do
-@@ -180,36 +179,34 @@
- 	AC_SUBST(PGSQLINCLUDES)
- 	AC_SUBST(PGSQL_LIB)
- 
-+  fi      
- fi      
--])      
- 
- dnl
- dnl Check whether the user wants to log IP-addresses as strings rather
- dnl than integers to his pgsql-database.
- dnl
--
- AC_ARG_WITH(pgsql-log-ip-as-string,
-- --with-pgsql-log-ip-as-string		log IPs as string rather than as interger
--,[
--   EXTRA_PGSQL_DEF="-DIP_AS_STRING=1"
--])
--
-+  AS_HELP_STRING([--with-pgsql-log-ip-as-string],
-+    [log IPs as string rather than as integer]),
-+  [EXTRA_PGSQL_DEF="-DIP_AS_STRING=1"])
- 
- dnl
- dnl test for sqlite3
- dnl
- AC_ARG_WITH(sqlite3,
-- --with-sqlite3=<directory>		sqlite3 installed in <directory>,[
--if test $withval != yes
-+  AS_HELP_STRING([--with-sqlite3=DIR],[sqlite3 installed in DIR]),
-+  [],
-+  [with_sqlite3=no])
-+  
-+AC_MSG_CHECKING(for sqlite3 files)
-+sqlite3dir=""
-+if test $with_sqlite3 = no
- then
--        dir=$withval
-+  AC_MSG_RESULT(disabled)
- else
--        dir="/usr/local"
--fi
--mysqldir=""
--AC_MSG_CHECKING(for sqlite3 files)
--for d in $dir /usr /usr/local /usr/local/sqlite3
--do
-+  for d in $with_sqlite3 /usr /usr/local /usr/local/sqlite3
-+  do
-         if test -f $d/lib/sqlite3/libsqlite3.so
-         then
-                 AC_MSG_RESULT(found sqlite3 in $d)
-@@ -223,12 +220,12 @@
-                 sqlite3dir_suffix=
-                 break
-         fi
--done
-+  done
- 
--if test x$sqlite3dir = x
--then
-+  if test x$sqlite3dir = x
-+  then
-         AC_MSG_WARN(sqlite3 backend not used)
--else
-+  else
-         AC_DEFINE(HAVE_SQLITE3)
-         SQLITE3INCLUDES=${sqlite3dir}/include${sqlite3dir_suffix}
-         SQLITE3LIBS=${sqlite3dir}/lib${sqlite3dir_suffix}
-@@ -246,8 +243,8 @@
- 	AC_SUBST(SQLITE3INCLUDES)
- 	AC_SUBST(SQLITE3_LIB)
- 
--fi      
--])      
-+  fi      
-+fi
- 
- 
- dnl
-@@ -256,14 +253,13 @@
- dnl feature is only used in ulogd_SQLITE3.c, there are no checks in any
- dnl way.
- dnl
--
- AC_ARG_WITH(sqlite3-log-ip-as-string,
-- --with-sqlite3-log-ip-as-string		log IPs as string rather than as
--						unsigned long-integer.
--,[
--   EXTRA_SQLITE3_DEF="${EXTRA_SQLITE3_DEF} -DIP_AS_STRING=1"
--   AC_MSG_WARN(the use of --with-sqlite3-log-ip-as-string is discouraged)
--])
-+  AS_HELP_STRING([--with-sqlite3-log-ip-as-string],
-+    [log IPs as string rather than as unsigned long-integer]),
-+  [
-+    EXTRA_SQLITE3_DEF="${EXTRA_SQLITE3_DEF} -DIP_AS_STRING=1"
-+    AC_MSG_WARN(the use of --with-sqlite3-log-ip-as-string is discouraged)
-+  ])
- 
- 
- AC_SUBST(DATABASE_DIR)