summaryrefslogtreecommitdiff
path: root/net-im
diff options
context:
space:
mode:
authorStefan Knoblich <stkn@gentoo.org>2005-04-11 18:19:46 +0000
committerStefan Knoblich <stkn@gentoo.org>2005-04-11 18:19:46 +0000
commiteccc95ee02177008998182f5b42a840f1a44b7d3 (patch)
treeb5ab4aea48e22c79c8d186982cb03758df685904 /net-im
parentVersion bump. (diff)
downloadgentoo-2-eccc95ee02177008998182f5b42a840f1a44b7d3.tar.gz
gentoo-2-eccc95ee02177008998182f5b42a840f1a44b7d3.tar.bz2
gentoo-2-eccc95ee02177008998182f5b42a840f1a44b7d3.zip
Fix bug #88711, install schema file into proper directory
(Portage version: 2.0.51.19)
Diffstat (limited to 'net-im')
-rw-r--r--net-im/gnomemeeting/ChangeLog6
-rw-r--r--net-im/gnomemeeting/files/gnomemeeting-1.2.1-configure.patch25
-rw-r--r--net-im/gnomemeeting/gnomemeeting-1.2.1.ebuild29
3 files changed, 54 insertions, 6 deletions
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 <stkn@gentoo.org>
+ +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 <stkn@gentoo.org> gnomemeeting-1.2.1.ebuild:
Fixed depends.
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
}