net-misc/mugshot: Version bump, tiny updates to dependencies and the firefox patch

svn path=/sunrise/; revision=2405

6 files changed, 47 insertions, 38 deletions

diff --git a/net-misc/mugshot/ChangeLog b/net-misc/mugshot/ChangeLog
index 13c1313b9..bc9d6c672 100644
--- a/net-misc/mugshot/ChangeLog
+++ b/net-misc/mugshot/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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:
+  Version bump, tiny updates to dependencies and the firefox patch
+
   07 Dec 2006; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
   +mugshot-1.1.28.ebuild:
   Version bump, new-style dbus dependencies, added WANT_AUTOCONF and
diff --git a/net-misc/mugshot/Manifest b/net-misc/mugshot/Manifest
index 5a1d506a8..4870bb5b8 100644
--- a/net-misc/mugshot/Manifest
+++ b/net-misc/mugshot/Manifest
@@ -2,27 +2,27 @@ AUX mugshot-1.1.22-as-needed.patch 1707 RMD160 25fcbf250e37ef5060678152534ed7b57
 MD5 112c5e0929c0b6100186a3f9c86dc70d files/mugshot-1.1.22-as-needed.patch 1707
 RMD160 25fcbf250e37ef5060678152534ed7b57485fa56 files/mugshot-1.1.22-as-needed.patch 1707
 SHA256 21774c3ab5babc9423e0d6ce63b656c424e487a5d1ecc24e98a54cc9e55251b2 files/mugshot-1.1.22-as-needed.patch 1707
-AUX mugshot-1.1.24-use-firefox.patch 3548 RMD160 5ca079879318278e61a57a73ff547b88a0f809d8 SHA1 0ff4448aa2039597c54ce2ed4d8f9063a7493084 SHA256 1ac647744efd49bb9fa1b9a6b760769146082a248c9d3826eb301171c7e7014a
-MD5 372738ff5334a52079985f446710bf84 files/mugshot-1.1.24-use-firefox.patch 3548
-RMD160 5ca079879318278e61a57a73ff547b88a0f809d8 files/mugshot-1.1.24-use-firefox.patch 3548
-SHA256 1ac647744efd49bb9fa1b9a6b760769146082a248c9d3826eb301171c7e7014a files/mugshot-1.1.24-use-firefox.patch 3548
 AUX mugshot-1.1.26-firefox-update.sh 809 RMD160 34e8d0f95c91ca9c94338ea0d637e2c77d9bc392 SHA1 5f74441faf066e47ed9964a0e8014d53007776df SHA256 afa2230aa865ffc8a86cc88988101fab7f5fd76c7495769449d4d96bccedc121
 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
-DIST mugshot-1.1.28.tar.gz 720335 RMD160 2555ce024b54d36c3794bb30f6add4c4442502d5 SHA1 f54c75c643b1e34b1baa32bd909fade71f2c2756 SHA256 95f20af3d6a79fb2917ff058c742aea1dcce39a25af3c5318d2da9cdac8f86ad
-EBUILD mugshot-1.1.28.ebuild 1860 RMD160 f8365e1015f24a4ad0161365c377335c64226eb6 SHA1 ca43054094587daa8d0ae5a02b134271ac58058d SHA256 c30ee90e1d984d175fdf0a9f62ad27a1bb25429c60a5614a481c87ea1a842607
-MD5 24850d470cdf6f05b96707b0f13b5efd mugshot-1.1.28.ebuild 1860
-RMD160 f8365e1015f24a4ad0161365c377335c64226eb6 mugshot-1.1.28.ebuild 1860
-SHA256 c30ee90e1d984d175fdf0a9f62ad27a1bb25429c60a5614a481c87ea1a842607 mugshot-1.1.28.ebuild 1860
-MISC ChangeLog 741 RMD160 88b540bea9db4e0892f6d474788f303bf0fb15a2 SHA1 3fedd7edf967988384b8423d00f0baecf7bb9260 SHA256 318ac68713d18b846de7959fc91117df936482509ac36ec7a33986e7b085abe6
-MD5 41ae722fc677fc4ea784507da8c8026b ChangeLog 741
-RMD160 88b540bea9db4e0892f6d474788f303bf0fb15a2 ChangeLog 741
-SHA256 318ac68713d18b846de7959fc91117df936482509ac36ec7a33986e7b085abe6 ChangeLog 741
+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 d057cbde76d3a7e45645aea676390e9a8a5c07a9 SHA1 af654096575bb61832842726057addb271034edf SHA256 951456b84eea08eb76c001fa91385017fd6852852b51320b304eb772bfca1732
+MD5 0815efb93886d883ecfa279eb9dfb177 mugshot-1.1.30.ebuild 1854
+RMD160 d057cbde76d3a7e45645aea676390e9a8a5c07a9 mugshot-1.1.30.ebuild 1854
+SHA256 951456b84eea08eb76c001fa91385017fd6852852b51320b304eb772bfca1732 mugshot-1.1.30.ebuild 1854
+MISC ChangeLog 1013 RMD160 82edaf28143e6878d54e96dc65ec50c2281323cf SHA1 e44bca1cf831bbd03917d268eaa61a8de354d33b SHA256 9f446f340678af1943ebef9108d18f7b3fa7b9703906e0e74b034083daf13d76
+MD5 0fa70d021970dc40ff7b3b4d64f7c0ca ChangeLog 1013
+RMD160 82edaf28143e6878d54e96dc65ec50c2281323cf ChangeLog 1013
+SHA256 9f446f340678af1943ebef9108d18f7b3fa7b9703906e0e74b034083daf13d76 ChangeLog 1013
 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 9e7a5624e352d57e1c50328c3a67bb16 files/digest-mugshot-1.1.28 244
