net-misc/mugshot: Version bump

svn path=/sunrise/; revision=3554

diff --git a/net-misc/mugshot/ChangeLog b/net-misc/mugshot/ChangeLog
index 0a2d90f02728f888af51efa34e36c52234ed486a..34609ba190fabf8d015546f45deb823af1d39468 100644 (file)
--- 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: $
 
+  27 Apr 2007; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  -files/mugshot-1.1.32-libxpcom.patch, -mugshot-1.1.40.ebuild,
+  +mugshot-1.1.42.ebuild, +files/mugshot-1.1.42-libxpcom.patch:
+  Version bump
+
   03 Apr 2007; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
   -files/mugshot-1.1.26-firefox-update.sh, -mugshot-1.1.37.ebuild,
   +mugshot-1.1.40.ebuild, +files/mugshot-1.1.40-firefox-update.sh:

diff --git a/net-misc/mugshot/Manifest b/net-misc/mugshot/Manifest
index 860f45a9c16510c5e37835f8c542aa1048cf9750..6ddd5628d55da6c1e230f8f6bcabd881622a7cff 100644 (file)
--- a/net-misc/mugshot/Manifest
+++ b/net-misc/mugshot/Manifest
@@ -1,8 +1,8 @@
 AUX mugshot-1.1.22-as-needed.patch 1707 RMD160 25fcbf250e37ef5060678152534ed7b57485fa56 SHA1 32fa756a67fbd0fb93d5e001a95cfac8360af7d3 SHA256 21774c3ab5babc9423e0d6ce63b656c424e487a5d1ecc24e98a54cc9e55251b2
-AUX mugshot-1.1.32-libxpcom.patch 2120 RMD160 42969dddb06dd2a7e5045cfc39059d249f4e16de SHA1 9d3b60a27cb677f5a0c39ad6e6de408ca3cfc645 SHA256 de420ab62374d238ab40708f47d945321a987fca4696a957831a6ae8c8c287be
 AUX mugshot-1.1.32-use-firefox.patch 3519 RMD160 0d388e8c09a2da49157eb207ec192d92fa01157e SHA1 548d067d555dc7875d5754046b48f4b24967aec4 SHA256 1bc4d10d51a4199556fb6108a767572e2e132503646a923fd307585f5b62d850
 AUX mugshot-1.1.40-firefox-update.sh 950 RMD160 d11c5ae1620ac54210c8787b398c2c77ac286eed SHA1 033d81c1c32d6ba0b893569e151007bce0efa3d3 SHA256 0141d1a1d87376da73de6032966a0ace9b771ded3b6996d5126b5d34713fcd47
-DIST mugshot-1.1.40.tar.gz 836282 RMD160 aac525494c0a35091afa09db94aa9274ebd5a3bc SHA1 616a54483ce756e0ea2169f8bed164ac078b11c0 SHA256 cd71a531db630a69592e77c7a7cd81d2e322f7353fdf4a7b8fc52644fa259ad9
-EBUILD mugshot-1.1.40.ebuild 2273 RMD160 c9e6df1efc30d1687340f16848ec87d808405d9b SHA1 4827cb8cc3ea8607cec6addc6bde5166bd122f79 SHA256 e0ba8712c97922f986393cc18fd5596bcb1479bd6dca300bbead0ea2e5a0bd03
-MISC ChangeLog 2292 RMD160 ec36340e8558e0cdf07a47fa802cbcdfaa8e70fb SHA1 a582fbf063ac28df3c85330c4f04d695cf671ddf SHA256 aa5d2ef251b349d58843f758f039a5d173b187ed89814cc0c56cffda33b8be11
+AUX mugshot-1.1.42-libxpcom.patch 2178 RMD160 2571c7b74b51821bd9f2fadfaeaf6b8810651468 SHA1 5d1f1c598de848ac014fa5e551cf7fad3dba5397 SHA256 185229bf03328df1a8f794ff0d0ec93b018d262e321287b09c6d4c525b66c6f9
+DIST mugshot-1.1.42.tar.gz 840704 RMD160 61d21a134987c7ae41ee26b4e897e3f1e326b1e3 SHA1 dfff7796c2411c76d832922440241d1dd024386d SHA256 0ea8a2fd7b798952d5d1c3487aa2bad5ad85427cc2eb91cc422ec9cb12999acd
+EBUILD mugshot-1.1.42.ebuild 2297 RMD160 c33d245ec6c138c420f5f6477d87ff582d5459ad SHA1 cdde6db43f14113866b124dae5de9ac85d0af3ec SHA256 33ed5b1cf7ffd70461063d1aa3a73e2c6bc72f4c658c61f2461d5005722d47ec
+MISC ChangeLog 2506 RMD160 4f684c606864e7a46c7b7db6c4533b300c033494 SHA1 3fa3bed4b59ed927dd1a0d6e6f84c117c8cfa8d9 SHA256 16fce357178d0626648745b0c06da103f5ecc36d98f3f3ae1f6de7b6f6fba75d
 MISC metadata.xml 457 RMD160 4b49c49c4554f9280db8409e7e1c5dbf9718cff5 SHA1 2c79a1b908c24114d359a3fcd3dd9a614aa70048 SHA256 11b470c8f458ecdd6d8e4aab4f5d62a56436ac77c9f7431970127ea755522074

