From 2ecc0b8c4ccecc71110a3bc3b4ebcb3b0a231ea1 Mon Sep 17 00:00:00 2001 From: Stefan Knoblich Date: Mon, 11 Apr 2005 18:19:46 +0000 Subject: Fix bug #88711, install schema file into proper directory Package-Manager: portage-2.0.51.19 --- net-im/gnomemeeting/ChangeLog | 6 ++++- net-im/gnomemeeting/Manifest | 5 ++-- .../files/gnomemeeting-1.2.1-configure.patch | 25 +++++++++++++++++++ net-im/gnomemeeting/gnomemeeting-1.2.1.ebuild | 29 ++++++++++++++++++---- 4 files changed, 57 insertions(+), 8 deletions(-) create mode 100644 net-im/gnomemeeting/files/gnomemeeting-1.2.1-configure.patch (limited to 'net-im/gnomemeeting') diff --git a/net-im/gnomemeeting/ChangeLog b/net-im/gnomemeeting/ChangeLog index f5dc4c97502d..1464cb563f84 100644 --- a/net-im/gnomemeeting/ChangeLog +++ b/net-im/gnomemeeting/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/gnomemeeting # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/ChangeLog,v 1.55 2005/04/11 15:32:55 stkn Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/ChangeLog,v 1.56 2005/04/11 18:19:46 stkn Exp $ + + 11 Apr 2005; Stefan Knoblich + +files/gnomemeeting-1.2.1-configure.patch, gnomemeeting-1.2.1.ebuild: + Fix bug #88711, install schema file into proper directories 11 Apr 2005; Stefan Knoblich gnomemeeting-1.2.1.ebuild: Fixed depends. diff --git a/net-im/gnomemeeting/Manifest b/net-im/gnomemeeting/Manifest index 4a24ff5c6764..cfeeed1da003 100644 --- a/net-im/gnomemeeting/Manifest +++ b/net-im/gnomemeeting/Manifest @@ -1,4 +1,4 @@ -MD5 4ff1bca6c1096076072241633c7c0ed5 ChangeLog 9154 +MD5 095a703b82583f3956b27c0b112734ee ChangeLog 9338 MD5 a90d873b38a939fba966f9b04e58ac42 gnomemeeting-0.98.0.ebuild 1687 MD5 600e50cb52f072809c3f46a0fe8d02ed gnomemeeting-0.98.5-r1.ebuild 1860 MD5 698cb54471981882511cf00e76533a54 gnomemeeting-0.98.5.ebuild 1855 @@ -7,7 +7,8 @@ MD5 9adb1bf9d688e8be734b36bc0e54c110 gnomemeeting-1.0.2.ebuild 2286 MD5 5e442d151db50f960aa0ed3ef72c081a gnomemeeting-1.00.ebuild 2043 MD5 a1b922bae41180d09a6d0ccf8dcaa9f2 gnomemeeting-1.2.0.ebuild 2936 MD5 eed4f567de688fc863665054fba871e6 metadata.xml 722 -MD5 56edc2a72d3846f9ae7d73063645ad34 gnomemeeting-1.2.1.ebuild 2518 +MD5 28babb090a6c3292fa90085d93740d46 gnomemeeting-1.2.1.ebuild 2906 +MD5 683dfd499a4dd803dd3cb8797a4d0efe files/gnomemeeting-1.2.1-configure.patch 669 MD5 c91514d9a4bf338c62c4ef78ddb97553 files/digest-gnomemeeting-0.98.0 73 MD5 1eeb16dcd662b2829936876613f02611 files/digest-gnomemeeting-0.98.5 73 MD5 1eeb16dcd662b2829936876613f02611 files/digest-gnomemeeting-0.98.5-r1 73 diff --git a/net-im/gnomemeeting/files/gnomemeeting-1.2.1-configure.patch b/net-im/gnomemeeting/files/gnomemeeting-1.2.1-configure.patch new file mode 100644 index 000000000000..a523a53b243c --- /dev/null +++ b/net-im/gnomemeeting/files/gnomemeeting-1.2.1-configure.patch @@ -0,0 +1,25 @@ +--- gnomemeeting-1.2.1/configure.orig 2005-04-11 17:24:31.000000000 +0000 ++++ gnomemeeting-1.2.1/configure 2005-04-11 17:25:34.000000000 +0000 +@@ -20815,15 +20815,17 @@ + if test x"${disable_gnome}" = xyes ; then + + +-if false; then +- GCONF_SCHEMAS_INSTALL_TRUE= +- GCONF_SCHEMAS_INSTALL_FALSE='#' +-else ++#if false; then ++# GCONF_SCHEMAS_INSTALL_TRUE= ++# GCONF_SCHEMAS_INSTALL_FALSE='#' ++#else + GCONF_SCHEMAS_INSTALL_TRUE='#' + GCONF_SCHEMAS_INSTALL_FALSE= +-fi ++#fi + + else ++ GCONF_SCHEMAS_INSTALL_TRUE= ++ GCONF_SCHEMAS_INSTALL_FALSE='#' + + if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then + GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` diff --git a/net-im/gnomemeeting/gnomemeeting-1.2.1.ebuild b/net-im/gnomemeeting/gnomemeeting-1.2.1.ebuild index 3f1d0581af04..b9c9f772a5fc 100644 --- a/net-im/gnomemeeting/gnomemeeting-1.2.1.ebuild +++ b/net-im/gnomemeeting/gnomemeeting-1.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.2.1.ebuild,v 1.2 2005/04/11 15:32:55 stkn Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.2.1.ebuild,v 1.3 2005/04/11 18:19:46 stkn Exp $ inherit gnome2 eutils @@ -32,6 +32,7 @@ RDEPEND=">=dev-libs/pwlib-1.8.4 >=gnome-base/gconf-2.2.0 >=gnome-base/orbit-2.5.0 gnome-extra/evolution-data-server )" +# dbus? ( sys-apps/dbus ) DEPEND="${RDEPEND} @@ -42,8 +43,15 @@ DEPEND="${RDEPEND} MAKEOPTS="${MAKEOPTS} -j1" -src_compile() { +src_unpack() { + unpack ${A} + + cd ${S} + # Fix configure to install schemafile into the proper directory + epatch ${FILESDIR}/gnomemeeting-1.2.1-configure.patch +} +src_compile() { local myconf myconf="${myconf} --with-ptlib-includes=/usr/include/ptlib" @@ -51,6 +59,9 @@ src_compile() { myconf="${myconf} --with-openh323-includes=/usr/include/openh323" myconf="${myconf} --with-openh323-libs=/usr/lib" + # + # i'm going to break your fingers if you touch these! + # if use ssl; then myconf="${myconf} --with-openssl-libs=/usr/lib" myconf="${myconf} --with-openssl-includes=/usr/include/openssl" @@ -60,13 +71,21 @@ src_compile() { && myconf="${myconf} --with-sdl-prefix=/usr" \ || myconf="${myconf} --disable-sdltest" + use gnome \ + || myconf="${myconf} --disable-gnome" + +# not available on alpha atm +# use dbus \ +# && myconf="${myconf} --enable-dbus" + + use howl \ + || myconf="${myconf} --disable-howl" + econf \ --prefix=/usr \ --host=${CHOST} \ ${myconf} \ - $(use_enable howl) \ - $(use_enable ipv6) \ - $(use_enable gnome) || die "configure failed" + $(use_enable ipv6) || die "configure failed" emake || die } -- cgit v1.2.3-65-gdbad