net-misc/mugshot: Version bump. Now with firefox-3 support.

svn path=/sunrise/; revision=5950

5 files changed, 58 insertions, 55 deletions

diff --git a/net-misc/mugshot/ChangeLog b/net-misc/mugshot/ChangeLog
index d80f17fba..501b3dded 100644
--- a/net-misc/mugshot/ChangeLog
+++ b/net-misc/mugshot/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  30 Mar 2008; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  -files/mugshot-1.1.42-libxpcom.patch,
+  -files/mugshot-1.1.56-use-firefox.patch, -mugshot-1.1.58.ebuild,
+  +mugshot-1.1.92.ebuild, +files/mugshot-1.1.92-libxpcom.patch,
+  +files/mugshot-1.1.92-use-firefox.patch:
+  Version bump. Now with firefox-3 support.
+
   31 Jan 2008; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
   mugshot-1.1.58.ebuild:
   Improved comments, as requested by jakub.
diff --git a/net-misc/mugshot/Manifest b/net-misc/mugshot/Manifest
index cf502d59c..82d2f4acc 100644
--- a/net-misc/mugshot/Manifest
+++ b/net-misc/mugshot/Manifest
@@ -1,7 +1,7 @@
-AUX mugshot-1.1.42-libxpcom.patch 2178 RMD160 2571c7b74b51821bd9f2fadfaeaf6b8810651468 SHA1 5d1f1c598de848ac014fa5e551cf7fad3dba5397 SHA256 185229bf03328df1a8f794ff0d0ec93b018d262e321287b09c6d4c525b66c6f9
-AUX mugshot-1.1.56-use-firefox.patch 3179 RMD160 b9072748bf579bb810a3bdac76b5e45c4cb03fa6 SHA1 e40424fb23e645a6ff4afadf64479aeef58849a4 SHA256 ef93ea41fa7d933b486c0c0ffe912c82144b48df02730b5d0b0751419b9dae68
 AUX mugshot-1.1.58-firefox-update.sh 908 RMD160 0b3491101111a71e3ca4b3fbff98e8cc29ebed68 SHA1 dfe14fa9776e13794ba46ccdd36f25d85b2fe4ae SHA256 f6c5276d5f86c0fa3e83659b16092fa9ec6c9d6a7bb84abffa49acbfb83f59a1
-DIST mugshot-1.1.58.tar.gz 1013131 RMD160 7c3dcb6c712ab7dbe168e5d48b7a5765e19cb270 SHA1 d1c3df60fcea8caaae80631982e9c6343f28f17c SHA256 66ea50317589ac2a165c9d4c8020ddade486775e6b5826227910abba3207b864
-EBUILD mugshot-1.1.58.ebuild 3125 RMD160 c6639eec00988be58f399a8e4fbc7980d5165784 SHA1 a342491979c4d9204a5196e2d800636cdfccf915 SHA256 b4e54350db6def8c7353aa72b3434bb70e3f6e68338d21090affa09b26e07bbb
-MISC ChangeLog 3801 RMD160 5b26961a122c58b85608986d7965fa8511d5ea19 SHA1 4b5784162ce8bf80f29806fadced8dba2ac4c549 SHA256 03668a10aa25bfb86c5652f359306204927d1aa6cc8925730ceca3be1e5a52e5
+AUX mugshot-1.1.92-libxpcom.patch 2433 RMD160 8742d49906554022d53de8a3551389595390ce59 SHA1 2eb689d24e2c4499394f08ca2c386e87fc26365b SHA256 b9dbe5a1171cc34d12e469969aa7db28e918fff408af43298110107d91de0d5c
+AUX mugshot-1.1.92-use-firefox.patch 3144 RMD160 a36caa048623eead3f66a8482e21b760e59f2ac3 SHA1 242051d81084e301d701976bfc06cf51d987346a SHA256 97d13919720915c0a7723ffe64fb4ef4d1686e4a16b5d204278f0cb1009ef361
+DIST mugshot-1.1.92.tar.gz 652586 RMD160 e85f3f76bd457c60192887eab50b758f30da4ac5 SHA1 4505ecfaa9c23b8118d34bb27184eb593a8162bd SHA256 35bcce0540e031c1e9190f6ea4d9b2f58438750a994dd312999d8fd8d62708d7
+EBUILD mugshot-1.1.92.ebuild 2835 RMD160 a951e7dfcf63927d6749b801b390b8d212077747 SHA1 434ca79f7e5a7eaf50135f12bf89f989331d9ab9 SHA256 dbe8a5e3ceb77274304d77eaa16301205450cab7c4c8e85cea70a33f9174d5c8
+MISC ChangeLog 4130 RMD160 e17d1ce1912793e05e4d16d9e76edfaa931b1d95 SHA1 6fd67c3fe7b593f9ac5348e96fc6507624beb956 SHA256 1cf6e790cd75cb23d915c2b96a9d286c1ddd03c46fe4bb5391262b6721134672
 MISC metadata.xml 530 RMD160 a0de7b0954d9ca56bc70b0e88b142863f9be95d5 SHA1 a35ff660684677bd26df838de5e13e6714785639 SHA256 321f065a29cd9c0a50dc82817691564d465ee6a2d32a34dd6912f968199af338
