net-misc/mugshot: Version bump

svn path=/sunrise/; revision=2891

7 files changed, 114 insertions, 115 deletions

diff --git a/net-misc/mugshot/ChangeLog b/net-misc/mugshot/ChangeLog
index 80ae5f3ae..5f046453f 100644
--- a/net-misc/mugshot/ChangeLog
+++ b/net-misc/mugshot/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Feb 2007; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  -mugshot-1.1.30.ebuild, -files/mugshot-1.1.30-use-firefox.patch,
+  +mugshot-1.1.32.ebuild, +files/mugshot-1.1.32-use-firefox.patch:
+  Version bump
+
   21 Dec 2006; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
   -files/mugshot-1.1.24-use-firefox.patch, -mugshot-1.1.28.ebuild,
   +mugshot-1.1.30.ebuild, +files/mugshot-1.1.30-use-firefox.patch:
diff --git a/net-misc/mugshot/Manifest b/net-misc/mugshot/Manifest
index 29dac976b..e380a314e 100644
--- a/net-misc/mugshot/Manifest
+++ b/net-misc/mugshot/Manifest
@@ -6,23 +6,23 @@ AUX mugshot-1.1.26-firefox-update.sh 809 RMD160 34e8d0f95c91ca9c94338ea0d637e2c7
 MD5 73ccc232a47542aed0fae8c9d43f1c9c files/mugshot-1.1.26-firefox-update.sh 809
 RMD160 34e8d0f95c91ca9c94338ea0d637e2c77d9bc392 files/mugshot-1.1.26-firefox-update.sh 809
 SHA256 afa2230aa865ffc8a86cc88988101fab7f5fd76c7495769449d4d96bccedc121 files/mugshot-1.1.26-firefox-update.sh 809
