5 files changed, 6 insertions, 189 deletions
diff --git a/dev-libs/libindicator/ChangeLog b/dev-libs/libindicator/ChangeLog
index b92e9e00ff82..2476310e000a 100644
--- a/dev-libs/libindicator/ChangeLog
+++ b/dev-libs/libindicator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libindicator
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/ChangeLog,v 1.7 2011/11/19 14:13:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/ChangeLog,v 1.8 2011/11/19 17:50:17 ssuominen Exp $
+
+  19 Nov 2011; Samuli Suominen <ssuominen@gentoo.org>
+  -libindicator-0.3.6.ebuild, -files/libindicator-0.3.6-missing_template.patch,
+  -libindicator-0.3.13.ebuild, -libindicator-0.3.22.ebuild:
+  old
 
 *libindicator-0.4.1-r200 (19 Nov 2011)
 
diff --git a/dev-libs/libindicator/files/libindicator-0.3.6-missing_template.patch b/dev-libs/libindicator/files/libindicator-0.3.6-missing_template.patch
deleted file mode 100644
index 68e12a5e7018..000000000000
--- a/dev-libs/libindicator/files/libindicator-0.3.6-missing_template.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- /dev/null
-+++ libindicator/indicator-object-enum-types.c.template
-@@ -0,0 +1,30 @@
-+/*** BEGIN file-header ***/
-+#include "indicator-object-enum-types.h"
-+/*** END file-header ***/
-+
-+/*** BEGIN file-production ***/
-+/* enumerations from "@filename@" */
-+#include "@filename@"
-+/*** END file-production ***/
-+
-+/*** BEGIN value-header ***/
-+GType
-+@enum_name@_get_type (void) {
-+  static GType enum_type_id = 0;
-+  if (G_UNLIKELY (!enum_type_id))
-+    {
-+      static const G@Type@Value values[] = {
-+/*** END value-header ***/
-+
-+/*** BEGIN value-production ***/
-+        { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
-+/*** END value-production ***/
-+
-+/*** BEGIN value-tail ***/
-+        { 0, NULL, NULL }
-+      };
-+      enum_type_id = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
-+    }
-+  return enum_type_id;
-+}
-+/*** END value-tail ***/
---- /dev/null
-+++ libindicator/indicator-object-enum-types.h.template
-@@ -0,0 +1,27 @@
-+/*** BEGIN file-header ***/
-+
-+#ifndef __INDICATOR_OBJECT_ENUM_TYPES_H__
-+#define __INDICATOR_OBJECT_ENUM_TYPES_H__
-+
-+#include <glib-object.h>
-+
-+G_BEGIN_DECLS
-+
-+/*** END file-header ***/
-+
-+/*** BEGIN file-production ***/
-+/* enumerations from "@filename@" */
-+/*** END file-production ***/
-+
-+/*** BEGIN file-tail ***/
-+G_END_DECLS
-+
-+#endif /* !__INDICATOR_OBJECT_ENUM_TYPES_H__ */
-+/*** END file-tail ***/
-+
-+/*** BEGIN value-header ***/
-+
-+GType @enum_name@_get_type (void) G_GNUC_CONST;
-+#define INDICATOR_OBJECT_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
-+
-+/*** END value-header ***/
diff --git a/dev-libs/libindicator/libindicator-0.3.13.ebuild b/dev-libs/libindicator/libindicator-0.3.13.ebuild
deleted file mode 100644
index 18f6f939de3a..000000000000
--- a/dev-libs/libindicator/libindicator-0.3.13.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/libindicator-0.3.13.ebuild,v 1.1 2010/09/18 18:53:14 eva Exp $
-
-EAPI=2
-
-inherit autotools base eutils
-
-DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
-HOMEPAGE="http://launchpad.net/libindicator/"
-SRC_URI="http://launchpad.net/${PN}/0.3/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.18:2
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/dbus-glib-0.76
-	!<gnome-extra/indicator-applet-0.2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS"
-
-src_prepare() {
-	sed -i \
-		-e 's:-Werror::' \
-		{libindicator,tests,tools}/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static
-}
diff --git a/dev-libs/libindicator/libindicator-0.3.22.ebuild b/dev-libs/libindicator/libindicator-0.3.22.ebuild
deleted file mode 100644
index 709222d67382..000000000000
--- a/dev-libs/libindicator/libindicator-0.3.22.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/libindicator-0.3.22.ebuild,v 1.1 2011/05/07 20:55:30 angelos Exp $
-
-EAPI=4
-inherit autotools
-
-DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
-HOMEPAGE="http://launchpad.net/libindicator/"
-SRC_URI="http://launchpad.net/${PN}/0.3/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.18:2
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/dbus-glib-0.76
-	!<gnome-extra/indicator-applet-0.2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	sed -i \
-		-e 's:-Werror::' \
-		{libindicator,tests,tools}/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# TODO gtk+3 support
-	econf \
-		--disable-static \
-		--with-gtk=2
-}
-
-src_install() {
-	emake DESTDIR="${D}" -j1 install
-	dodoc AUTHORS ChangeLog
-	find "${ED}" -type f -name "*.la" -exec rm -rf {} + || die
-}
diff --git a/dev-libs/libindicator/libindicator-0.3.6.ebuild b/dev-libs/libindicator/libindicator-0.3.6.ebuild
deleted file mode 100644
index 71772875732a..000000000000
--- a/dev-libs/libindicator/libindicator-0.3.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicator/libindicator-0.3.6.ebuild,v 1.2 2010/03/31 21:22:46 ssuominen Exp $
-
-EAPI=2
-inherit autotools eutils
-
-DESCRIPTION="A set of symbols and convience functions that all indicators would like to use"
-HOMEPAGE="http://launchpad.net/libindicator/"
-SRC_URI="http://launchpad.net/${PN}/0.3/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.18:2
-	>=dev-libs/glib-2.22:2
-	>=dev-libs/dbus-glib-0.76
-	!<gnome-extra/indicator-applet-0.2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-missing_template.patch
-
-	sed -i \
-		-e 's:-Werror::' \
-		{libindicator,tests,tools}/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS
-}