diff --git a/net-misc/mugshot/files/mugshot-1.1.42-libxpcom.patch b/net-misc/mugshot/files/mugshot-1.1.92-libxpcom.patch
index 33b1c000e..8be91cc32 100644
--- a/net-misc/mugshot/files/mugshot-1.1.42-libxpcom.patch
+++ b/net-misc/mugshot/files/mugshot-1.1.92-libxpcom.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -ru mugshot-1.1.92.orig/configure.ac mugshot-1.1.92.xpcom/configure.ac
+--- mugshot-1.1.92.orig/configure.ac	2008-03-20 16:21:21.000000000 -0400
++++ mugshot-1.1.92.xpcom/configure.ac	2008-03-29 16:00:20.000000000 -0400
+@@ -426,6 +426,8 @@
  have_full_gecko=false
  sdk_includes_nspr=false
  need_separate_js=false
@@ -10,7 +10,7 @@ diff -ru mugshot-1.1.42.as-needed/configure.ac mugshot-1.1.42/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"
-@@ -426,6 +428,14 @@
+@@ -435,6 +437,13 @@
     if test -f "$GECKO_INCLUDEDIR/nspr.h" ; then
         sdk_includes_nspr=true
     fi
@@ -21,11 +21,10 @@ diff -ru mugshot-1.1.42.as-needed/configure.ac mugshot-1.1.42/configure.ac
 +           sdk_includes_xpcom_core=true
 +       fi
 +   fi
-+
  fi
  
  if test "x$with_gecko_idl" != x -a "x$with_gecko_idl" != xyes -a "x$with_gecko_idl" != xno ; then
-@@ -557,12 +567,29 @@
+@@ -584,7 +593,24 @@
      fi
  fi
  
@@ -37,7 +36,7 @@ diff -ru mugshot-1.1.42.as-needed/configure.ac mugshot-1.1.42/configure.ac
 +        XPCOM_LIBS="-L $with_gecko_sdk/lib -lxpcom"
 +    fi
 +else
-+    for pkg in firefox-xpcom xpcom ; do
++    for pkg in firefox-xpcom xulrunner-xpcom ; do
 +        if test "x$XPCOM_PACKAGES" = x ; then
 +            PKG_CHECK_EXISTS($pkg, XPCOM_PACKAGES=$pkg)
 +        fi
@@ -49,11 +48,14 @@ diff -ru mugshot-1.1.42.as-needed/configure.ac mugshot-1.1.42/configure.ac
 +
 +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)
  
+ if test "x${have_xulrunner}"; then
+   LIBHIPPOFIREFOX_CFLAGS="`pkg-config --cflags libxul-unstable` ${LIBHIPPOFIREFOX_CFLAGS}"
+@@ -592,7 +618,7 @@
  # 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
  # we use some private interfaces
 -LIBHIPPOFIREFOX_LIBS="$LIBHIPPOFIREFOX_LIBS $NSPR_LIBS"
 +LIBHIPPOFIREFOX_LIBS="$LIBHIPPOFIREFOX_LIBS $NSPR_LIBS $XPCOM_LIBS"
