old

(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)

5 files changed, 7 insertions, 220 deletions

diff --git a/dev-libs/libappindicator/ChangeLog b/dev-libs/libappindicator/ChangeLog
index 06510f869751..859c01e83283 100644
--- a/dev-libs/libappindicator/ChangeLog
+++ b/dev-libs/libappindicator/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libappindicator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v 1.9 2012/07/26 16:23:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/ChangeLog,v 1.10 2012/07/26 16:25:58 ssuominen Exp $
+
+  26 Jul 2012; Samuli Suominen <ssuominen@gentoo.org>
+  -libappindicator-0.4.1-r201.ebuild, -libappindicator-0.4.1-r300.ebuild,
+  -files/libappindicator-0.4.1-gtk.patch,
+  -files/libappindicator-0.4.1-no-mono.patch:
+  old
 
 *libappindicator-12.10.0 (26 Jul 2012)
 
diff --git a/dev-libs/libappindicator/files/libappindicator-0.4.1-gtk.patch b/dev-libs/libappindicator/files/libappindicator-0.4.1-gtk.patch
deleted file mode 100644
index e36391103f08..000000000000
--- a/dev-libs/libappindicator/files/libappindicator-0.4.1-gtk.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/app-indicator.c
-+++ src/app-indicator.c
-@@ -33,8 +33,13 @@
- 
- #include <libdbusmenu-glib/menuitem.h>
- #include <libdbusmenu-glib/server.h>
-+#ifdef HAVE_GTK3
-+#include <libdbusmenu-gtk3/client.h>
-+#include <libdbusmenu-gtk3/parser.h>
-+#else
- #include <libdbusmenu-gtk/client.h>
- #include <libdbusmenu-gtk/parser.h>
-+#endif
- 
- #include <libindicator/indicator-desktop-shortcuts.h>
- 
diff --git a/dev-libs/libappindicator/files/libappindicator-0.4.1-no-mono.patch b/dev-libs/libappindicator/files/libappindicator-0.4.1-no-mono.patch
deleted file mode 100644
index ed713c1bee3f..000000000000
--- a/dev-libs/libappindicator/files/libappindicator-0.4.1-no-mono.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-This is waiting for http://bugs.gentoo.org/382491.  A temporary patch to disable mono.
-
---- bindings/Makefile.am
-+++ bindings/Makefile.am
-@@ -1,10 +1,8 @@
- if USE_GTK3
- SUBDIRS =	\
--	mono	\
- 	vala
- else
- SUBDIRS =		\
--	mono		\
- 	python		\
- 	vala
- endif
---- configure.ac
-+++ configure.ac
-@@ -101,61 +101,6 @@
- AM_CONDITIONAL(HAVE_VALAC, [test "x$VALAC" != "x"])
- 
- ###########################
--# Check for Mono support
--###########################
--
--MONO_REQUIRED_VERSION=1.0
--PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false)
--
--AC_PATH_PROG(AL, al, no)
--if test "x$AL" = "xno" ; then
--   AC_MSG_ERROR([No al tool found.  You need to install Mono.])
--fi
--
--if test "x$has_mono" = "xtrue" ; then
--   GENERATED_SOURCES=generated/*.cs
--   AC_PATH_PROG(RUNTIME, mono, no)
--
--   if test "x$RUNTIME" != "no" ; then
--      RUNTIME=mono
--   fi
--
--   AC_PATH_PROG(CSC, gmcs, no)
--   LIB_PREFIX=.so
--   LIB_SUFFIX=
--fi
--
--if test "x$CSC" = "xno" ; then
--   AC_MSG_ERROR([No Mono compiler found.])
--fi
--
--AC_PATH_PROG(GACUTIL, gacutil, no)
--if test "x$GACUTIL" = "xno" ; then
--   AC_MSG_ERROR([No gacutil tool found])
--fi
--
--AC_SUBST(RUNTIME)
--AC_SUBST(CSC)
--AC_SUBST(GACUTIL)
--AC_SUBST(LIB_PREFIX)
--AC_SUBST(LIB_SUFFIX)
--AC_SUBST(GENERATED_SOURCES)
--
--GLIB_SHARP_REQ_VERSION=2.12.1
--GTK_SHARP_REQ_VERSION=2.12
--PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION)
--
--PKG_CHECK_MODULES(GAPI, gapi-2.0 >= $GLIB_SHARP_REQ_VERSION)
--AC_PATH_PROG(GAPI_PARSER, gapi2-parser, no)
--AC_SUBST(GAPI_PARSER)
--AC_PATH_PROG(GAPI_CODEGEN, gapi2-codegen, no)
--AC_SUBST(GAPI_CODEGEN)
--AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no)
--AC_SUBST(GAPI_FIXUP)
--
--PKG_CHECK_MODULES(NUNIT, nunit >= 2.4.7)
--
--###########################
- # Check to see if we're local
- ###########################
- 
diff --git a/dev-libs/libappindicator/libappindicator-0.4.1-r201.ebuild b/dev-libs/libappindicator/libappindicator-0.4.1-r201.ebuild
deleted file mode 100644
index 678776482b8f..000000000000
--- a/dev-libs/libappindicator/libappindicator-0.4.1-r201.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-0.4.1-r201.ebuild,v 1.6 2012/05/04 18:35:54 jdhore Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="2:2.7"
-
-inherit autotools eutils python
-
-PN_vala_version=0.14
-
-DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar"
-HOMEPAGE="http://launchpad.net/libappindicator"
-SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection"
-
-# FIXME: Missing dev-lang/mono handling!
-RDEPEND="dev-libs/dbus-glib
-	>=dev-libs/glib-2.26
-	dev-libs/libdbusmenu:0[gtk]
-	>=dev-libs/libindicator-0.4:0
-	dev-python/pygobject:2
-	>=dev-python/pygtk-2.14:2
-	>=x11-libs/gtk+-2.18:2
-	introspection? ( >=dev-libs/gobject-introspection-0.10 )"
-DEPEND="${RDEPEND}
-	dev-lang/vala:${PN_vala_version}[vapigen]
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e '/LDFLAGS/s:python2.6:python2.7:' bindings/python/Makefile.{am,in} || die
-	epatch "${FILESDIR}"/${P}-no-mono.patch
-	eautoreconf
-
-	>py-compile
-}
-
-src_configure() {
-	export VALAC="$(type -P valac-${PN_vala_version})"
-
-	econf \
-		--disable-static \
-		--with-gtk=2
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-
-	# SLOT="3" has eveything required
-	rm -rf "${ED}"usr/share/gtk-doc
-}
-
-pkg_postinst() {
-	python_mod_optimize appindicator
-}
-
-pkg_postrm() {
-	python_mod_cleanup appindicator
-}
diff --git a/dev-libs/libappindicator/libappindicator-0.4.1-r300.ebuild b/dev-libs/libappindicator/libappindicator-0.4.1-r300.ebuild
deleted file mode 100644
index 942ab57565ad..000000000000
--- a/dev-libs/libappindicator/libappindicator-0.4.1-r300.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libappindicator/libappindicator-0.4.1-r300.ebuild,v 1.3 2012/05/04 18:35:54 jdhore Exp $
-
-EAPI=4
-inherit autotools eutils
-
-PN_vala_version=0.14
-
-DESCRIPTION="A library to allow applications to export a menu into the Unity Menu bar"
-HOMEPAGE="http://launchpad.net/libappindicator"
-SRC_URI="http://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 LGPL-3"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="+introspection"
-
-# FIXME: Missing dev-lang/mono handling!
-RDEPEND="dev-libs/dbus-glib
-	>=dev-libs/glib-2.26
-	dev-libs/libdbusmenu:3[gtk]
-	>=dev-libs/libindicator-0.4:3
-	x11-libs/gtk+:3
-	introspection? ( >=dev-libs/gobject-introspection-0.10 )"
-DEPEND="${RDEPEND}
-	dev-lang/vala:${PN_vala_version}[vapigen]
-	dev-util/gtk-doc-am
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-no-mono.patch \
-		"${FILESDIR}"/${P}-gtk.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	export VALAC="$(type -P valac-${PN_vala_version})"
-
-	econf \
-		--disable-static \
-		--with-html-dir=/usr/share/doc/${PF}/html \
-		--with-gtk=3
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-}