diff --git a/net-misc/mugshot/files/mugshot-1.1.32-libxpcom.patch b/net-misc/mugshot/files/mugshot-1.1.42-libxpcom.patch
similarity index 78%
rename from net-misc/mugshot/files/mugshot-1.1.32-libxpcom.patch
rename to net-misc/mugshot/files/mugshot-1.1.42-libxpcom.patch
index 349d1ccf0916646e534775cf1f624caf7aa303e5..33b1c000ec409fed433991cf30f12d26937fcccd 100644 (file)
--- a/net-misc/mugshot/files/mugshot-1.1.32-libxpcom.patch
+++ b/net-misc/mugshot/files/mugshot-1.1.42-libxpcom.patch
@@ -1,16 +1,16 @@
-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-02 15:28:19.800967622 -0500
-@@ -369,6 +369,8 @@
- 
+diff -ru mugshot-1.1.42.as-needed/configure.ac mugshot-1.1.42/configure.ac
+--- mugshot-1.1.42.as-needed/configure.ac      2007-04-26 12:40:17.000000000 -0400
++++ mugshot-1.1.42/configure.ac        2007-04-26 21:48:50.601567010 -0400
+@@ -417,6 +417,8 @@
  have_full_gecko=false
  sdk_includes_nspr=false
+ need_separate_js=false
 +sdk_includes_xpcom_core=false
 +sdk_includes_xpcom=false
  
  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"
-@@ -378,6 +380,14 @@
+@@ -426,6 +428,14 @@
     if test -f "$GECKO_INCLUDEDIR/nspr.h" ; then
         sdk_includes_nspr=true
     fi
@@ -25,11 +25,11 @@ diff -ru mugshot-1.1.32.orig/configure.ac mugshot-1.1.32/configure.ac
  fi
  
  if test "x$with_gecko_idl" != x -a "x$with_gecko_idl" != xyes -a "x$with_gecko_idl" != xno ; then
-@@ -486,12 +496,29 @@
+@@ -557,12 +567,29 @@
      fi
  fi
  
--PKG_CHECK_MODULES(LIBHIPPOFIREFOX, gobject-2.0 dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED $NSPR_PACKAGES gtk+-2.0)
+-PKG_CHECK_MODULES(LIBHIPPOFIREFOX, gobject-2.0 dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED $NSPR_PACKAGES $JS_PACKAGES gtk+-2.0)
 +if $sdk_includes_xpcom ; then
 +    if $sdk_includes_xpcom_core ; then
 +        XPCOM_LIBS="-L $with_gecko_sdk/lib -xpcom_core"
@@ -47,7 +47,7 @@ diff -ru mugshot-1.1.32.orig/configure.ac mugshot-1.1.32/configure.ac
 +    fi
 +fi
 +
-+PKG_CHECK_MODULES(LIBHIPPOFIREFOX, gobject-2.0 dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED $NSPR_PACKAGES $XPCOM_PACKAGES gtk+-2.0)
++PKG_CHECK_MODULES(LIBHIPPOFIREFOX, gobject-2.0 dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED $NSPR_PACKAGES $JS_PACKAGES $XPCOM_PACKAGES gtk+-2.0)
  
  # Should have -lxpcom here, but that upsets libtool for unknown reasons. Or
  # should we use -lxpcomglue instead? We don't actually link to anything private, though

diff --git a/net-misc/mugshot/mugshot-1.1.40.ebuild b/net-misc/mugshot/mugshot-1.1.42.ebuild
similarity index 96%
rename from net-misc/mugshot/mugshot-1.1.40.ebuild
rename to net-misc/mugshot/mugshot-1.1.42.ebuild
index 446ac120420fdb21d393ea231301867dc5f3115c..4be8351e7fd01f96b66063a22a9bd9e14646691d 100644 (file)
--- a/net-misc/mugshot/mugshot-1.1.40.ebuild
+++ b/net-misc/mugshot/mugshot-1.1.42.ebuild
@@ -19,7 +19,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="firefox xulrunner"
 
 RDEPEND=">=dev-libs/glib-2.6
-       >=x11-libs/gtk+-2.6
        >=dev-libs/dbus-glib-0.71
        >=dev-libs/libpcre-6.3
        media-libs/jpeg
@@ -27,7 +26,10 @@ RDEPEND=">=dev-libs/glib-2.6
        >=gnome-base/gnome-vfs-2
        >=net-libs/loudmouth-1
        >=net-misc/curl-7.13.1
+       x11-libs/cairo
+       >=x11-libs/gtk+-2.6
        x11-libs/libXScrnSaver
+       x11-libs/pango
        firefox? ( !xulrunner? (
                >=www-client/mozilla-firefox-1.5 <www-client/mozilla-firefox-2.0.1 ) )
        xulrunner? ( net-libs/xulrunner )"
@@ -41,7 +43,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.32-libxpcom.patch"
+       epatch "${FILESDIR}/${P}-libxpcom.patch"
        epatch "${FILESDIR}/${PN}-1.1.32-use-firefox.patch"
        eautoreconf
        if use firefox || use xulrunner ; then