New version for GNOME 2.26. Scaling works with composite, make avahi optional. Clean up old revisions.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

6 files changed, 134 insertions, 98 deletions

diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog
index 7d246b19fb20..02b10566cdd2 100644
--- a/net-misc/vinagre/ChangeLog
+++ b/net-misc/vinagre/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/vinagre
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.38 2009/04/27 14:29:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.39 2009/05/10 10:58:04 eva Exp $
+
+*vinagre-2.26.1 (10 May 2009)
+
+  10 May 2009; Gilles Dartiguelongue <eva@gentoo.org> -vinagre-0.5.2.ebuild,
+  -vinagre-2.24.2.ebuild, +vinagre-2.26.1.ebuild,
+  +files/vinagre-2.26.1-optional-applet.patch, metadata.xml:
+  New version for GNOME 2.26. Scaling works with composite, make avahi
+  optional. Clean up old revisions.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> vinagre-2.24.2-r1:
   Stable for HPPA (bug #260063).
diff --git a/net-misc/vinagre/files/vinagre-2.26.1-optional-applet.patch b/net-misc/vinagre/files/vinagre-2.26.1-optional-applet.patch
new file mode 100644
index 000000000000..fb0339bb034a
--- /dev/null
+++ b/net-misc/vinagre/files/vinagre-2.26.1-optional-applet.patch
@@ -0,0 +1,63 @@
+
+ Gnome: http://bugzilla.gnome.org/show_bug.cgi?id=580501
+ Gentoo: https://bugs.gentoo.org/267279
+
+ configure.ac    |   18 ++++++++++++++----
+ src/Makefile.am |    3 ++-
+ 2 files changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 345140b..faa76db 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -72,10 +72,19 @@ PKG_CHECK_MODULES(VINAGRE, \
+ AC_SUBST(VINAGRE_CFLAGS)
+ AC_SUBST(VINAGRE_LIBS)
+ 
+-PKG_CHECK_MODULES(APPLET, \ 
+-  libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION)
++AC_ARG_ENABLE(applet,
++	AC_HELP_STRING([--disable-applet], [Disable vinagre applet @<:@default=yes@:>@]),
++	enable_applet=$enableval,
++	enable_applet=yes)
++
++if test "x$enable_applet" = "xyes";then 
++   PKG_CHECK_MODULES(APPLET, \ 
++   	libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION)
+ AC_SUBST(APPLET_CFLAGS)
+ AC_SUBST(APPLET_LIBS)
++fi
++
++AM_CONDITIONAL(APPLET, test "x$enable_applet" = "xyes")
+ 
+ dnl ================================================================
+ dnl GConf related settings
+@@ -124,5 +133,6 @@ Configure summary:
+ 	Compiler ...................:  ${CC} 
+ 	Compiler Flags .............:  ${CFLAGS}
+ 
+-	Avahi enabled ..............:  ${enable_avahi}
++	Avahi  enabled ..............:  ${enable_avahi}
++	Applet enabled ..............:	${enable_applet}
+ "
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2bcb1ae..749754f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -74,6 +74,7 @@ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
+ # The applet binary
+ ##############################
+ 
++if APPLET
+ libexec_PROGRAMS = vinagre-applet
+ 
+ vinagre_applet_CFLAGS =			\
+@@ -101,7 +102,7 @@ vinagre_applet_LDADD =			\
+ 	$(VINAGRE_LIBS)			\
+ 	$(AVAHI_LIBS)			\
+ 	$(NULL)
+-
++endif
+ 
+ ##############################
+ # Autogenerated stuff
diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml
index ec49ebd888fe..ed30b6c12f0e 100644
--- a/net-misc/vinagre/metadata.xml
+++ b/net-misc/vinagre/metadata.xml
@@ -2,6 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
+<use>
+	<flag name="applet">Enable vinagre applet for <pkg>gnome-base/gnome-panel</pkg>.</flag>
+</use>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/net-misc/vinagre/vinagre-0.5.2.ebuild b/net-misc/vinagre/vinagre-0.5.2.ebuild
deleted file mode 100644
index edba1db5b9e1..000000000000
--- a/net-misc/vinagre/vinagre-0.5.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-0.5.2.ebuild,v 1.9 2009/02/20 03:50:50 ford_prefect Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="VNC Client for the GNOME Desktop"
-HOMEPAGE="http://www.gnome.org/projects/vinagre/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="avahi test"
-
-RDEPEND=">=dev-libs/glib-2.15.3
-	>=x11-libs/gtk+-2.12
-	>=gnome-base/libglade-2.6
-	>=gnome-base/gconf-2.16
-	>=net-libs/gtk-vnc-0.3.3
-	>=gnome-base/gnome-keyring-1
-	avahi? ( >=net-dns/avahi-0.6.18 )"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	test? ( ~app-text/docbook-xml-dtd-4.3 )"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-pkg_setup() {
-	if use avahi && ! built_with_use net-dns/avahi dbus gtk; then
-		eerror "DBus and GTK support are needed in Avahi"
-		eerror "Please rebuild net-dns/avahi with USE='dbus gtk'"
-		die "Missing USE flags for net-dns/avahi"
-	fi
-
-	G2CONF="${G2CONF} $(use_enable avahi) --disable-scrollkeeper"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Remove it's own installation of DOCS that go to $PN instead of $P and aren't ecompressed
-	rm -rf "${D}"/usr/share/doc/vinagre
-}
diff --git a/net-misc/vinagre/vinagre-2.24.2.ebuild b/net-misc/vinagre/vinagre-2.24.2.ebuild
deleted file mode 100644
index cc266978688b..000000000000
--- a/net-misc/vinagre/vinagre-2.24.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.24.2.ebuild,v 1.1 2008/12/10 03:12:54 leio Exp $
-
-inherit gnome2 eutils
-
-DESCRIPTION="VNC Client for the GNOME Desktop"
-HOMEPAGE="http://www.gnome.org/projects/vinagre/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-
-# FIXME: make avahi optional again ?
-# FIXME: make gnome-panel applet option ?
-
-RDEPEND=">=dev-libs/glib-2.17.0
-	>=x11-libs/gtk+-2.13.1
-	>=gnome-base/libglade-2.6
-	>=gnome-base/gconf-2.16
-	>=net-libs/gtk-vnc-0.3.7
-	>=gnome-base/gnome-keyring-1
-	>=gnome-base/gnome-panel-2
-	>=net-dns/avahi-0.6.22"
-
-DEPEND="${RDEPEND}
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35
-	app-text/scrollkeeper
-	app-text/gnome-doc-utils
-	test? ( ~app-text/docbook-xml-dtd-4.3 )"
-
-DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-
-pkg_setup() {
-	if ! built_with_use net-dns/avahi gtk; then
-		eerror "gtk support in avahi needed"
-		die "Please rebuild avahi with USE='gtk'"
-	fi
-
-	G2CONF="${G2CONF} --disable-scrollkeeper --disable-rebuilds"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Remove it's own installation of DOCS that go to $PN instead of $P and aren't ecompressed
-	rm -rf "${D}"/usr/share/doc/vinagre
-}
diff --git a/net-misc/vinagre/vinagre-2.26.1.ebuild b/net-misc/vinagre/vinagre-2.26.1.ebuild
new file mode 100644
index 000000000000..66f1c421d5d4
--- /dev/null
+++ b/net-misc/vinagre/vinagre-2.26.1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.26.1.ebuild,v 1.1 2009/05/10 10:58:04 eva Exp $
+
+EAPI="2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="VNC Client for the GNOME Desktop"
+HOMEPAGE="http://www.gnome.org/projects/vinagre/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="applet avahi test"
+
+RDEPEND=">=dev-libs/glib-2.17.0
+	>=x11-libs/gtk+-2.13.1
+	>=gnome-base/libglade-2.6
+	>=gnome-base/gconf-2.16
+	>=net-libs/gtk-vnc-0.3.8
+	>=gnome-base/gnome-keyring-1
+	applet? ( >=gnome-base/gnome-panel-2 )
+	avahi? ( >=net-dns/avahi-0.6.22[dbus,gtk] )"
+
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	>=dev-lang/perl-5
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35
+	app-text/scrollkeeper
+	app-text/gnome-doc-utils
+	test? ( ~app-text/docbook-xml-dtd-4.3 )"
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-scrollkeeper
+		$(use_enable avahi)
+		$(use_enable applet)"
+}
+
+src_prepare()  {
+	gnome2_src_prepare
+
+	# Make applet optional, bug #267279 
+	epatch "${FILESDIR}/${P}-optional-applet.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Remove it's own installation of DOCS that go to $PN instead of $P and aren't ecompressed
+	rm -rf "${D}"/usr/share/doc/vinagre
+}