-RMD160 71ba2a767341bc0f60263c17dc1bc682bd09e11d files/digest-mugshot-1.1.28 244
-SHA256 3d1cb2267d4ff92510882f0fcf8d063ccd3a470cc039579d667e87dc14e3cf16 files/digest-mugshot-1.1.28 244
+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
diff --git a/net-misc/mugshot/files/digest-mugshot-1.1.28 b/net-misc/mugshot/files/digest-mugshot-1.1.28
deleted file mode 100644
index cfbfecc90..000000000
--- a/net-misc/mugshot/files/digest-mugshot-1.1.28
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ed404e960eb20ad5b25ae10bcbac14f3 mugshot-1.1.28.tar.gz 720335
-RMD160 2555ce024b54d36c3794bb30f6add4c4442502d5 mugshot-1.1.28.tar.gz 720335
-SHA256 95f20af3d6a79fb2917ff058c742aea1dcce39a25af3c5318d2da9cdac8f86ad mugshot-1.1.28.tar.gz 720335
diff --git a/net-misc/mugshot/files/digest-mugshot-1.1.30 b/net-misc/mugshot/files/digest-mugshot-1.1.30
new file mode 100644
index 000000000..f6a9f6485
--- /dev/null
+++ b/net-misc/mugshot/files/digest-mugshot-1.1.30
@@ -0,0 +1,3 @@
+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/mugshot-1.1.24-use-firefox.patch b/net-misc/mugshot/files/mugshot-1.1.30-use-firefox.patch
index fbccb1e5d..d4419b28d 100644
--- a/net-misc/mugshot/files/mugshot-1.1.24-use-firefox.patch
+++ b/net-misc/mugshot/files/mugshot-1.1.30-use-firefox.patch
@@ -1,7 +1,7 @@
-diff -ru mugshot-1.1.24.orig/configure.ac mugshot-1.1.24/configure.ac
---- mugshot-1.1.24.orig/configure.ac	2006-11-09 13:16:43.339908368 -0500
-+++ mugshot-1.1.24/configure.ac	2006-11-09 15:01:30.944047248 -0500
-@@ -286,6 +286,15 @@
+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
  ##
@@ -17,7 +17,7 @@ diff -ru mugshot-1.1.24.orig/configure.ac mugshot-1.1.24/configure.ac
  AC_ARG_WITH(gecko_sdk, 
  	AC_HELP_STRING([--with-gecko-sdk=DIR],
  		       [Path to Gecko SDK]))
-@@ -302,6 +311,8 @@
+@@ -370,6 +379,8 @@
  have_full_gecko=false
  sdk_includes_nspr=false
  