- 
- #### define absolute path to srcdir for debugging-only code
- ABSOLUTE_TOP_SRCDIR=`cd ${srcdir} && pwd`
+ if test "x${have_xulrunner}" = "xtrue"; then
+   # We need to match the mozilla version by compiling with short-wchar
+   LIBHIPPOFIREFOX_LIBS="${LIBHIPPOFIREFOX_LIBS} `pkg-config --libs libxul-unstable`"
diff --git a/net-misc/mugshot/files/mugshot-1.1.56-use-firefox.patch b/net-misc/mugshot/files/mugshot-1.1.92-use-firefox.patch
index eb2ebf3ae..80f646c61 100644
--- a/net-misc/mugshot/files/mugshot-1.1.56-use-firefox.patch
+++ b/net-misc/mugshot/files/mugshot-1.1.92-use-firefox.patch
@@ -1,7 +1,7 @@
-diff -ru mugshot-1.1.56.libxpcom/configure.ac mugshot-1.1.56/configure.ac
---- mugshot-1.1.56.libxpcom/configure.ac	2007-10-29 04:17:59.381696184 -0400
-+++ mugshot-1.1.56/configure.ac	2007-10-29 04:05:23.557001979 -0400
-@@ -485,6 +485,15 @@
+diff -ru mugshot-1.1.92.xpcom/configure.ac mugshot-1.1.92/configure.ac
+--- mugshot-1.1.92.xpcom/configure.ac	2008-03-29 16:00:20.000000000 -0400
++++ mugshot-1.1.92/configure.ac	2008-03-29 16:05:28.000000000 -0400
+@@ -410,6 +410,16 @@
  ##
  ## Checks for Firefox build environment
  ##
@@ -14,10 +14,11 @@ diff -ru mugshot-1.1.56.libxpcom/configure.ac mugshot-1.1.56/configure.ac
 +         *)   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]))
-@@ -504,6 +513,8 @@
+@@ -429,6 +439,8 @@
  sdk_includes_xpcom_core=false
  sdk_includes_xpcom=false
  
@@ -26,52 +27,52 @@ diff -ru mugshot-1.1.56.libxpcom/configure.ac mugshot-1.1.56/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"
-@@ -675,6 +686,10 @@
- # we use some private interfaces
- LIBHIPPOFIREFOX_LIBS="$LIBHIPPOFIREFOX_LIBS $NSPR_LIBS $XPCOM_LIBS"
+@@ -624,6 +636,11 @@
+   LIBHIPPOFIREFOX_LIBS="${LIBHIPPOFIREFOX_LIBS} `pkg-config --libs libxul-unstable`"
+ fi
  
 +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])
-@@ -699,6 +714,7 @@
+@@ -647,6 +664,7 @@
  
          prefix:                   ${prefix}
          compiler:                 ${CC}
-+        build Firefox extension:  ${firefox}
++	build Firefox extension:  ${firefox}
  	xpidl:			  ${XPIDL}
  	Gecko includes:		  ${GECKO_INCLUDEDIR}
  	Gecko idl files:	  ${GECKO_IDLDIR}
-Only in mugshot-1.1.56.libxpcom: configure.ac.orig
-diff -ru mugshot-1.1.56.libxpcom/Makefile.am mugshot-1.1.56/Makefile.am
---- mugshot-1.1.56.libxpcom/Makefile.am	2007-09-10 13:43:00.000000000 -0400
-+++ mugshot-1.1.56/Makefile.am	2007-10-29 04:07:43.054720728 -0400
+diff -ru mugshot-1.1.92.xpcom/Makefile.am mugshot-1.1.92/Makefile.am
+--- mugshot-1.1.92.xpcom/Makefile.am	2008-02-26 15:16:21.000000000 -0500
++++ mugshot-1.1.92/Makefile.am	2008-03-29 16:22:12.000000000 -0400
 @@ -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 libddm-dist-hook
- .PHONY: libhippo-dist-hook libhippoipc-dist-hook libhippofirefox-dist-hook mugshot-dist-hook
+ dist-hook: libhippo-dist-hook libhippoipc-dist-hook libhippofirefox-dist-hook mugshot-dist-hook libstacker-dist-hook
+ .PHONY: libhippo-dist-hook libhippoipc-dist-hook libhippofirefox-dist-hook mugshot-dist-hook libstacker-dist-hook
 +else
-+dist-hook: libhippo-dist-hook libhippoipc-dist-hook mugshot-dist-hook libddm-dist-hook
-+.PHONY: libhippo-dist-hook libhippoipc-dist-hook  mugshot-dist-hook
++dist-hook: libhippo-dist-hook libhippoipc-dist-hook mugshot-dist-hook libstacker-dist-hook
++.PHONY: libhippo-dist-hook libhippoipc-dist-hook  mugshot-dist-hook libstacker-dist-hook
 +endif
  
  # These are added to using += in the included files
  bin_PROGRAMS = 
