ver bump 35224

6 files changed, 57 insertions, 12 deletions

diff --git a/net-analyzer/sonar/ChangeLog b/net-analyzer/sonar/ChangeLog
index 7c373084d66d..a1dc0c3ee1d5 100644
--- a/net-analyzer/sonar/ChangeLog
+++ b/net-analyzer/sonar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/sonar
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sonar/ChangeLog,v 1.3 2003/10/31 16:01:44 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sonar/ChangeLog,v 1.4 2003/12/12 00:31:28 vapier Exp $
+
+*sonar-1.2.1 (11 Dec 2003)
+
+  11 Dec 2003; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage #35224.
 
 *sonar-1.2.0 (31 Oct 2003)
 
diff --git a/net-analyzer/sonar/files/1.2.0-doc.patch b/net-analyzer/sonar/files/1.2.0-doc.patch
deleted file mode 100644
index 9d0c75a38df3..000000000000
--- a/net-analyzer/sonar/files/1.2.0-doc.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- configure.orig	2003-10-02 14:07:24.800745392 -0400
-+++ configure	2003-10-02 14:07:32.488576664 -0400
-@@ -8027 +8027 @@
--  test -z "$ac_cv_prog_DOXYGEN" && ac_cv_prog_DOXYGEN="/bin/false"
-+  test -z "$ac_cv_prog_DOXYGEN" && ac_cv_prog_DOXYGEN="/bin/true"
diff --git a/net-analyzer/sonar/files/1.2.1-libtool.patch b/net-analyzer/sonar/files/1.2.1-libtool.patch
new file mode 100644
index 000000000000..77c8b09ef4a2
--- /dev/null
+++ b/net-analyzer/sonar/files/1.2.1-libtool.patch
@@ -0,0 +1,48 @@
+*** libltdl/configure.old	Sat Dec  6 14:03:58 2003
+--- libltdl/configure	Sat Dec  6 14:10:26 2003
+*************** build=NONE
+*** 197,202 ****
+--- 197,203 ----
+  cache_file=./config.cache
+  exec_prefix=NONE
+  host=NONE
++ host_alias=NONE
+  no_create=
+  nonopt=NONE
+  no_recursion=
+*************** EOF
+*** 368,374 ****
+      ac_prev=host ;;
+    -host=* | --host=* | --hos=* | --ho=*)
+      host="$ac_optarg" ;;
+! 
+    -includedir | --includedir | --includedi | --included | --include \
+    | --includ | --inclu | --incl | --inc)
+      ac_prev=includedir ;;
+--- 369,376 ----
+      ac_prev=host ;;
+    -host=* | --host=* | --hos=* | --ho=*)
+      host="$ac_optarg" ;;
+!   -host_alias=* | --host_alias=* )
+!     host_alias="$ac_optarg" ;;
+    -includedir | --includedir | --includedi | --included | --include \
+    | --includ | --inclu | --incl | --inc)
+      ac_prev=includedir ;;
+*************** EOF
+*** 556,562 ****
+  
+    -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+      ;;
+! 
+    *)
+      if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+        echo "configure: warning: $ac_option: invalid host type" 1>&2
+--- 558,565 ----
+  
+    -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
+      ;;
+!   CC* | CFLAGS* | CXXFLAGS*)
+!     ;;
+    *)
+      if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
+        echo "configure: warning: $ac_option: invalid host type" 1>&2
diff --git a/net-analyzer/sonar/files/digest-sonar-1.2.0 b/net-analyzer/sonar/files/digest-sonar-1.2.0
deleted file mode 100644
index 79b3cca06b42..000000000000
--- a/net-analyzer/sonar/files/digest-sonar-1.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ac6ea84b1a2b52877f40f0630888a827 sonar-1.2.0.tar.bz2 206255
diff --git a/net-analyzer/sonar/files/digest-sonar-1.2.1 b/net-analyzer/sonar/files/digest-sonar-1.2.1
new file mode 100644
index 000000000000..c67528433d30
--- /dev/null
+++ b/net-analyzer/sonar/files/digest-sonar-1.2.1
@@ -0,0 +1 @@
+MD5 ed95b5f44b7bdf43e867d799dc8bf615 sonar-1.2.1.tar.bz2 302203
diff --git a/net-analyzer/sonar/sonar-1.2.0.ebuild b/net-analyzer/sonar/sonar-1.2.1.ebuild
index ec7a06f05f32..1cf63369513c 100644
--- a/net-analyzer/sonar/sonar-1.2.0.ebuild
+++ b/net-analyzer/sonar/sonar-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sonar/sonar-1.2.0.ebuild,v 1.3 2003/10/31 16:01:44 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sonar/sonar-1.2.1.ebuild,v 1.1 2003/12/12 00:31:29 vapier Exp $
 
 inherit gcc eutils
 
@@ -20,13 +20,10 @@ DEPEND="virtual/glibc
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-doc.patch
+	epatch ${FILESDIR}/${PV}-libtool.patch
 }
 
 src_install() {
-	#Need to be done for patch to install
-	mkdir ${S}/doc/html
-
 	make install DESTDIR=${D} || die
 	dodoc ChangeLog README AUTHORS CONTRIB NEWS
 	dohtml doc/html/*