@@ -26,7 +26,7 @@ diff -ru mugshot-1.1.24.orig/configure.ac mugshot-1.1.24/configure.ac
  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"
-@@ -418,6 +429,10 @@
+@@ -486,6 +497,10 @@
  # we use some private interfaces
  LIBHIPPOFIREFOX_LIBS="$LIBHIPPOFIREFOX_LIBS $NSPR_LIBS"
  
@@ -37,10 +37,14 @@ diff -ru mugshot-1.1.24.orig/configure.ac mugshot-1.1.24/configure.ac
  #### 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])
-@@ -435,16 +450,17 @@
+@@ -501,18 +516,19 @@
+         Mugshot $VERSION
+ 	==================
  
-         prefix:                   ${prefix}
-         compiler:                 ${CC}
+-        prefix:                   ${prefix}
+-        compiler:                 ${CC}
++	prefix:                   ${prefix}
++	compiler:                 ${CC}
 +	build Firefox extension:  ${firefox}
  	xpidl:			  ${XPIDL}
  	Gecko includes:		  ${GECKO_INCLUDEDIR}
@@ -60,9 +64,9 @@ diff -ru mugshot-1.1.24.orig/configure.ac mugshot-1.1.24/configure.ac
  "
  
  if "$warn_about_curl_version" ; then
-diff -ru mugshot-1.1.24.orig/Makefile.am mugshot-1.1.24/Makefile.am
---- mugshot-1.1.24.orig/Makefile.am	2006-11-09 13:16:43.354906088 -0500
-+++ mugshot-1.1.24/Makefile.am	2006-11-09 15:15:54.183814856 -0500
+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
@@ -77,15 +81,15 @@ diff -ru mugshot-1.1.24.orig/Makefile.am mugshot-1.1.24/Makefile.am
  
  # These are added to using += in the included files
  bin_PROGRAMS = 
-diff -ru mugshot-1.1.24.orig/Makefile-libhippofirefox.am mugshot-1.1.24/Makefile-libhippofirefox.am
---- mugshot-1.1.24.orig/Makefile-libhippofirefox.am	2006-11-09 13:16:43.354906088 -0500
-+++ mugshot-1.1.24/Makefile-libhippofirefox.am	2006-11-09 15:21:09.895819336 -0500
+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
  
-@@ -158,3 +159,4 @@
+@@ -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
diff --git a/net-misc/mugshot/mugshot-1.1.28.ebuild b/net-misc/mugshot/mugshot-1.1.30.ebuild
index 1be097646..94bbdc238 100644
--- a/net-misc/mugshot/mugshot-1.1.28.ebuild
+++ b/net-misc/mugshot/mugshot-1.1.30.ebuild
@@ -18,11 +18,11 @@ IUSE="firefox"
 
 RDEPEND=">=dev-libs/glib-2.6
 	>=x11-libs/gtk+-2.6
-	|| ( >=dev-libs/dbus-glib-0.71 ( >=sys-apps/dbus-0.61 <sys-apps/dbus-0.90 ) )
+	|| ( >=dev-libs/dbus-glib-0.71 ( >=sys-apps/dbus-0.60 <sys-apps/dbus-0.90 ) )
 	>=net-libs/loudmouth-1
 	>=gnome-base/gconf-2
 	>=net-misc/curl-7.13.1
-	firefox? ( >=www-client/mozilla-firefox-1.5 <www-client/mozilla-firefox-2.1 )
+	firefox? ( >=www-client/mozilla-firefox-1.5 <www-client/mozilla-firefox-2.0.1 )
 	x11-libs/libXScrnSaver"
 
 DEPEND="${RDEPEND}"
@@ -33,7 +33,7 @@ src_unpack() {
 	# configure looks in the wrong place for xpidl
 	sed -e 's:bin/xpidl:xpidl:' -i configure.ac
 	epatch "${FILESDIR}/${PN}-1.1.22-as-needed.patch"
-	epatch "${FILESDIR}/${PN}-1.1.24-use-firefox.patch"
+	epatch "${FILESDIR}/${P}-use-firefox.patch"
 	eautoreconf
 	use firefox && sed -e "s:GET_LIBDIR:$(get_libdir):" \
 		"${FILESDIR}/${PN}-1.1.26-firefox-update.sh" > "${S}/firefox-update.sh"