Bump to 0.10.0, remove old.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.8 i686

5 files changed, 13 insertions, 203 deletions

diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
index e025b7b511fe..1a342f843c6c 100644
--- a/x11-misc/google-gadgets/ChangeLog
+++ b/x11-misc/google-gadgets/ChangeLog
@@ -1,6 +1,14 @@
 # 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.4 2008/06/13 23:03:04 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.5 2008/07/11 20:20:31 loki_val Exp $
+
+*google-gadgets-0.10.0 (11 Jul 2008)
+
+  11 Jul 2008; Peter Alfredsen <loki_val@gentoo.org>
+  -files/google-gadgets-0.9.2-gcc43-test.patch,
+  -google-gadgets-0.9.2-r1.ebuild, -google-gadgets-0.9.3.ebuild,
+  +google-gadgets-0.10.0.ebuild:
+  Bump to 0.10.0, remove old.
 
 *google-gadgets-0.9.3 (13 Jun 2008)
 
diff --git a/x11-misc/google-gadgets/Manifest b/x11-misc/google-gadgets/Manifest
index 5a4e5ecd5402..60ecf0494a9c 100644
--- a/x11-misc/google-gadgets/Manifest
+++ b/x11-misc/google-gadgets/Manifest
@@ -1,7 +1,4 @@
-AUX google-gadgets-0.9.2-gcc43-test.patch 1636 RMD160 1dacc2f269b8b32706b8cf286c02b65d64bd5b3d SHA1 05ea180b9c083457fcfc1e14d76af28aef62a680 SHA256 fe66aee1d1003180d1dc7c2b6e9fc5c179b812271880adb0470a38a87949fab6
-DIST google-gadgets-for-linux-0.9.2.tar.gz 2335255 RMD160 ca4f3566aa18de287b72d3cab8ace50e27c3e427 SHA1 931832a65a1025df810b3665520958da00adc094 SHA256 4918565eafa989f0c027a2ab5592a483eb5fde059ce15e1eb8a239edfd3a82ad
-DIST google-gadgets-for-linux-0.9.3.tar.gz 2338243 RMD160 dc28dd2d2224b28351841fa8fc3ddf30b9a97cc6 SHA1 12257e5ec153e54e22bbbbeeba0352dc74c290f0 SHA256 6b93b3d39719c10063e143e919e9ee65956dacc51bbc5aa1cafef76c71abcff6
-EBUILD google-gadgets-0.9.2-r1.ebuild 4300 RMD160 24af7e8a1f21e1deb77b9a9c7d42b48764f8d8b7 SHA1 e6b1ef4ec3ae2d034f4acd93d3c195db91e52061 SHA256 c2a8d8b3babd2e99e4d499d6cefb57ce61e2ac14011478a758da5b4e427d29d6
-EBUILD google-gadgets-0.9.3.ebuild 4241 RMD160 71dfcb6b03b342022d22dad93c8729a615c9ebfa SHA1 faf1b5aaf4ffa1e9559f4c87d4768d8706ae992c SHA256 5d3e0066c6f5c2432094037b4ccc5440f081d211b943ea0bd74343a0e094e923
-MISC ChangeLog 863 RMD160 d7621f164cd3583e29cf44cc8d89c681facbef2a SHA1 d6d107c0398f2945272ee4a5ef852e5a55716403 SHA256 21c7ba95fb0d6a50db2ec0b194c832463f8edf36dbc021c9f9a57b240d27affe
+DIST google-gadgets-for-linux-0.10.0.tar.gz 2499027 RMD160 c76ba7b37f7bb976c018c5cbdb60e8ec504601dd SHA1 198e71445e5be4f5880b51cc0dfd9c6b51b908e5 SHA256 5367a44d47d60e31fc17dc43b7b1e1d393147bd901cb8c24f7975781e4abed5a
+EBUILD google-gadgets-0.10.0.ebuild 4186 RMD160 5b3468c67c1f6310787453d3406e511db06bbd39 SHA1 22bed8c2f79e94c3582a08af5dd64077d1ece2fc SHA256 19d6d7ad98c3a94a13e660ecab234d332ef84ce952f0271d23702ed763d16407
+MISC ChangeLog 1131 RMD160 d679ee60ee5e741c78d3e86f29c96e0ca886dbf7 SHA1 a2824c3a070fe541869651f55513eae7f1665fec SHA256 f180f28165f7bcad6a428668762ed6fb5171f8462be0dcef7038ca5bd57cc9a8
 MISC metadata.xml 258 RMD160 e363fac4024fa1d6e8481465c06e42cbe2eb9e2a SHA1 26ea33fa143b55cfa84ee879aab41f1b5e337127 SHA256 960cfc8d2eda3540d50ea76f60889fb72e3dc8342ecd9dce2070517e4469f599
