Attachment #189267 for bug #267279

View | Details | Raw Unified | Return to bug 267279
Collapse All | Expand All

Lines 1-2 Link Here

(-)a/net-misc/vinagre/Manifest (-1 / +2 lines)
		1	AUX vinagre-2.26.1-optional-applet.patch 2088 RMD160 a6be652bd6e3e8358511840182fca90e676ec32d SHA1 21393c17ee4a2c63df249f4a1588b377f427058a SHA256 ee9350f4651c6b16b217be091b5eed751cc89d508557205145537386b8fed4fb
1	DIST vinagre-2.26.1.tar.bz2 1453150 RMD160 298ede9406ffde74fbcfb5491bcb5d481dd35d84 SHA1 7670dd1c9bc9b213539f10addfee4983a5ee9422 SHA256 d5a9fc5940d23f7a0209846576a81d4fc62f9fb038f945693b1be77c4e50f09c	2	DIST vinagre-2.26.1.tar.bz2 1453150 RMD160 298ede9406ffde74fbcfb5491bcb5d481dd35d84 SHA1 7670dd1c9bc9b213539f10addfee4983a5ee9422 SHA256 d5a9fc5940d23f7a0209846576a81d4fc62f9fb038f945693b1be77c4e50f09c
2	EBUILD vinagre-2.26.1.ebuild 1226 RMD160 8cc3e97da8929979399552e937e2ca7ec16c1dc5 SHA1 91c6400652222d3dcb818ab414d5457439480920 SHA256 dc8ed39c66d230dbfaa98e5f7f1385caea2b090b6042f889af3d0719d894622f	3	EBUILD vinagre-2.26.1.ebuild 1367 RMD160 2e475183c0266fbead6c615016889bba33954252 SHA1 a833645eeee2f857d86114f9b089385bfb165d76 SHA256 edfc0e4600466a03164367e1919a1391d88b959b99fc2fedc438f274b0940447




 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
@@ -46,7 +46,7 @@ PANEL_REQUIRED_VERSION=2.0.0
 # Check for avahi
 AC_ARG_ENABLE(avahi,
               AC_HELP_STRING([--disable-avahi],
-                             [Do not use avahi for auto-discover machines [default=no]]),
+                             [Do not use avahi for auto-discover machines @<:@default=yes@:>@]),
               enable_avahi=${enableval},
               enable_avahi=yes)
 
@@ -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





EAPI="2"

inherit gnome2 autotools

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"

# FIXME: make gnome-panel applet optional ?

RDEPEND=">=dev-libs/glib-2.17.0
	>=x11-libs/gtk+-2.13.1

	>=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}
	>=dev-lang/perl-5

pkg_setup() {
	G2CONF="${G2CONF}
		--disable-scrollkeeper
		$(use_enable avahi)
		$(use_enable applet)"
}

src_unpack() 
{
	gnome2_src_unpack
	
	# Make gnome-applet optional 
	epatch "${FILESDIR}/${P}-optional-applet.patch"
	eautoreconf
}

