[Lunar-commits] <moonbase> pygobject2: remove introspection so there's no conflict with pygobject

[Michael 'v4hn' Goerner]

commit a204b0a0e2b73880cd29b4918159baa7b8627503
Author: Michael 'v4hn' Goerner <v4hn at lunar-linux.org>
Date:   Thu May 10 22:48:14 2012 +0200

    pygobject2: remove introspection so there's no conflict with pygobject
---
 python/pygobject/CONFLICTS  |    1 -
 python/pygobject2/BUILD     |   14 ++++++++------
 python/pygobject2/CONFLICTS |    1 -
 python/pygobject2/DEPENDS   |    2 --
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/python/pygobject/CONFLICTS b/python/pygobject/CONFLICTS
deleted file mode 100644
index 5740e78..0000000
--- a/python/pygobject/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts pygobject2
diff --git a/python/pygobject2/BUILD b/python/pygobject2/BUILD
index 8c2d844..3f5391e 100644
--- a/python/pygobject2/BUILD
+++ b/python/pygobject2/BUILD
@@ -6,12 +6,14 @@
     sedit "s/SUBDIRS = docs codegen/SUBDIRS = codegen/g" Makefile.in
   fi  &&
 
-   ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
-                --build=$BUILD        \
-                --sysconfdir=/etc     \
-                --localstatedir=/var  \
-                --infodir=${GNOME210_PREFIX:-/usr}/share/info  \
-                --mandir=${GNOME210_PREFIX:-/usr}/share/man    \
+  #use --disable-introspection to avoid file conflict with pygobject3
+  ./configure  --prefix=${GNOME210_PREFIX:-/usr}  \
+               --build=$BUILD        \
+               --sysconfdir=/etc     \
+               --localstatedir=/var  \
+               --infodir=${GNOME210_PREFIX:-/usr}/share/info  \
+               --mandir=${GNOME210_PREFIX:-/usr}/share/man    \
+               --disable-introspection                        \
                 $OPTS                                         &&
     default_make
 
diff --git a/python/pygobject2/CONFLICTS b/python/pygobject2/CONFLICTS
deleted file mode 100644
index 54c572c..0000000
--- a/python/pygobject2/CONFLICTS
+++ /dev/null
@@ -1 +0,0 @@
-conflicts pygobject
diff --git a/python/pygobject2/DEPENDS b/python/pygobject2/DEPENDS
index d5d219d..ef2bf84 100644
--- a/python/pygobject2/DEPENDS
+++ b/python/pygobject2/DEPENDS
@@ -1,5 +1,3 @@
 depends  Python
 depends  glib-2
 depends  pycairo
-
-optional_depends gobject-introspection "" "--enable-introspection=no" "for introspection"