diff --git a/x11-misc/google-gadgets/files/google-gadgets-0.9.2-gcc43-test.patch b/x11-misc/google-gadgets/files/google-gadgets-0.9.2-gcc43-test.patch
deleted file mode 100644
index 2c4ea53d4fc7..000000000000
--- a/x11-misc/google-gadgets/files/google-gadgets-0.9.2-gcc43-test.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- google-gadgets-for-linux-0.9.2.orig/ggadget/tests/backoff_test.cc	2008-06-06 21:26:11.000000000 +0200
-+++ google-gadgets-for-linux-0.9.2/ggadget/tests/backoff_test.cc	2008-06-06 21:29:54.000000000 +0200
-@@ -11,10 +11,11 @@
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- */
-+#include  <cstdlib>
- 
- #include "ggadget/backoff.h"
- #include "ggadget/string_utils.h"
- #include "unittest/gtest.h"
- 
-
---- google-gadgets-for-linux-0.9.2.orig/ggadget/tests/native_main_loop.cc	2008-06-06 23:18:19.000000000 +0200
-+++ google-gadgets-for-linux-0.9.2/ggadget/tests/native_main_loop.cc	2008-06-06 23:18:36.000000000 +0200
-@@ -12,10 +12,11 @@
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- */
- 
-+#include <limits.h>
- #include <sys/time.h>
- #include <sys/select.h>
- #include <sys/types.h>
- #include <unistd.h>
- #include <time.h>
---- google-gadgets-for-linux-0.9.2.orig/ggadget/tests/main_loop_test.h	2008-06-06 23:26:39.000000000 +0200
-+++ google-gadgets-0.9.2/work/google-gadgets-for-linux-0.9.2/ggadget/tests/main_loop_test.h	2008-06-06 23:26:57.000000000 +0200
-@@ -14,10 +14,11 @@
-   limitations under the License.
- */
- 
- #ifndef GGADGET_TESTS_MAIN_LOOP_TEST_H__
- #define GGADGET_TESTS_MAIN_LOOP_TEST_H__
-+#include <cstdlib>
- #include <unistd.h>
- #include <cstring>
- #include <vector>
- #include <string>
- 
diff --git a/x11-misc/google-gadgets/google-gadgets-0.9.3.ebuild b/x11-misc/google-gadgets/google-gadgets-0.10.0.ebuild
index c20dfc07fdca..362215eb6804 100644
--- a/x11-misc/google-gadgets/google-gadgets-0.9.3.ebuild
+++ b/x11-misc/google-gadgets/google-gadgets-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # 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.9.3.ebuild,v 1.1 2008/06/13 23:03:04 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.10.0.ebuild,v 1.1 2008/07/11 20:20:31 loki_val Exp $
 
 EAPI=1
 
@@ -49,8 +49,6 @@ S="${WORKDIR}/${MY_P}"
 
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-0.9.2-gcc43-test.patch" )
-
 pkg_setup() {
 	if ! use qt4
 	then
diff --git a/x11-misc/google-gadgets/google-gadgets-0.9.2-r1.ebuild b/x11-misc/google-gadgets/google-gadgets-0.9.2-r1.ebuild
deleted file mode 100644
index 73c53f341f52..000000000000
--- a/x11-misc/google-gadgets/google-gadgets-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,150 +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.9.2-r1.ebuild,v 1.3 2008/06/11 11:20:26 welp Exp $
-
-EAPI=1
-
-inherit base eutils
-
-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.gz"
-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 have.
-# google gadgets will compile against xulrunner-1.9. Work, well...
-RDEPEND=">=dev-lang/spidermonkey-1.7.0
-	x11-libs/libX11
-	x11-libs/libXext
-	>=dev-libs/libxml2-2.6.32
-	>=sys-libs/zlib-1.2.3-r1
-
-	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
-		>=net-libs/xulrunner-1.8.1.14
-		>=net-misc/curl-7.18.1
-		>=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 )"
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.20"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-gcc43-test.patch" )
-
-pkg_setup() {
-	if ! use qt4
-	then
-		ewarn "Since >=x11-libs/qt-core-4.4.0 and related packages are package.masked"
-		ewarn "pending updates to the tree, the qt4 backend for ${PN} will not be built"
-		ewarn "unless you unmask the qt dependencies of this package and add"
-		ewarn "${CATEGORY}/${PN} -qt4"
-		ewarn "to /etc/portage/profile/package.use.mask"
-	fi
-
-	# 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() {
-	econf	--disable-dependecy-tracking \
-		--disable-werror \
-		--enable-libxml2-xml-parser \
-		--enable-smjs-script-runtime \
-		$(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) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_test() {
-	make check &> "${WORKDIR}"/check
-}
-
-src_install() {
-	base_src_install
-
-	#Icon
-	newicon resources/gadgets.png googlegadgets.png
-
-	# Desktop entries
-	if use gtk
-	then
-		make_desktop_entry "ggl-gtk" "Google Gadgets (GTK)" googlegadgets
-		make_desktop_entry "ggl-gtk -s" "Google Gadgets (GTK sidebar)" googlegadgets
-	fi
-
-	if use qt4
-	then
-		make_desktop_entry "ggl-qt" "Google Gadgets (QT)" googlegadgets
-	fi
-}
-
-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."
-}