-AUX mugshot-1.1.30-use-firefox.patch 3667 RMD160 a5580bae6b5b28e81a2c942195e66105e1f0064c SHA1 1480c5035f30ed54a660f47c56cf6a696b8978f8 SHA256 ec7eddaccaf41088683fd03811fff041e4e302c2e1e509147ff5a9ba0e63cfbb
-MD5 4e29d5b0d0a311ce6dbb76c7b389bb28 files/mugshot-1.1.30-use-firefox.patch 3667
-RMD160 a5580bae6b5b28e81a2c942195e66105e1f0064c files/mugshot-1.1.30-use-firefox.patch 3667
-SHA256 ec7eddaccaf41088683fd03811fff041e4e302c2e1e509147ff5a9ba0e63cfbb files/mugshot-1.1.30-use-firefox.patch 3667
-DIST mugshot-1.1.30.tar.gz 738440 RMD160 8bb248b50e785c8e392d6513d5d606e6d358de0d SHA1 c17f83b3585a3be337d042bf2b28be89d532d3da SHA256 8faafba70464046e765661f09ef3759a996154d9e6f8ba59c90545262f009398
-EBUILD mugshot-1.1.30.ebuild 1854 RMD160 e31fcb35871d827c712876366d402530ab6e26c6 SHA1 6a01eb19015d6ef1fe9b4528fbd6aba51791968e SHA256 c938b46fc075a23acd50f5ee41386325e5750d1e3448ce9616631b21db3d58a1
-MD5 4e21a60a0bf270b527c08ec78325f5b5 mugshot-1.1.30.ebuild 1854
-RMD160 e31fcb35871d827c712876366d402530ab6e26c6 mugshot-1.1.30.ebuild 1854
-SHA256 c938b46fc075a23acd50f5ee41386325e5750d1e3448ce9616631b21db3d58a1 mugshot-1.1.30.ebuild 1854
-MISC ChangeLog 1013 RMD160 afc8d65d4356c24d069234c4a40d7aaf83cba870 SHA1 963f9fe324ce373f7ef8345750bb673066a7edac SHA256 4d253eceb3c39160a77cd18cd8e6f480fa85ba3424a70491bdeed4f8e41c8676
-MD5 b85402867b505e398090ec881c4d851d ChangeLog 1013
-RMD160 afc8d65d4356c24d069234c4a40d7aaf83cba870 ChangeLog 1013
-SHA256 4d253eceb3c39160a77cd18cd8e6f480fa85ba3424a70491bdeed4f8e41c8676 ChangeLog 1013
+AUX mugshot-1.1.32-use-firefox.patch 3498 RMD160 6598b1078ae85d53739cc89924345be23a895d29 SHA1 aec618ba4c01aaf38d5daab9ee4e6ecdedfa16bb SHA256 e0b95075b98e8d622d47539ef084418e0a0fa6b6289176e6c09b41115b757813
+MD5 f4d93c0a1fc6098de0fd3907d51080e8 files/mugshot-1.1.32-use-firefox.patch 3498
+RMD160 6598b1078ae85d53739cc89924345be23a895d29 files/mugshot-1.1.32-use-firefox.patch 3498
+SHA256 e0b95075b98e8d622d47539ef084418e0a0fa6b6289176e6c09b41115b757813 files/mugshot-1.1.32-use-firefox.patch 3498
+DIST mugshot-1.1.32.tar.gz 785713 RMD160 f92679d78f155688e6d5e3b3ec8f2163484a23ce SHA1 772517d2deba4fa2da888869bf54304c3d7b1cc1 SHA256 396bdf70aa4643c40589d8253cf1500b1a4a36beacf574885463883fc0022aeb
+EBUILD mugshot-1.1.32.ebuild 1854 RMD160 e31fcb35871d827c712876366d402530ab6e26c6 SHA1 6a01eb19015d6ef1fe9b4528fbd6aba51791968e SHA256 c938b46fc075a23acd50f5ee41386325e5750d1e3448ce9616631b21db3d58a1
+MD5 4e21a60a0bf270b527c08ec78325f5b5 mugshot-1.1.32.ebuild 1854
+RMD160 e31fcb35871d827c712876366d402530ab6e26c6 mugshot-1.1.32.ebuild 1854
+SHA256 c938b46fc075a23acd50f5ee41386325e5750d1e3448ce9616631b21db3d58a1 mugshot-1.1.32.ebuild 1854
+MISC ChangeLog 1233 RMD160 634b0c14750d0100181d602003f5579af055e2a2 SHA1 63b300904c0482328e0514e0a675d6537fe98881 SHA256 96ac9fa7157af5d15282e97ab69eb198735a6eb18d9d7573feb02ffad6bd102c
+MD5 8d577d32beed7ad690be7fb0feaa256f ChangeLog 1233
+RMD160 634b0c14750d0100181d602003f5579af055e2a2 ChangeLog 1233
+SHA256 96ac9fa7157af5d15282e97ab69eb198735a6eb18d9d7573feb02ffad6bd102c ChangeLog 1233
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42 metadata.xml 170
-MD5 fdb7c5e9a08b0b02b293ff663c237113 files/digest-mugshot-1.1.30 244
-RMD160 86b598fdf6d5db3101860106c4077ed3ea3c1383 files/digest-mugshot-1.1.30 244
-SHA256 0d27a43996fd36b606f847c34c65f5bf2f0de3d1ee1928c8955192a3b2256aa1 files/digest-mugshot-1.1.30 244
+MD5 83f04a0f746fe804f38475b24c06d1f6 files/digest-mugshot-1.1.32 244
+RMD160 5adeaf7d831083ecd2c986926ed0b88625b66f0e files/digest-mugshot-1.1.32 244
+SHA256 8980fa31dd9e5e6ac009694e91e49bf5ced10ba9a1740b9e294110eb30f76fc0 files/digest-mugshot-1.1.32 244
diff --git a/net-misc/mugshot/files/digest-mugshot-1.1.30 b/net-misc/mugshot/files/digest-mugshot-1.1.30
deleted file mode 100644
index f6a9f6485..000000000
--- a/net-misc/mugshot/files/digest-mugshot-1.1.30
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 282102620ec24371baa69011eb3d4e9a mugshot-1.1.30.tar.gz 738440
-RMD160 8bb248b50e785c8e392d6513d5d606e6d358de0d mugshot-1.1.30.tar.gz 738440
-SHA256 8faafba70464046e765661f09ef3759a996154d9e6f8ba59c90545262f009398 mugshot-1.1.30.tar.gz 738440
diff --git a/net-misc/mugshot/files/digest-mugshot-1.1.32 b/net-misc/mugshot/files/digest-mugshot-1.1.32
new file mode 100644
index 000000000..540e89a21
--- /dev/null
+++ b/net-misc/mugshot/files/digest-mugshot-1.1.32
@@ -0,0 +1,3 @@
+MD5 2ff5acff020ac64a0f7d130f9d748c1b mugshot-1.1.32.tar.gz 785713
+RMD160 f92679d78f155688e6d5e3b3ec8f2163484a23ce mugshot-1.1.32.tar.gz 785713
+SHA256 396bdf70aa4643c40589d8253cf1500b1a4a36beacf574885463883fc0022aeb mugshot-1.1.32.tar.gz 785713
diff --git a/net-misc/mugshot/files/mugshot-1.1.30-use-firefox.patch b/net-misc/mugshot/files/mugshot-1.1.30-use-firefox.patch
deleted file mode 100644
index d4419b28d..000000000
--- a/net-misc/mugshot/files/mugshot-1.1.30-use-firefox.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-diff -ru mugshot-1.1.30.orig/configure.ac mugshot-1.1.30/configure.ac
---- mugshot-1.1.30.orig/configure.ac	2006-12-21 13:59:59.519335218 -0500
-+++ mugshot-1.1.30/configure.ac	2006-12-21 14:06:27.316174379 -0500
-@@ -354,6 +354,15 @@
- ##
- ## Checks for Firefox build environment
- ##
-+AC_ARG_ENABLE(firefox,
-+	AC_HELP_STRING([--enable-firefox],
-+		       [Build a Firefox extension [[default=yes]]]),
-+	[case "${enableval}" in
-+	  yes) firefox=true ;;
-+	  no)  firefox=false ;;
-+	  *)   AC_MSG_ERROR(bad value ${enableval} for --enable-firefox) ;;
-+	 esac],[firefox=true])
-+AM_CONDITIONAL(USE_FIREFOX, test "x$firefox" = xtrue)
- AC_ARG_WITH(gecko_sdk, 
- 	AC_HELP_STRING([--with-gecko-sdk=DIR],
- 		       [Path to Gecko SDK]))
-@@ -370,6 +379,8 @@
- have_full_gecko=false
- sdk_includes_nspr=false
- 
-+if test "x$firefox" = xtrue ; then
-+
- if test "x$with_gecko_sdk" != x -a "x$with_gecko_sdk" != xyes -a "x$with_gecko_sdk" != xno ; then
-    GECKO_IDLDIR="$with_gecko_sdk/idl"
-    GECKO_INCLUDEDIR="$with_gecko_sdk/include"
-@@ -486,6 +497,10 @@
- # we use some private interfaces
- LIBHIPPOFIREFOX_LIBS="$LIBHIPPOFIREFOX_LIBS $NSPR_LIBS"
- 
-+else
-+    AM_CONDITIONAL(HAVE_FULL_GECKO, false)
-+fi
-+
- #### define absolute path to srcdir for debugging-only code
- ABSOLUTE_TOP_SRCDIR=`cd ${srcdir} && pwd`
- AC_DEFINE_UNQUOTED(ABSOLUTE_TOP_SRCDIR, "$ABSOLUTE_TOP_SRCDIR", [full path to srcdir])
-@@ -501,18 +516,19 @@
-         Mugshot $VERSION
- 	==================
- 
--        prefix:                   ${prefix}
--        compiler:                 ${CC}
-+	prefix:                   ${prefix}
-+	compiler:                 ${CC}
-+	build Firefox extension:  ${firefox}
- 	xpidl:			  ${XPIDL}
- 	Gecko includes:		  ${GECKO_INCLUDEDIR}
- 	Gecko idl files:	  ${GECKO_IDLDIR}
- 	Full Gecko:	  	  ${have_full_gecko}
--        LIBHIPPO_CFLAGS:          ${LIBHIPPO_CFLAGS}
--        MUGSHOT_CFLAGS:           ${MUGSHOT_CFLAGS}
--        LIBHIPPO_LIBS:            ${LIBHIPPO_LIBS}
--        MUGSHOT_LIBS:             ${MUGSHOT_LIBS}
-+	LIBHIPPO_CFLAGS:          ${LIBHIPPO_CFLAGS}
-+	MUGSHOT_CFLAGS:           ${MUGSHOT_CFLAGS}
-+	LIBHIPPO_LIBS:            ${LIBHIPPO_LIBS}
-+	MUGSHOT_LIBS:             ${MUGSHOT_LIBS}
- 
--        Now type 'make' to build $PACKAGE
-+	Now type 'make' to build $PACKAGE
- "
- 
- if "$warn_about_curl_version" ; then
-diff -ru mugshot-1.1.30.orig/Makefile.am mugshot-1.1.30/Makefile.am
---- mugshot-1.1.30.orig/Makefile.am	2006-12-21 14:00:00.079249800 -0500
-+++ mugshot-1.1.30/Makefile.am	2006-12-21 14:07:40.671983490 -0500
-@@ -34,8 +34,13 @@
- 	  rmdir $(BUILT_SRC_DIR) ;		\
- 	fi
- 
-+if USE_FIREFOX
- dist-hook: libhippo-dist-hook libhippoipc-dist-hook libhippofirefox-dist-hook mugshot-dist-hook
- .PHONY: libhippo-dist-hook libhippoipc-dist-hook libhippofirefox-dist-hook mugshot-dist-hook
-+else
-+dist-hook: libhippo-dist-hook libhippoipc-dist-hook mugshot-dist-hook
-+.PHONY: libhippo-dist-hook libhippoipc-dist-hook mugshot-dist-hook
-+endif
- 
- # These are added to using += in the included files
- bin_PROGRAMS = 
-diff -ru mugshot-1.1.30.orig/Makefile-libhippofirefox.am mugshot-1.1.30/Makefile-libhippofirefox.am
---- mugshot-1.1.30.orig/Makefile-libhippofirefox.am	2006-12-21 14:00:00.079249800 -0500
-+++ mugshot-1.1.30/Makefile-libhippofirefox.am	2006-12-21 14:08:30.763341739 -0500
-@@ -1,3 +1,4 @@
-+if USE_FIREFOX
- FIREFOX_SRCDIR = $(COMMONSRCDIR)/firefox
- GECKO_PRIVATE_INCLUDEDIR=$(FIREFOX_SRCDIR)/gecko-private/include
- 
-@@ -162,3 +163,4 @@
- 	cp $(GECKO_PRIVATE_IDL_FILES) $(distdir)/common-dist/firefox/gecko-private/idl
- 	mkdir $(distdir)/common-dist/firefox/gecko-private/include
- 	cp $(GECKO_PRIVATE_INCLUDE_FILES) $(distdir)/common-dist/firefox/gecko-private/include
-+endif
diff --git a/net-misc/mugshot/files/mugshot-1.1.32-use-firefox.patch b/net-misc/mugshot/files/mugshot-1.1.32-use-firefox.patch
new file mode 100644
index 000000000..59bccfbcb
--- /dev/null
+++ b/net-misc/mugshot/files/mugshot-1.1.32-use-firefox.patch
@@ -0,0 +1,90 @@
+diff -ru mugshot-1.1.32.orig/configure.ac mugshot-1.1.32/configure.ac
+--- mugshot-1.1.32.orig/configure.ac	2007-02-01 19:09:36.000000000 -0500
++++ mugshot-1.1.32/configure.ac	2007-02-01 22:41:38.636096698 -0500
+@@ -354,6 +354,15 @@
+ ##
+ ## Checks for Firefox build environment
+ ##
++AC_ARG_ENABLE(firefox,
++       AC_HELP_STRING([--enable-firefox],
++                      [Build a Firefox extension [[default=yes]]]),
++       [case "${enableval}" in
++         yes) firefox=true ;;
++         no)  firefox=false ;;
++         *)   AC_MSG_ERROR(bad value ${enableval} for --enable-firefox) ;;
++        esac],[firefox=true])
++AM_CONDITIONAL(USE_FIREFOX, test "x$firefox" = xtrue)
+ AC_ARG_WITH(gecko_sdk, 
+ 	AC_HELP_STRING([--with-gecko-sdk=DIR],
+ 		       [Path to Gecko SDK]))
+@@ -370,6 +379,8 @@
+ have_full_gecko=false
+ sdk_includes_nspr=false
+ 
++if test "x$firefox" = xtrue ; then
++
+ if test "x$with_gecko_sdk" != x -a "x$with_gecko_sdk" != xyes -a "x$with_gecko_sdk" != xno ; then
+    GECKO_IDLDIR="$with_gecko_sdk/idl"
+    GECKO_INCLUDEDIR="$with_gecko_sdk/include"
+@@ -493,6 +504,10 @@
+ # we use some private interfaces
+ LIBHIPPOFIREFOX_LIBS="$LIBHIPPOFIREFOX_LIBS $NSPR_LIBS"
+ 
++else
++    AM_CONDITIONAL(HAVE_FULL_GECKO, false)
++fi
++
+ #### define absolute path to srcdir for debugging-only code
+ ABSOLUTE_TOP_SRCDIR=`cd ${srcdir} && pwd`
+ AC_DEFINE_UNQUOTED(ABSOLUTE_TOP_SRCDIR, "$ABSOLUTE_TOP_SRCDIR", [full path to srcdir])
+@@ -506,14 +521,15 @@
+ echo "
+ 
+         Mugshot $VERSION
+-	==================
++        ==================
+ 
+         prefix:                   ${prefix}
+         compiler:                 ${CC}
+-	xpidl:			  ${XPIDL}
+-	Gecko includes:		  ${GECKO_INCLUDEDIR}
+-	Gecko idl files:	  ${GECKO_IDLDIR}
+-	Full Gecko:	  	  ${have_full_gecko}
++        build Firefox extension:  ${firefox}
++        xpidl:			  ${XPIDL}
++        Gecko includes:		  ${GECKO_INCLUDEDIR}
++        Gecko idl files:	  ${GECKO_IDLDIR}
++        Full Gecko:	  	  ${have_full_gecko}
+         LIBHIPPO_CFLAGS:          ${LIBHIPPO_CFLAGS}
+         MUGSHOT_CFLAGS:           ${MUGSHOT_CFLAGS}
+         LIBHIPPO_LIBS:            ${LIBHIPPO_LIBS}
+diff -ru mugshot-1.1.32.orig/Makefile.am mugshot-1.1.32/Makefile.am
+--- mugshot-1.1.32.orig/Makefile.am	2006-10-10 10:12:38.000000000 -0400
++++ mugshot-1.1.32/Makefile.am	2007-02-01 22:44:13.937404509 -0500
+@@ -34,8 +34,13 @@
+ 	  rmdir $(BUILT_SRC_DIR) ;		\
+ 	fi
+ 
++if USE_FIREFOX
+ dist-hook: libhippo-dist-hook libhippoipc-dist-hook libhippofirefox-dist-hook mugshot-dist-hook
+ .PHONY: libhippo-dist-hook libhippoipc-dist-hook libhippofirefox-dist-hook mugshot-dist-hook
++else
++dist-hook: libhippo-dist-hook libhippoipc-dist-hook mugshot-dist-hook
++.PHONY: libhippo-dist-hook libhippoipc-dist-hook mugshot-dist-hook
++endif
+ 
+ # These are added to using += in the included files
+ bin_PROGRAMS = 
+diff -ru mugshot-1.1.32.orig/Makefile-libhippofirefox.am mugshot-1.1.32/Makefile-libhippofirefox.am
+--- mugshot-1.1.32.orig/Makefile-libhippofirefox.am	2007-01-26 16:12:59.000000000 -0500
++++ mugshot-1.1.32/Makefile-libhippofirefox.am	2007-02-01 22:44:49.278013078 -0500
+@@ -1,3 +1,4 @@
++if USE_FIREFOX
+ FIREFOX_SRCDIR = $(COMMONSRCDIR)/firefox
+ GECKO_PRIVATE_INCLUDEDIR=$(FIREFOX_SRCDIR)/gecko-private/include
+ 
+@@ -187,3 +188,4 @@
+ 	cp $(GECKO_PRIVATE_IDL_FILES) $(distdir)/common-dist/firefox/gecko-private/idl
+ 	mkdir $(distdir)/common-dist/firefox/gecko-private/include
+ 	cp $(GECKO_PRIVATE_INCLUDE_FILES) $(distdir)/common-dist/firefox/gecko-private/include
++endif
diff --git a/net-misc/mugshot/mugshot-1.1.30.ebuild b/net-misc/mugshot/mugshot-1.1.32.ebuild
index 5e0eb0450..5e0eb0450 100644
--- a/net-misc/mugshot/mugshot-1.1.30.ebuild
+++ b/net-misc/mugshot/mugshot-1.1.32.ebuild