libido: Version bump, drop gtk2 with its ubuntu specific functions

4 files changed, 10 insertions, 108 deletions

diff --git a/media-sound/indicator-sound/indicator-sound-0.7.0.ebuild b/media-sound/indicator-sound/indicator-sound-0.7.0.ebuild
deleted file mode 100644
index ff447b5..0000000
--- a/media-sound/indicator-sound/indicator-sound-0.7.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit gnome2-utils
-
-DESCRIPTION="A unified sound menu"
-HOMEPAGE="https://launchpad.net/indicator-sound"
-SRC_URI="http://launchpad.net/${PN}/fourth/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="dev-libs/glib:2
-	>=dev-libs/libdbusmenu-0.3.101[gtk,vala]
-	dev-libs/libgee
-	>=dev-libs/libindicator-0.3.19
-	dev-libs/libxml2:2
-	gnome-base/gconf:2
-	media-sound/pulseaudio[glib]
-	x11-libs/gtk+:2
-	x11-libs/libido
-	>=x11-libs/libnotify-0.7"
-DEPEND="${RDEPEND}
-	dev-lang/vala:0.12
-	dev-util/pkgconfig"
-
-DOCS=( AUTHORS )
-
-src_configure() {
-	VALAC=$(type -p valac-0.12) \
-		econf \
-		--disable-static \
-		--disable-schemas-compile
-}
-
-src_install() {
-	default
-	find "${ED}" -name "*.la" -exec rm -rf {} +
-}
-
-pkg_preinst() { gnome2_schemas_savelist; }
-pkg_postinst() { gnome2_schemas_update; }
-pkg_postrm() { gnome2_schemas_update; }
diff --git a/x11-libs/libido/Manifest b/x11-libs/libido/Manifest
index bc32d46..0684bbd 100644
--- a/x11-libs/libido/Manifest
+++ b/x11-libs/libido/Manifest
@@ -1,4 +1,4 @@
-AUX libido-0.2.2-remove-ubuntu.patch 1263 RMD160 c1f061bde6200b74a5a9f279966a9835542cc597 SHA1 10c33553037d1c91d1864892ce6f74e9e20beba5 SHA256 a28ed6d4e737e39adddf2202a31b19ba6adb6cf51b82ac74690947172db4dfee
-DIST ido-0.2.2.tar.gz 322293 RMD160 29b9445b0237819eb4db5d85ba408009a3711b99 SHA1 9d37ecfd62a3c6cced61c8dcc6d282a792235090 SHA256 2bc696278f6eab881e8c6558bd6e4ef7e4d102ed613ea8d88510aa6cc0b1930c
-EBUILD libido-0.2.2.ebuild 690 RMD160 e1f95897058c5aa1bda4570e47ff7e6e19b62a1b SHA1 0e831ec6c0dd6bd8cce7f94a3af1d1a1b08024e6 SHA256 f1a827c3cfd3c6f1d2c9aeed3a0c1b56e7f7fff028a68e6f646932a5f5db6455
-MISC metadata.xml 140 RMD160 580e775b5b49d7303a7053e405f8db311400197a SHA1 b70c9d212cdfe358e63058de175f1122833a6579 SHA256 46e94927a74c45d5fd3e380fdc946886e83bc28a0a51b4f57b0a360428a5cf4b
+AUX libido-0.2.2-remove-ubuntu.patch 1263 SHA256 a28ed6d4e737e39adddf2202a31b19ba6adb6cf51b82ac74690947172db4dfee SHA512 b1f7f2f29bc9e4f435c9ed2fc3a06c60df83f2e061f1e354ae0a45bb9fbed0eb54239607f150ca1534ac6056b709e734df25085dd2f101fe9b026c49722baf75 WHIRLPOOL a9ded50007503bf42c464963e0baf30dd9cc36f08a9585cfaba3dc17b7024a1b5fe533a9c336270b41adc7f720cb6dd349a35fd3842b9245fd76dec5354ac17c
+DIST ido-0.3.4.tar.gz 341210 SHA256 19e2b3885df4871d8baf8f543e572dff32f0733d6d32d91657e06a5f85a604d2 SHA512 5c4f9902e271cfab3aad15e99f855322159ab96165830cc40ca1c5fce29798413119a473880be3d7639a227db55b2c4e8f17083b690f215e357ea6b2843310d8 WHIRLPOOL a06246beaa16f0df6664a6367164777428af4ae6947c6b9d1320a19ea6615f993c730776b8a5a13f071fcf2fbdbca0b8bd391239d008e46dcd0c0d092bbb2c0e
+EBUILD libido-0.3.4.ebuild 595 SHA256 4822224ad3afc80a5f9bfe6bb9dfe090bf05698ccb1719305027529f9019646b SHA512 0e7eeeb9348bd714e18c3f78d4eb2d73338eb1d816b3912ded9da6a7cd094ae99961c1c638ae9fbd4a7384ead9de20a59a956fd3af06e15cff53e419074a499f WHIRLPOOL 21c98bd0a7ba74c7e8e1bcba02f5f28cf746ef182aec5e5c585685efd140c3aa1432e9a0c077546c92555d2006f3da88d8540f059f699dcaa5c5629ff1d85dc9
+MISC metadata.xml 140 SHA256 46e94927a74c45d5fd3e380fdc946886e83bc28a0a51b4f57b0a360428a5cf4b SHA512 fea2d8570514bac76535850a58a9fb50946a315efd0448cbb3fb0d543acc203541fb3431bd4c3ca82e057f2bd4fcd763da81d07dccfd4a788aedc9aa825d6296 WHIRLPOOL 78baff9ed584f9e1f978667c5b19ba0a66fe2793cacd56c2afbb9fd22fad28d6d012c3d976e8ad30aa4ddd63614cc990bb3a89a2052b3271e4cfd77003d5158e
diff --git a/x11-libs/libido/files/libido-0.2.2-remove-ubuntu.patch b/x11-libs/libido/files/libido-0.2.2-remove-ubuntu.patch
deleted file mode 100644
index 74fd4e1..0000000
--- a/x11-libs/libido/files/libido-0.2.2-remove-ubuntu.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-=== modified file 'src/Makefile.am'
---- ido/src/Makefile.am	2011-02-24 19:32:26 +0000
-+++ ido/src/Makefile.am	2011-04-05 06:59:42 +0000
-@@ -41,7 +41,7 @@
- 	-DG_DISABLE_DEPRECATED		\
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
- 	-DGDK_DISABLE_DEPRECATED	\
--	-DGTK_DISABLE_DEPRECATED
-+	-DGTK_NODISABLE_DEPRECATED
- 
- AM_CPPFLAGS =				\
- 	$(GCC_FLAGS)			\
-
-=== modified file 'src/Makefile.in'
---- ido/src/Makefile.in	2010-09-14 19:33:01 +0000
-+++ ido/src/Makefile.in	2011-04-05 06:59:52 +0000
-@@ -273,7 +273,7 @@
- 	-DG_DISABLE_DEPRECATED		\
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED	\
- 	-DGDK_DISABLE_DEPRECATED	\
--	-DGTK_DISABLE_DEPRECATED
-+	-DGTK_NODISABLE_DEPRECATED
- 
- AM_CPPFLAGS = \
- 	$(GCC_FLAGS)			\
-
-=== modified file 'src/idoscalemenuitem.c'
---- ido/src/idoscalemenuitem.c	2011-02-24 21:13:29 +0000
-+++ ido/src/idoscalemenuitem.c	2011-04-05 06:58:47 +0000
-@@ -483,12 +483,12 @@
-   translate_event_coordinates (menuitem, event->x_root, &x);
-   event->x_root = x;
- 
--  ubuntu_gtk_widget_set_has_grab (scale, TRUE);
-+  GTK_OBJECT_FLAGS (scale) |= GTK_HAS_GRAB;
- 
-   gtk_widget_event (scale,
-                     ((GdkEvent *)(void*)(event)));
- 
--  ubuntu_gtk_widget_set_has_grab (scale, FALSE);
-+  GTK_OBJECT_FLAGS (scale) &= ~(GTK_HAS_GRAB);
- 
-   if (!priv->grabbed)
-     {
-
diff --git a/x11-libs/libido/libido-0.2.2.ebuild b/x11-libs/libido/libido-0.3.4.ebuild
index 5cd6655..0a44a61 100644
--- a/x11-libs/libido/libido-0.2.2.ebuild
+++ b/x11-libs/libido/libido-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -10,26 +10,20 @@ MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Widgets and other objects used for indicators"
 HOMEPAGE="https://launchpad.net/ido"
-SRC_URI="http://launchpad.net/ido/trunk/${PV}/+download/${MY_P}.tar.gz"
+SRC_URI="http://launchpad.net/ido/0.3/${PV}/+download/${MY_P}.tar.gz"
 
-LICENSE="LGPL-2.1 LGPL-3"
+LICENSE="LGPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND="x11-libs/gtk+:2"
+RDEPEND="x11-libs/gtk+:3"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
 
 S=${WORKDIR}/${MY_P}
 
-pkg_setup() {
-	DOCS=( AUTHORS )
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-remove-ubuntu.patch
-}
+DOCS=( AUTHORS )
 
 src_install() {
 	default