src_install() {
- 

Return to bug 267279

Line 0 Link Here

(-)a/net-misc/vinagre/files/vinagre-2.26.1-optional-applet.patch (+68 lines)
		1	configure.ac \| 18 ++++++++++++++----
		2	src/Makefile.am \| 3 ++-
		3	2 files changed, 16 insertions(+), 5 deletions(-)
		4
		5	diff --git a/configure.ac b/configure.ac
		6	index 345140b..faa76db 100644
		7	--- a/configure.ac
		8	+++ b/configure.ac
		9	@@ -46,7 +46,7 @@ PANEL_REQUIRED_VERSION=2.0.0
		10	# Check for avahi
		11	AC_ARG_ENABLE(avahi,
		12	AC_HELP_STRING([--disable-avahi],
		13	- [Do not use avahi for auto-discover machines [default=no]]),
		14	+ [Do not use avahi for auto-discover machines @<:@default=yes@:>@]),
		15	enable_avahi=${enableval},
		16	enable_avahi=yes)
		17
		18	@@ -72,10 +72,19 @@ PKG_CHECK_MODULES(VINAGRE, \
		19	AC_SUBST(VINAGRE_CFLAGS)
		20	AC_SUBST(VINAGRE_LIBS)
		21
		22	-PKG_CHECK_MODULES(APPLET, \
		23	- libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION)
		24	+AC_ARG_ENABLE(applet,
		25	+ AC_HELP_STRING([--disable-applet], [Disable vinagre applet @<:@default=yes@:>@]),
		26	+ enable_applet=$enableval,
		27	+ enable_applet=yes)
		28	+
		29	+if test "x$enable_applet" = "xyes";then
		30	+ PKG_CHECK_MODULES(APPLET, \
		31	+ libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION)
		32	AC_SUBST(APPLET_CFLAGS)
		33	AC_SUBST(APPLET_LIBS)
		34	+fi
		35	+
		36	+AM_CONDITIONAL(APPLET, test "x$enable_applet" = "xyes")
		37
		38	dnl ================================================================
		39	dnl GConf related settings
		40	@@ -124,5 +133,6 @@ Configure summary:
		41	Compiler ...................: ${CC}
		42	Compiler Flags .............: ${CFLAGS}
		43
		44	- Avahi enabled ..............: ${enable_avahi}
		45	+ Avahi enabled ..............: ${enable_avahi}
		46	+ Applet enabled ..............: ${enable_applet}
		47	"
		48	diff --git a/src/Makefile.am b/src/Makefile.am
		49	index 2bcb1ae..749754f 100644
		50	--- a/src/Makefile.am
		51	+++ b/src/Makefile.am
		52	@@ -74,6 +74,7 @@ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
		53	# The applet binary
		54	##############################
		55
		56	+if APPLET
		57	libexec_PROGRAMS = vinagre-applet
		58
		59	vinagre_applet_CFLAGS = \
		60	@@ -101,7 +102,7 @@ vinagre_applet_LDADD = \
		61	$(VINAGRE_LIBS) \
		62	$(AVAHI_LIBS) \
		63	$(NULL)
		64	-
65	+endif
66
67	##############################
68	# Autogenerated stuff

Lines 4-10 Link Here

(-)a/net-misc/vinagre/vinagre-2.26.1.ebuild (-8 / +15 lines)
4		4
5	EAPI="2"	5	EAPI="2"
6		6
7	inherit gnome2	7	inherit gnome2 autotools
8		8
9	DESCRIPTION="VNC Client for the GNOME Desktop"	9	DESCRIPTION="VNC Client for the GNOME Desktop"
10	HOMEPAGE="http://www.gnome.org/projects/vinagre/"	10	HOMEPAGE="http://www.gnome.org/projects/vinagre/"
Lines 12-20 HOMEPAGE="http://www.gnome.org/projects/vinagre/" Link Here
12	LICENSE="GPL-2"	12	LICENSE="GPL-2"
13	SLOT="0"	13	SLOT="0"
14	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"	14	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
15	IUSE="avahi test"	15	IUSE="applet avahi test"
16
17	# FIXME: make gnome-panel applet optional ?
18		16
19	RDEPEND=">=dev-libs/glib-2.17.0	17	RDEPEND=">=dev-libs/glib-2.17.0
20	>=x11-libs/gtk+-2.13.1	18	>=x11-libs/gtk+-2.13.1
Lines 22-29 RDEPEND=">=dev-libs/glib-2.17.0 Link Here
22	>=gnome-base/gconf-2.16	20	>=gnome-base/gconf-2.16
23	>=net-libs/gtk-vnc-0.3.8	21	>=net-libs/gtk-vnc-0.3.8
24	>=gnome-base/gnome-keyring-1	22	>=gnome-base/gnome-keyring-1
25	>=gnome-base/gnome-panel-2	23	applet? ( >=gnome-base/gnome-panel-2 )
26	avahi? ( >=net-dns/avahi-0.6.22[dbus,gtk] )"	24	avahi? ( >=net-dns/avahi-0.6.22[dbus,gtk] )"
27		25
28	DEPEND="${RDEPEND}	26	DEPEND="${RDEPEND}
29	>=dev-lang/perl-5	27	>=dev-lang/perl-5
Lines 38-44 DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" Link Here
38	pkg_setup() {	36	pkg_setup() {
39	G2CONF="${G2CONF}	37	G2CONF="${G2CONF}
40	--disable-scrollkeeper	38	--disable-scrollkeeper
41	$(use_enable avahi)"	39	$(use_enable avahi)
		40	$(use_enable applet)"
		41	}
		42
		43	src_unpack()
		44	{
		45	gnome2_src_unpack
		46
		47	# Make gnome-applet optional
		48	epatch "${FILESDIR}/${P}-optional-applet.patch"
		49	eautoreconf
42	}	50	}
43		51
44	src_install() {	52	src_install() {
45	-