# ChangeLog for net-misc/mugshot
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 10 Jan 2008; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+ -files/mugshot-1.1.40-firefox-update.sh,
+ +files/mugshot-1.1.58-firefox-update.sh, -mugshot-1.1.56.ebuild,
+ +mugshot-1.1.58.ebuild:
+ Version bump. Fix broken firefox extension symlink management.
+
29 Oct 2007; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
-files/mugshot-1.1.32-use-firefox.patch,
-files/mugshot-1.1.46-as-needed.patch,
-AUX mugshot-1.1.40-firefox-update.sh 950 RMD160 d11c5ae1620ac54210c8787b398c2c77ac286eed SHA1 033d81c1c32d6ba0b893569e151007bce0efa3d3 SHA256 0141d1a1d87376da73de6032966a0ace9b771ded3b6996d5126b5d34713fcd47
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
-DIST mugshot-1.1.56.tar.gz 950677 RMD160 189b7a9bf986c8db5102f6cab02fda66e5af2684 SHA1 fbced6f2d6f34eb9af563040741b4dd4d4ac1ef7 SHA256 7015b8a27843f25d5635b98719aaf6f958afd7e2973ce8c9c29df839177b62dd
-EBUILD mugshot-1.1.56.ebuild 2478 RMD160 5dd3e6892a662b8d3ff5ea4d4e48d0ec1e234b5f SHA1 54e5ffece9f065a089ab48721f973456ec8e1acd SHA256 2d17859d7ee595d9d936875a79618620d1f9042a4a0c84d72b97f3ffb6ff07e6
-MISC ChangeLog 3204 RMD160 8214ee804cd9f0f6745748f2f9cda5969314e2b3 SHA1 9b66818abb19e69ba4073f5dd0e80ba5630aa625 SHA256 7bc3f91459422f1205b1d7ae471f12c4ca56627542ab6e6dcbe47ce5f57b3808
+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 3097 RMD160 c2eecb778eb2d4ec43ab7712a18d6546af00d5c5 SHA1 60c642f94a6bae86f9d5d467d14dbdc1481e424d SHA256 265a5048ecb99af86af71c27cd93fa8b86f81cb16d34be6a75b9ab8387acc294
+MISC ChangeLog 3476 RMD160 378b13f16e8c12bb84e79b874cfdf58cb97808e6 SHA1 221aa051b7d88fc890fa452ee265134185fd6fd1 SHA256 2a30084674a561ebdf5b6d007b00406f9903c8e9b9853eff3da61fcf9c01494c
MISC metadata.xml 530 RMD160 a0de7b0954d9ca56bc70b0e88b142863f9be95d5 SHA1 a35ff660684677bd26df838de5e13e6714785639 SHA256 321f065a29cd9c0a50dc82817691564d465ee6a2d32a34dd6912f968199af338
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
media-libs/jpeg
>=gnome-base/gnome-desktop-2.10
>=gnome-base/gnome-vfs-2
- >=net-libs/loudmouth-1
+ >=net-libs/loudmouth-1.2.2
>=net-misc/curl-7.13.1
x11-libs/cairo
>=x11-libs/gtk+-2.6
- x11-libs/hippo-canvas
x11-libs/libXScrnSaver
x11-libs/pango
firefox? ( !xulrunner? (
>=gnome-base/gconf-2
${RDEPEND}"
+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}/${P}-use-firefox.patch" || die "epatch failed"
+ epatch "${FILESDIR}/${PN}-1.1.56-use-firefox.patch" || die "epatch failed"
eautoreconf
if use firefox || use xulrunner ; then
G2CONF="--enable-firefox"
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"
+ "${FILESDIR}/${P}-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"
+ FIREDIRS="${FIREDIRS} /opt/firefox"
fi
+ sed -e "s:FIREDIRS:${FIREDIRS}:" -i "${S}/firefox-update.sh"
else
G2CONF="--disable-firefox"
fi
- G2CONF="${G2CONF} $(use_with sqlite) --without-included-canvas"
+ # external hippo-canvas seems to be deprecated now?
+ G2CONF="${G2CONF} $(use_with sqlite) --with-included-canvas"
}
-pkg_postinst () {
- gnome2_pkg_postinst
+src_install() {
+ gnome2_src_install
- # install firefox extension
+ # 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. "
- einfo "Please restart firefox in order to use the mugshot extension."
- "${S}/firefox-update.sh" install
+ einfo "Installing firefox extension."
+ for d in ${FIREDIRS} ; do
+ if [ -e "$d/firefox-bin" -a -d "$d/extensions" ] ; then
+ dosym "/usr/$(get_libdir)/mugshot/firefox" "${d}/extensions/firefox@mugshot.org"
+ fi
+ done
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
+pkg_postinst () {
+ gnome2_pkg_postinst
+
+ if use firefox || use xulrunner ; then
+ # pkg_prerm logic was broken in older ebuilds
+ elog
+ elog "If you are upgrading from <net-misc/mugshot-1.1.58 please run"
+ elog " /usr/share/firefox-update.sh install"
+ elog "to properly install the firefox extension."
+ 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."
}
projects / ~andy / sunrise / commitdiff