]> Pileus Git - ~andy/sunrise/commitdiff
net-misc/mugshot: New ebuild for bug 135524. Also thanks to Bobby Ryan Newberry ...
authorAlexandre Rostovtsev <tetromino@gentoo.org>
Fri, 1 Dec 2006 07:24:31 +0000 (07:24 +0000)
committerAlexandre Rostovtsev <tetromino@gentoo.org>
Fri, 1 Dec 2006 07:24:31 +0000 (07:24 +0000)
svn path=/sunrise/; revision=2060

net-misc/mugshot/ChangeLog [new file with mode: 0644]
net-misc/mugshot/Manifest [new file with mode: 0644]
net-misc/mugshot/files/digest-mugshot-1.1.26 [new file with mode: 0644]
net-misc/mugshot/files/mugshot-1.1.22-as-needed.patch [new file with mode: 0644]
net-misc/mugshot/files/mugshot-1.1.22-firefox-update.sh [new file with mode: 0644]
net-misc/mugshot/files/mugshot-1.1.24-use-firefox.patch [new file with mode: 0644]
net-misc/mugshot/metadata.xml [new file with mode: 0644]
net-misc/mugshot/mugshot-1.1.26.ebuild [new file with mode: 0644]

diff --git a/net-misc/mugshot/ChangeLog b/net-misc/mugshot/ChangeLog
new file mode 100644 (file)
index 0000000..6e2b52e
--- /dev/null
@@ -0,0 +1,13 @@
+# ChangeLog for net-misc/mugshot
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  01 Dec 2006; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  +files/mugshot-1.1.22-as-needed.patch,
+  +files/mugshot-1.1.22-firefox-update.sh,
+  +files/mugshot-1.1.24-use-firefox.patch, +mugshot-1.1.26.ebuild,
+  +metadata.xml:
+  New ebuild for bug 135524. Also thanks to Bobby Ryan Newberry
+  <brnewber@gmail.com>, John Patterson <gentoo_j@ninecats.org>, and Sebi
+  Ryffel <sryffel@ee.ethz.ch>.
+
diff --git a/net-misc/mugshot/Manifest b/net-misc/mugshot/Manifest
new file mode 100644 (file)
index 0000000..d17835f
--- /dev/null
@@ -0,0 +1,28 @@
+AUX mugshot-1.1.22-as-needed.patch 1707 RMD160 25fcbf250e37ef5060678152534ed7b57485fa56 SHA1 32fa756a67fbd0fb93d5e001a95cfac8360af7d3 SHA256 21774c3ab5babc9423e0d6ce63b656c424e487a5d1ecc24e98a54cc9e55251b2
+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.22-firefox-update.sh 783 RMD160 900972d15e491bd338c3ac2d79257e0ff95fa697 SHA1 4f04304f31f05e2491020f32098e82b9fd7546ed SHA256 97ba6157301a39eb78c38d50e1208c96d45bfa069913440d240ae5cacb126b95
+MD5 7c0436b0d4855c2bc3b195545a0cb9b0 files/mugshot-1.1.22-firefox-update.sh 783
+RMD160 900972d15e491bd338c3ac2d79257e0ff95fa697 files/mugshot-1.1.22-firefox-update.sh 783
+SHA256 97ba6157301a39eb78c38d50e1208c96d45bfa069913440d240ae5cacb126b95 files/mugshot-1.1.22-firefox-update.sh 783
+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
+DIST mugshot-1.1.26.tar.gz 716115 RMD160 9b2ab5d784a6e36fc92d93810d002099d94fff45 SHA1 f9e2e14156de9a94f2af0f39451ba271204b1eb4 SHA256 efbfd8e2fb8f278c773e79a6aa3f1c2d3e330b5c34ac57534acb3fa63e2efd10
+EBUILD mugshot-1.1.26.ebuild 1710 RMD160 13092ad7ba3c9df56d4f4e5155b83e662b37bf99 SHA1 a5bbddbb2ffe10a71dd01344bbd68dad2a88c563 SHA256 d7042c6dc685c470ff6a2e9b4ddea609d8e4011f65451912d79953e0a21c1ee1
+MD5 2af52881ccc5c32d03c4f02645988dba mugshot-1.1.26.ebuild 1710
+RMD160 13092ad7ba3c9df56d4f4e5155b83e662b37bf99 mugshot-1.1.26.ebuild 1710
+SHA256 d7042c6dc685c470ff6a2e9b4ddea609d8e4011f65451912d79953e0a21c1ee1 mugshot-1.1.26.ebuild 1710
+MISC ChangeLog 524 RMD160 ef16ff6fe99061680b387eada6dd5f3058917435 SHA1 0e50f52992f20e0fc1dfc7067d8ca3472b1bc002 SHA256 8a43183d34c03f6420d54d21d26ccc182eba79c76724be500209c6702e7526f8
+MD5 8b083eed01f29625acf448b827e40262 ChangeLog 524
+RMD160 ef16ff6fe99061680b387eada6dd5f3058917435 ChangeLog 524
+SHA256 8a43183d34c03f6420d54d21d26ccc182eba79c76724be500209c6702e7526f8 ChangeLog 524
+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 21061bf709c1ea8f9c625d3c14b62dd7 files/digest-mugshot-1.1.26 244
+RMD160 e3f82ab9032978c3bb48472f62bb501fad6ee60a files/digest-mugshot-1.1.26 244
+SHA256 dcb7dc2cdfd5985ce4cdeaeeaf1f0f77ca3f8a06e33ca3e02e118fe39125506a files/digest-mugshot-1.1.26 244
diff --git a/net-misc/mugshot/files/digest-mugshot-1.1.26 b/net-misc/mugshot/files/digest-mugshot-1.1.26
new file mode 100644 (file)
index 0000000..3784462
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 ac76f6cc407d6898060d5973eb686b1d mugshot-1.1.26.tar.gz 716115
+RMD160 9b2ab5d784a6e36fc92d93810d002099d94fff45 mugshot-1.1.26.tar.gz 716115
+SHA256 efbfd8e2fb8f278c773e79a6aa3f1c2d3e330b5c34ac57534acb3fa63e2efd10 mugshot-1.1.26.tar.gz 716115
diff --git a/net-misc/mugshot/files/mugshot-1.1.22-as-needed.patch b/net-misc/mugshot/files/mugshot-1.1.22-as-needed.patch
new file mode 100644 (file)
index 0000000..7eb2c38
--- /dev/null
@@ -0,0 +1,42 @@
+diff -ru mugshot-1.1.22-orig/Makefile-mugshot.am mugshot-1.1.22/Makefile-mugshot.am
+--- mugshot-1.1.22-orig/Makefile-mugshot.am    2006-10-25 17:04:17.486420616 -0400
++++ mugshot-1.1.22/Makefile-mugshot.am 2006-10-25 18:37:07.683621928 -0400
+@@ -6,8 +6,8 @@
+       $(MUGSHOT_CFLAGS)               \
+       -I$(top_srcdir)/canvas
+-mugshot_LDFLAGS=$(MUGSHOT_LIBS)
+-mugshot_LDADD= libhippoipc.la libhippo.la
++mugshot_LDFLAGS=
++mugshot_LDADD= libhippoipc.la libhippo.la $(MUGSHOT_LIBS)
+ if !HAVE_GTK210
+ mugshot_CPPFLAGS += -I$(top_srcdir)/gtkcopy
+diff -ru mugshot-1.1.22-orig/Makefile-mugshot-uri-handler.am mugshot-1.1.22/Makefile-mugshot-uri-handler.am
+--- mugshot-1.1.22-orig/Makefile-mugshot-uri-handler.am        2006-10-25 17:04:17.492419704 -0400
++++ mugshot-1.1.22/Makefile-mugshot-uri-handler.am     2006-10-25 18:37:24.554057232 -0400
+@@ -4,8 +4,8 @@
+       $(AM_CPPFLAGS)                  \
+       $(MUGSHOT_URI_HANDLER_CFLAGS)
+-mugshot_uri_handler_LDFLAGS=$(MUGSHOT_URI_HANDLER_LIBS)
+-mugshot_uri_handler_LDADD= libhippo.la
++mugshot_uri_handler_LDFLAGS=
++mugshot_uri_handler_LDADD= libhippo.la $(MUGSHOT_URI_HANDLER_LIBS)
+ mugshot_uri_handler_SOURCES=                  \
+       src/hippo-dbus-client.c                 \
+diff -ru mugshot-1.1.22-orig/Makefile-test-hippo-ipc.am mugshot-1.1.22/Makefile-test-hippo-ipc.am
+--- mugshot-1.1.22-orig/Makefile-test-hippo-ipc.am     2006-10-25 17:04:17.509417120 -0400
++++ mugshot-1.1.22/Makefile-test-hippo-ipc.am  2006-10-25 18:37:37.675062536 -0400
+@@ -4,8 +4,8 @@
+       $(AM_CPPFLAGS)                  \
+       $(TEST_HIPPO_IPC_CFLAGS)
+-test_hippo_ipc_LDFLAGS=$(TEST_HIPPO_IPC_LIBS)
+-test_hippo_ipc_LDADD= libhippoipc.la
++test_hippo_ipc_LDFLAGS=
++test_hippo_ipc_LDADD= libhippoipc.la $(TEST_HIPPO_IPC_LIBS)
+ test_hippo_ipc_SOURCES=                               \
+       hippoipc/test-hippo-ipc.cpp
diff --git a/net-misc/mugshot/files/mugshot-1.1.22-firefox-update.sh b/net-misc/mugshot/files/mugshot-1.1.22-firefox-update.sh
new file mode 100644 (file)
index 0000000..fc408ba
--- /dev/null
@@ -0,0 +1,24 @@
+#!/bin/sh
+# 
+# This script is used to add and remove our extension from the Firefox
+# directory, and is run from 'triggers' when Firefox is installed or
+# upgraded, as well as when our package is installed. 
+#
+
+
+d=/usr/lib/mozilla-firefox
+
+if [ "$1" = "install" ] ; then
+    # Add symlink to the firefox directory that looks like it is part of a
+    # currently installed package
+    if [ -e $d/firefox-bin -a -d $d/extensions -a ! -L $d/extensions/firefox@mugshot.org ] ; then
+       ln -s /usr/lib/mugshot/firefox $d/extensions/firefox@mugshot.org
+    fi
+elif [ "$1" = "remove" ] ; then
+    # Remove the symlink we've created 
+    if [ -L $d/extensions/firefox@mugshot.org ] ; then
+       rm $d/extensions/firefox@mugshot.org
+    fi
+else
+    echo "Usage firefox-update.sh [install/remove]"
+fi
diff --git a/net-misc/mugshot/files/mugshot-1.1.24-use-firefox.patch b/net-misc/mugshot/files/mugshot-1.1.24-use-firefox.patch
new file mode 100644 (file)
index 0000000..fbccb1e
--- /dev/null
@@ -0,0 +1,92 @@
+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 @@
+ ##
+ ## 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]))
+@@ -302,6 +311,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"
+@@ -418,6 +429,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])
+@@ -435,16 +450,17 @@
+         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.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
+@@ -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.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
+@@ -1,3 +1,4 @@
++if USE_FIREFOX
+ FIREFOX_SRCDIR = $(COMMONSRCDIR)/firefox
+ GECKO_PRIVATE_INCLUDEDIR=$(FIREFOX_SRCDIR)/gecko-private/include
+@@ -158,3 +159,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/metadata.xml b/net-misc/mugshot/metadata.xml
new file mode 100644 (file)
index 0000000..7e32869
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>maintainer-wanted</herd>
+</pkgmetadata>
diff --git a/net-misc/mugshot/mugshot-1.1.26.ebuild b/net-misc/mugshot/mugshot-1.1.26.ebuild
new file mode 100644 (file)
index 0000000..aaf9aef
--- /dev/null
@@ -0,0 +1,68 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit autotools eutils gnome2 multilib
+
+DESCRIPTION="Program to facilitate social networking"
+HOMEPAGE="http://www.mugshot.org"
+SRC_URI="http://download.mugshot.org/client/sources/linux/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="firefox"
+
+RDEPEND=">=dev-libs/glib-2.6
+       >=x11-libs/gtk+-2.6
+       >=sys-apps/dbus-0.61
+       >=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 )
+       x11-libs/libXScrnSaver"
+
+DEPEND="${RDEPEND}"
+
+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.22-as-needed.patch
+       epatch ${FILESDIR}/${PN}-1.1.24-use-firefox.patch
+       eautoreconf
+       use firefox && \
+               cp ${FILESDIR}/${PN}-1.1.22-firefox-update.sh ${S}/firefox-update.sh
+}
+
+src_compile() {
+       econf $(use_enable firefox ) \
+               --with-gecko-sdk=/usr/$(get_libdir)/mozilla-firefox/ || die "./configure failed"
+       emake || die "emake failed"
+}
+
+src_install () {
+       emake DESTDIR="${D}" install || die "emake install failed"
+       dodoc AUTHORS ChangeLog README
+}
+
+pkg_postinst () {
+       gnome2_pkg_postinst
+
+       # install firefox extension
+       if use firefox ; then
+               einfo "Installing firefox extension. "
+               einfo "Please restart firefox in order to use the mugshot extension."
+               ${S}/firefox-update.sh install
+       fi
+}
+
+pkg_prerm () {
+       # remove firefox extension
+       if [ -x /usr/share/mugshot/firefox-update.sh ] ; then
+               einfo "Removed the mugshot firefox extension."
+               /usr/share/mugshot/firefox-update.sh remove
+       fi
+}
+