diff options
| -rw-r--r-- | net-misc/mugshot/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/mugshot/Manifest | 8 | ||||
| -rw-r--r-- | net-misc/mugshot/files/mugshot-1.1.26-firefox-update.sh | 24 | ||||
| -rw-r--r-- | net-misc/mugshot/files/mugshot-1.1.40-firefox-update.sh | 28 | ||||
| -rw-r--r-- | net-misc/mugshot/mugshot-1.1.40.ebuild (renamed from net-misc/mugshot/mugshot-1.1.37.ebuild) | 43 | ||||
| -rw-r--r-- | profiles/use.local.desc | 1 |
6 files changed, 68 insertions, 42 deletions
diff --git a/net-misc/mugshot/ChangeLog b/net-misc/mugshot/ChangeLog index 454fd528b..0a2d90f02 100644 --- a/net-misc/mugshot/ChangeLog +++ b/net-misc/mugshot/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 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: + Version bump. Now supports compiling against xulrunner (for those who use + mozilla-firefox-bin). + 02 Mar 2007; Christian Faulhammer <opfer@gentoo.org> mugshot-1.1.37.ebuild: added trailing slash to HOMEPAGE URI diff --git a/net-misc/mugshot/Manifest b/net-misc/mugshot/Manifest index e4338dad9..860f45a9c 100644 --- 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.26-firefox-update.sh 809 RMD160 34e8d0f95c91ca9c94338ea0d637e2c77d9bc392 SHA1 5f74441faf066e47ed9964a0e8014d53007776df SHA256 afa2230aa865ffc8a86cc88988101fab7f5fd76c7495769449d4d96bccedc121 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 -DIST mugshot-1.1.37.tar.gz 818664 RMD160 403178a65d2d351ffd15a93b1b3bfa7dd2c0d066 SHA1 57c1c197e24424ef262615c6becc0305a4bf717f SHA256 f5120903f2b5b5b00a281ee460ceb5ab8f731493838333b40b935ff1c8907159 -EBUILD mugshot-1.1.37.ebuild 1768 RMD160 40757b8b767a86b3f7a6c85969caf98b5f12a327 SHA1 913833f7a2d1825b9c27f7fde4fb69380df118f4 SHA256 86dadc8ea07b4b7e090bb558d3a3a4b30872c6fdff6b4e83352c5b31aeb9d6ac -MISC ChangeLog 1987 RMD160 4e2ab9517bfd5d720ad1de89250c2be710c3a952 SHA1 8754930cb198bb767e3d2e644a48d60a5dd4af20 SHA256 41f09c9eb308ac459791ba5b0f99c1ef5f9e0b6b2bf2384721b6c3ba04936737 +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 MISC metadata.xml 457 RMD160 4b49c49c4554f9280db8409e7e1c5dbf9718cff5 SHA1 2c79a1b908c24114d359a3fcd3dd9a614aa70048 SHA256 11b470c8f458ecdd6d8e4aab4f5d62a56436ac77c9f7431970127ea755522074 diff --git a/net-misc/mugshot/files/mugshot-1.1.26-firefox-update.sh b/net-misc/mugshot/files/mugshot-1.1.26-firefox-update.sh deleted file mode 100644 index 9e2429012..000000000 --- a/net-misc/mugshot/files/mugshot-1.1.26-firefox-update.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/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/GET_LIBDIR/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/GET_LIBDIR/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.40-firefox-update.sh b/net-misc/mugshot/files/mugshot-1.1.40-firefox-update.sh new file mode 100644 index 000000000..54b77f71d --- /dev/null +++ b/net-misc/mugshot/files/mugshot-1.1.40-firefox-update.sh @@ -0,0 +1,28 @@ +#!/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. +# + +firedir=/usr/GET_LIBDIR/mozilla-firefox +firedirs="${firedir}" + +if [ "$1" = "install" ] ; then + for d in ${firedirs} ; do + # 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/GET_LIBDIR/mugshot/firefox "$d/extensions/firefox@mugshot.org" + fi + done +elif [ "$1" = "remove" ] ; then + for d in ${firedirs} ; do + # Remove the symlink we've created + if [ -L "$d/extensions/firefox@mugshot.org" ] ; then + rm "$d/extensions/firefox@mugshot.org" + fi + done +else + echo "Usage firefox-update.sh [install/remove]" +fi diff --git a/net-misc/mugshot/mugshot-1.1.37.ebuild b/net-misc/mugshot/mugshot-1.1.40.ebuild index a3c2dd1b0..446ac1204 100644 --- a/net-misc/mugshot/mugshot-1.1.37.ebuild +++ b/net-misc/mugshot/mugshot-1.1.40.ebuild @@ -4,6 +4,8 @@ WANT_AUTOCONF="latest" WANT_AUTOMAKE="latest" +GCONF_DEBUG="no" +SCROLLKEEPER_UPDATE="no" inherit autotools eutils gnome2 multilib @@ -14,19 +16,24 @@ SRC_URI="http://download.mugshot.org/client/sources/linux/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="firefox" +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 + >=gnome-base/gnome-desktop-2.10 + >=gnome-base/gnome-vfs-2 >=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.0.1 ) - x11-libs/libXScrnSaver" + x11-libs/libXScrnSaver + firefox? ( !xulrunner? ( + >=www-client/mozilla-firefox-1.5 <www-client/mozilla-firefox-2.0.1 ) ) + xulrunner? ( net-libs/xulrunner )" -DEPEND="${RDEPEND}" +DEPEND=">=gnome-base/gconf-2 + ${RDEPEND}" src_unpack() { unpack ${A} @@ -37,21 +44,29 @@ src_unpack() { epatch "${FILESDIR}/${PN}-1.1.32-libxpcom.patch" epatch "${FILESDIR}/${PN}-1.1.32-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" -} - -src_compile() { - econf $(use_enable firefox) \ - --with-gecko-sdk=/usr/$(get_libdir)/mozilla-firefox/ || die "./configure failed" - emake || die "emake failed" + if use firefox || use xulrunner ; then + G2CONF="--enable-firefox" + if use xulrunner ; then + G2CONF="${G2CONF} --with-gecko-sdk=/usr/$(get_libdir)/xulrunner" + else + G2CONF="${G2CONF} --with-gecko-sdk=/usr/$(get_libdir)/mozilla-firefox" + fi + sed -e "s:GET_LIBDIR:$(get_libdir):" \ + "${FILESDIR}/${PN}-1.1.40-firefox-update.sh" > "${S}/firefox-update.sh" + # support mozilla-firefox-bin if we are compiling for x86 + if [ "${ARCH}" = "x86" -o "${ABI}" = "x86" ] ; then + sed -e 's:{firedir}:{firedir} /opt/firefox:' -i "${S}/firefox-update.sh" + fi + else + G2CONF="--disable-firefox" + fi } pkg_postinst () { gnome2_pkg_postinst # install firefox extension - if use firefox ; then + if use firefox || use xulrunner ; then einfo "Installing firefox extension. " einfo "Please restart firefox in order to use the mugshot extension." "${S}/firefox-update.sh" install diff --git a/profiles/use.local.desc b/profiles/use.local.desc index 79a6bf9df..e616c043b 100644 --- a/profiles/use.local.desc +++ b/profiles/use.local.desc @@ -90,6 +90,7 @@ net-mail/simscan:quarantine - Enable the detected spam/virus to be stored in qua net-mail/simscan:received - Enable the add of a Received line in scanned messages net-mail/simscan:regex - Enable regex attachment filename checking net-mail/simscan:spamassassin - Enable the spam checks with spamassasin +net-misc/mugshot:xulrunner - Compile browser extension using xulrunner net-misc/netbrake:httpfs - Enable the HTTP filesystem support net-p2p/btg:cppunit - Enable building unittests. net-p2p/btg:session-saving - Enable saving sessions (daemon). |