-diff -ru mugshot-1.1.56.libxpcom/Makefile-libhippofirefox.am mugshot-1.1.56/Makefile-libhippofirefox.am
---- mugshot-1.1.56.libxpcom/Makefile-libhippofirefox.am	2007-07-25 16:16:24.000000000 -0400
-+++ mugshot-1.1.56/Makefile-libhippofirefox.am	2007-10-29 04:01:33.637077707 -0400
+diff -ru mugshot-1.1.92.xpcom/Makefile-libhippofirefox.am mugshot-1.1.92/Makefile-libhippofirefox.am
+--- mugshot-1.1.92.xpcom/Makefile-libhippofirefox.am	2008-01-24 14:54:44.000000000 -0500
++++ mugshot-1.1.92/Makefile-libhippofirefox.am	2008-03-29 16:20:06.000000000 -0400
 @@ -1,3 +1,4 @@
 +if USE_FIREFOX
  FIREFOX_SRCDIR = $(COMMONSRCDIR)/firefox
  GECKO_PRIVATE_INCLUDEDIR=$(FIREFOX_SRCDIR)/gecko-private/include
  
-@@ -190,3 +191,4 @@
+@@ -192,3 +193,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.58.ebuild b/net-misc/mugshot/mugshot-1.1.92.ebuild
index f15eb564b..f75fb1c5d 100644
--- a/net-misc/mugshot/mugshot-1.1.58.ebuild
+++ b/net-misc/mugshot/mugshot-1.1.92.ebuild
@@ -14,22 +14,19 @@ SRC_URI="http://download.mugshot.org/client/sources/linux/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="firefox sqlite xulrunner"
+IUSE="firefox xulrunner"
 
 RDEPEND=">=dev-libs/glib-2.6
 	>=dev-libs/dbus-glib-0.71
-	>=dev-libs/libpcre-6.3
 	media-libs/jpeg
-	>=gnome-base/gnome-desktop-2.10
-	>=gnome-base/gnome-vfs-2
-	>=net-libs/loudmouth-1.2.2
+	>=gnome-extra/desktop-data-model-1.2
 	>=net-misc/curl-7.13.1
+	>=sys-apps/dbus-1
 	x11-libs/cairo
-	>=x11-libs/gtk+-2.6
+	>=x11-libs/gtk+-2.10
 	x11-libs/libXScrnSaver
 	x11-libs/pango
-	firefox? ( !xulrunner? ( =www-client/mozilla-firefox-2.0.0* ) )
-	sqlite? ( >=dev-db/sqlite-3.3 )
+	firefox? ( !xulrunner? ( www-client/mozilla-firefox ) )
 	xulrunner? ( net-libs/xulrunner )"
 
 DEPEND=">=dev-util/pkgconfig-0.19
@@ -41,11 +38,10 @@ FIREDIRS="/usr/$(get_libdir)/mozilla-firefox"
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
 	# configure looks in the wrong place for xpidl
 	sed -e 's:bin/xpidl:xpidl:' -i configure.ac
-	epatch "${FILESDIR}/${PN}-1.1.42-libxpcom.patch" || die "epatch failed"
-	epatch "${FILESDIR}/${PN}-1.1.56-use-firefox.patch" || die "epatch failed"
+	epatch "${FILESDIR}/${P}-libxpcom.patch" || die "epatch failed"
+	epatch "${FILESDIR}/${P}-use-firefox.patch" || die "epatch failed"
 	eautoreconf
 	if use firefox || use xulrunner ; then
 		G2CONF="--enable-firefox"
@@ -57,7 +53,7 @@ src_unpack() {
 
 		# use the correct libdir in the firefox-update.sh script
 		sed -e "s:GET_LIBDIR:$(get_libdir):" \
-			"${FILESDIR}/${P}-firefox-update.sh" > "${S}/firefox-update.sh"
+			"${FILESDIR}/${PN}-1.1.58-firefox-update.sh" > "${S}/firefox-update.sh"
 
 		# add support for (32-bit) mozilla-firefox-bin if our profile is
 		# x86 or amd64 with a 32-bit userland
@@ -69,13 +65,13 @@ src_unpack() {
 		G2CONF="--disable-firefox"
 	fi
 	# external hippo-canvas seems to be deprecated now?
-	G2CONF="${G2CONF} $(use_with sqlite) --with-included-canvas"
+	G2CONF="${G2CONF} --with-included-canvas"
 }
 
 src_install() {
 	gnome2_src_install
 
-	# this replaces the broken pkg_prerm logic we had before, which removed the
+	# this replaces the broken pkg_prerm logic we had before, which removed the 
 	# firefox extensions on every upgrade.
 	if use firefox || use xulrunner ; then
 		einfo "Installing firefox extension."
@@ -99,7 +95,4 @@ pkg_postinst () {
 		elog
 		elog "Please restart firefox in order to use the mugshot extension."
 	fi
-	elog
-	elog "net-misc/mugshot does not (yet) support logging in via mozilla-firefox-3"
-	elog "If you use firefox 3, try logging into mugshot.org using epiphany."
 }