diff options
| -rw-r--r-- | x11-misc/google-gadgets/ChangeLog | 11 | ||||
| -rw-r--r-- | x11-misc/google-gadgets/Manifest | 5 | ||||
| -rw-r--r-- | x11-misc/google-gadgets/google-gadgets-0.10.2-r2.ebuild (renamed from x11-misc/google-gadgets/google-gadgets-0.10.2-r1.ebuild) | 48 | ||||
| -rw-r--r-- | x11-misc/google-gadgets/google-gadgets-0.10.2.ebuild | 145 |
4 files changed, 36 insertions, 173 deletions
diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog index 0c47bbc045cb..702ec757c8c1 100644 --- a/x11-misc/google-gadgets/ChangeLog +++ b/x11-misc/google-gadgets/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for x11-misc/google-gadgets # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.10 2008/09/24 15:13:30 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.11 2008/09/26 11:30:28 loki_val Exp $ + +*google-gadgets-0.10.2-r2 (26 Sep 2008) + + 26 Sep 2008; Peter Alfredsen <loki_val@gentoo.org> + -google-gadgets-0.10.2.ebuild, -google-gadgets-0.10.2-r1.ebuild, + +google-gadgets-0.10.2-r2.ebuild: + Fix for 'undefined symbol: JS_SetOperationCallback', blocking + spidermonkey. Shifting to EAPI 2 and losing a lot of cruft. Fix sysdeps.h + being installed the wrong place, reported by Sput. *google-gadgets-0.10.2-r1 (24 Sep 2008) diff --git a/x11-misc/google-gadgets/Manifest b/x11-misc/google-gadgets/Manifest index 48f3b12c668f..87da091fec6b 100644 --- a/x11-misc/google-gadgets/Manifest +++ b/x11-misc/google-gadgets/Manifest @@ -2,7 +2,6 @@ AUX google-gadgets-0.10.0-xulrunner-1.9.patch 13284 RMD160 4bbb2f3ba511bafddd888 DIST google-gadgets-for-linux-0.10.0.tar.gz 2499027 RMD160 c76ba7b37f7bb976c018c5cbdb60e8ec504601dd SHA1 198e71445e5be4f5880b51cc0dfd9c6b51b908e5 SHA256 5367a44d47d60e31fc17dc43b7b1e1d393147bd901cb8c24f7975781e4abed5a DIST google-gadgets-for-linux-0.10.2.tar.bz2 2188977 RMD160 c38346902f7c5e9cb176677e914683a8e8bf7256 SHA1 b8e18080aeb0758e8eeddfa3f8373e7a95ec958c SHA256 0429408cd215dc8cb33c6fda31c65425366597426e3679004633b874f8fed164 EBUILD google-gadgets-0.10.0-r2.ebuild 4131 RMD160 8dfabe6b0de0591bfa3601eb5868be030a2146d5 SHA1 80a0d9deb5c9ffca3a15dd4bfd1cd1ec0c87d729 SHA256 b5602b80df5dbe69b2d09862be7011c13581bce157659765f63fd3790da6efc7 -EBUILD google-gadgets-0.10.2-r1.ebuild 4597 RMD160 45c0767ddd4f7448f4c4faa752f7648a02598a26 SHA1 253d65b7a52e863338f03d4deff3c4819698daad SHA256 d486b5930d3fa68403f81729904751f66d62ab2c21b37f0ad43f7cbc8e7e15de -EBUILD google-gadgets-0.10.2.ebuild 4510 RMD160 bc1bf0ef57d205e17ed0320ed40c189c4510bc75 SHA1 b5ea12fe16670339fb77566dd359c6ca3c161358 SHA256 c5d1eaf13ec2f497e62e91c2d9bc63ecf1f5339142963d8291f65040572a4b12 -MISC ChangeLog 2266 RMD160 481259c24a0339e62ca042004849f438774da455 SHA1 3cde5e9d004ef8a681491570ccf13385f2a16bef SHA256 bca39fb561c22411e87f7201a3dc3f1793d7cd3cfcf9b3653bc2532837a4ea6c +EBUILD google-gadgets-0.10.2-r2.ebuild 4620 RMD160 583844744a52803d51e90bf7c0d6fed6c7ac8a84 SHA1 1331f422c1fed8e9f10016aca5280ff59af159b6 SHA256 8ba31816571c00ebd3733ee1e975c419ab14bfc2626d7b1a75f608bdf2609546 +MISC ChangeLog 2657 RMD160 cc7799d11dff082d350d85d70a47237d1681785c SHA1 c1ad7742929b86351b8831c01ff71f40c09f5698 SHA256 a5c608d26a37b020a5217d9f8ef8fb739faf0d935fe73f9e55f7eeaea2203e22 MISC metadata.xml 258 RMD160 e363fac4024fa1d6e8481465c06e42cbe2eb9e2a SHA1 26ea33fa143b55cfa84ee879aab41f1b5e337127 SHA256 960cfc8d2eda3540d50ea76f60889fb72e3dc8342ecd9dce2070517e4469f599 diff --git a/x11-misc/google-gadgets/google-gadgets-0.10.2-r1.ebuild b/x11-misc/google-gadgets/google-gadgets-0.10.2-r2.ebuild index 3db53c628b25..b0a25518451f 100644 --- a/x11-misc/google-gadgets/google-gadgets-0.10.2-r1.ebuild +++ b/x11-misc/google-gadgets/google-gadgets-0.10.2-r2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.10.2-r1.ebuild,v 1.1 2008/09/24 15:13:30 loki_val Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.10.2-r2.ebuild,v 1.1 2008/09/26 11:30:28 loki_val Exp $ -EAPI=1 +EAPI=2 -inherit base eutils fdo-mime +inherit base autotools multilib eutils fdo-mime MY_PN=${PN}-for-linux MY_P=${MY_PN}-${PV} @@ -24,13 +24,14 @@ IUSE="+dbus debug +gtk +qt4 +gstreamer" # various combinations of mozilla and spidermonkey. Since its configure script # is broken, though, I've hacked it to depend only on xulrunner-1.9, to avoid # mid-air symbol collisions. A giant bonanza of automagic is what it takes to get -# this to work. I say blah. +# this to work. I say blah. Blocking spidermonkey to avoid incorrect linking. RDEPEND="x11-libs/libX11 x11-libs/libXext >=dev-libs/libxml2-2.6.32 sys-libs/zlib net-libs/xulrunner:1.9 + !dev-lang/spidermonkey dbus? ( sys-apps/dbus ) @@ -42,7 +43,7 @@ RDEPEND="x11-libs/libX11 >=x11-libs/gtk+-2.12.10 >=x11-libs/pango-1.20.3 gnome-base/librsvg - >=net-misc/curl-7.18.2 + >=net-misc/curl-7.18.2[ssl,-nss,-gnutls] >=dev-libs/atk-1.22.0 ) qt4? ( dbus? ( >=x11-libs/qt-dbus-4.4.0 ) @@ -72,29 +73,24 @@ pkg_setup() { if ! use gstreamer then - ewarn "Disabling gstreamer disables the multimedia functions of ${PN}." + ewarn "Disabling gstreamer disables the multimedia functions of ${PN}." ewarn "This is not recommended. To enable gstreamer, do:" ewarn "echo \"${CATEGORY}/${PN} gstreamer\" >> /etc/portage/package.use" fi - if use gtk - then - if built_with_use net-misc/curl ssl - then - if built_with_use net-misc/curl nss || built_with_use net-misc/curl gnutls - then - curl_die - else - einfo "Congratulations! Your net-misc/curl is configured correctly to run" - einfo "${PN}. Not many can say that." - fi - else - curl_die - fi - fi } -src_compile() { +src_unpack() { + base_src_unpack + cd "${S}" + + sed -i -r \ + -e '/^GGL_SYSDEPS_INCLUDE_DIR/ c\GGL_SYSDEPS_INCLUDE_DIR=$GGL_INCLUDE_DIR' \ + configure.ac||die "404" + eautoreconf +} + +src_configure() { #For the time being, the smjs-script runtime is required for both gtk and qt #versions, but the goal is to make the qt4 version depend only on qt-script. has_pkg_smjs=no \ @@ -106,7 +102,7 @@ src_compile() { --enable-smjs-script-runtime \ --with-gtkmozembed=libxul \ --with-smjs-cppflags=-I/usr/include/nspr \ - --with-smjs-libdir=/usr/lib/xulrunner-1.9 \ + --with-smjs-libdir=/usr/$(get_libdir)/xulrunner-1.9 \ --with-smjs-incdir=/usr/include/xulrunner-1.9/unstable \ $(use_enable debug) \ $(use_enable dbus libggadget-dbus) \ @@ -124,7 +120,11 @@ src_compile() { $(use_enable qt4 qt-xml-http-request) \ $(use_enable qt4 qt-script-runtime) \ || die "econf failed" - emake || die "emake failed" +} + +src_compile() { + default_src_compile + #See https://bugs.gentoo.org/238753 } src_test() { diff --git a/x11-misc/google-gadgets/google-gadgets-0.10.2.ebuild b/x11-misc/google-gadgets/google-gadgets-0.10.2.ebuild deleted file mode 100644 index 4e08a497e88f..000000000000 --- a/x11-misc/google-gadgets/google-gadgets-0.10.2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.10.2.ebuild,v 1.1 2008/09/14 15:41:29 loki_val Exp $ - -EAPI=1 - -inherit base eutils fdo-mime - -MY_PN=${PN}-for-linux -MY_P=${MY_PN}-${PV} -DESCRIPTION="Cool gadgets from Google for your Desktop" -HOMEPAGE="http://code.google.com/p/google-gadgets-for-linux/" -SRC_URI="http://${MY_PN}.googlecode.com/files/${MY_P}.tar.bz2" -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+dbus debug +gtk +qt4 +gstreamer" - -# Weird things happen when we start mix-n-matching, so for the time being -# I've just locked the deps to the versions I had as of Summer 2008. With any -# luck, they'll be stable when we get to stabling this package. - -# FIXME: ggl doesn't work with xulrunner:1.9. The other options are -# firefox-3 xulrunner and firefox-2. I was bitten by the fact that the configure -# scripts indicate that xulrunner-1.9 is supported and so couldn't get this -# POS software to run. It took me a couple of compiles to figure out what was -# broken. For now, I've just locked the dep to xulrunner:1.8, since I'm a lazy -# bastard. - -RDEPEND=">=dev-lang/spidermonkey-1.7.0 - x11-libs/libX11 - x11-libs/libXext - >=dev-libs/libxml2-2.6.32 - sys-libs/zlib - - dbus? ( sys-apps/dbus ) - - gstreamer? ( >=media-libs/gstreamer-0.10.19 - >=media-libs/gst-plugins-base-0.10.19 ) - - gtk? ( dbus? ( >=dev-libs/dbus-glib-0.74 ) - >=x11-libs/cairo-1.6.4 - >=x11-libs/gtk+-2.12.10 - >=x11-libs/pango-1.20.3 - gnome-base/librsvg - net-libs/xulrunner:1.8 - >=net-misc/curl-7.18.2 - >=dev-libs/atk-1.22.0 ) - - qt4? ( dbus? ( >=x11-libs/qt-dbus-4.4.0 ) - >=x11-libs/qt-core-4.4.0 - >=x11-libs/qt-webkit-4.4.0 - >=x11-libs/qt-xmlpatterns-4.4.0 - >=x11-libs/qt-opengl-4.4.0 - >=x11-libs/qt-script-4.4.0 )" -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.20" - -S="${WORKDIR}/${MY_P}" - -RESTRICT="test" - -pkg_setup() { - - # If a non-google, non-qt4 and non-gtk host system for google-gadgets is ever developed, - # I'll consider changing the error below. - if ! use gtk && ! use qt4 - then - eerror "You must choose which toolkit to build for. Either qt4 or gtk can be" - eerror "chosen. For qt4, see also above. To enable \$toolkit, do:" - eerror "echo \"${CATEGORY}/${PN} \$toolkit\" >> /etc/portage/package.use" - die "You need to choose a toolkit" - fi - - if ! use gstreamer - then - ewarn "Disabling gstreamer disables the multimedia functions of ${PN}." - ewarn "This is not recommended. To enable gstreamer, do:" - ewarn "echo \"${CATEGORY}/${PN} gstreamer\" >> /etc/portage/package.use" - fi - - if use gtk - then - if built_with_use net-misc/curl ssl - then - if built_with_use net-misc/curl nss || built_with_use net-misc/curl gnutls - then - curl_die - else - einfo "Congratulations! Your net-misc/curl is configured correctly to run" - einfo "${PN}. Not many can say that." - fi - else - curl_die - fi - fi -} - -src_compile() { - #For the time being, the smjs-script runtime is required for both gtk and qt - #versions, but the goal is to make the qt4 version depend only on qt-script. - - econf --disable-dependency-tracking \ - --disable-update-desktop-database \ - --disable-update-mime-database \ - --disable-werror \ - --enable-libxml2-xml-parser \ - --enable-smjs-script-runtime \ - --with-gtkmozembed=xulrunner \ - $(use_enable debug) \ - $(use_enable dbus libggadget-dbus) \ - $(use_enable gstreamer gst-audio-framework) \ - $(use_enable gstreamer gst-mediaplayer-element) \ - $(use_enable gtk gtk-host) \ - $(use_enable gtk libggadget-gtk ) \ - $(use_enable gtk gtkmoz-browser-element) \ - $(use_enable gtk gtk-system-framework) \ - $(use_enable gtk curl_xml_http_request) \ - $(use_enable qt4 qt-host) \ - $(use_enable qt4 libggadget-qt) \ - $(use_enable qt4 qt-system-framework) \ - $(use_enable qt4 qtwebkit-browser-element) \ - $(use_enable qt4 qt-xml-http-request) \ - $(use_enable qt4 qt-script-runtime) \ - || die "econf failed" - emake || die "emake failed" -} - -src_test() { - #If someone wants to guarantee that emake will not make - #tests fail promiscuosly, please do, otherwise we're using make. - make check &> "${WORKDIR}"/check -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} - -curl_die() { - eerror "net-misc/curl must be built with these use flags: ssl -gnutls -nss" - eerror "to do so, do:" - eerror 'echo "net-misc/curl ssl -gnutls -nss" >> /etc/portage/package.use' - die "Your net-misc/curl was misconfigured." -} |