Fix build of babl and vte.

Retire the gir-Gnome-keyring, it doesn't build and can't figure out why.
Also isn't used by anything.
Also retire gir-dbus, it is installed by gobject-introspection these days.

Submitted by:	pointyhat


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14855 df743ca5-7f9a-e211-a948-0013205c9059

2 files changed, 19 insertions, 22 deletions

diff --git a/devel/gir-repository/bsd.gir.mk b/devel/gir-repository/bsd.gir.mk
index dd3079106..cb9b4f1d1 100644
--- a/devel/gir-repository/bsd.gir.mk
+++ b/devel/gir-repository/bsd.gir.mk
@@ -9,15 +9,9 @@ GIRDIR=		${LOCALBASE}/share/gir-1.0
 poppler_CATEGORY=	graphics
 poppler_GIR=	Poppler-0.8
 
-dbus_CATEGORY=	devel
-dbus_GIR=	DBus-1.0
-
 babl_CATEGORY=	x11
 babl_GIR=	Babl-0.1
 
-gnomekeyring_CATEGORY=	security
-gnomekeyring_GIR=	GnomeKeyring-2.0
-
 libnotify_CATEGORY=	devel
 libnotify_GIR=	Notify-0.4
 
@@ -69,11 +63,6 @@ LIB_DEPENDS+=	babl-0.1.0:${PORTSDIR}/x11/babl
 GIR_FILES=	Babl-0.1
 .endif
 
-.if ${GIR_NAME} == "gnomekeyring"
-LIB_DEPENDS+=	gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
-GIR_FILES=	GnomeKeyring-2.0
-.endif
-
 .if ${GIR_NAME} == "libnotify"
 LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
 USE_GNOME+=	gtk20
@@ -82,12 +71,6 @@ DEP_NAMES=	notify
 CLEAR_DEPS+=	Gtk-2.0
 .endif
 
-.if ${GIR_NAME} == "dbus"
-LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
-GIR_FILES=	DBus-1.0
-LIB_FILES=	DBus
-.endif
-
 .if ${GIR_NAME} == "vte"
 USE_GNOME+=	vte
 GIR_FILES=	Vte-1.0
diff --git a/devel/gir-repository/files/patch-gir_Makefile.in b/devel/gir-repository/files/patch-gir_Makefile.in
index 5c559acda..8932e4d3f 100644
--- a/devel/gir-repository/files/patch-gir_Makefile.in
+++ b/devel/gir-repository/files/patch-gir_Makefile.in
@@ -1,5 +1,5 @@
---- gir/Makefile.in.orig	2009-09-09 21:31:46.000000000 +0200
-+++ gir/Makefile.in	2010-04-07 15:17:19.000000000 +0200
+--- gir/Makefile.in.orig	2010-11-02 16:00:41.000000000 +0100
++++ gir/Makefile.in	2010-11-02 16:02:11.000000000 +0100
 @@ -86,7 +86,7 @@ host_triplet = @host@
  @BUILD_GSSDP_TRUE@am__append_33 = GSSDP-1.0.gir
  @BUILD_GUPNP_TRUE@am__append_34 = GUPnP-1.0.gir
@@ -36,7 +36,17 @@
  @BUILD_POPPLER_TRUE@	$(INTROSPECTION_SCANNER) -v --namespace Poppler --nsversion=0.8 \
  @BUILD_POPPLER_TRUE@	    --add-include-path=$(srcdir) --add-include-path=. \
  @BUILD_POPPLER_TRUE@             --include=GObject-2.0 \
-@@ -1384,16 +1384,16 @@ uninstall-am: uninstall-dist_girDATA uni
+@@ -1228,7 +1228,8 @@ uninstall-am: uninstall-dist_girDATA uni
+ @BUILD_VTE_TRUE@             --pkg gtk+-2.0 \
+ @BUILD_VTE_TRUE@             --pkg vte \
+ @BUILD_VTE_TRUE@             --output $@ \
+-@BUILD_VTE_TRUE@             $(VTE_INCLUDEDIR)/vte/*.h
++@BUILD_VTE_TRUE@             -DVTE_COMPILATION \
++@BUILD_VTE_TRUE@             $(VTE_INCLUDEDIR)/vte-0.0/vte/*.h
+ @BUILD_CLUTTER_TRUE@ClutterJson-0.8.gir: $(INTROSPECTION_SCANNER)
+ @BUILD_CLUTTER_TRUE@	$(INTROSPECTION_SCANNER) -v --namespace ClutterJson --nsversion=0.8 \
+ @BUILD_CLUTTER_TRUE@	    --add-include-path=$(srcdir) --add-include-path=. \
+@@ -1384,16 +1385,16 @@ uninstall-am: uninstall-dist_girDATA uni
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@             --output $@ \
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	     $(GSTFFT_INCLUDEDIR)/gst/fft/*h
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@GstInterfaces-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
@@ -56,7 +66,7 @@
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@GstNetbuffer-0.10.gir: Gst-0.10.gir $(INTROSPECTION_SCANNER)
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	$(DEBUG) $(INTROSPECTION_SCANNER) -v --namespace GstNetbuffer --nsversion=0.10 \
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	    --add-include-path=$(srcdir) --add-include-path=. \
-@@ -1479,6 +1479,7 @@ uninstall-am: uninstall-dist_girDATA uni
+@@ -1479,6 +1480,7 @@ uninstall-am: uninstall-dist_girDATA uni
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@             --include=Gst-0.10 \
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@             --include=GstBase-0.10 \
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	     --library=gstvideo-0.10 \
@@ -64,7 +74,7 @@
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@	     --libtool="$(LIBTOOL)" \
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@             --pkg gobject-2.0 \
  @BUILD_GSTREAMER_PLUGINS_BASE_TRUE@             --pkg gstreamer-0.10 \
-@@ -1529,11 +1530,11 @@ uninstall-am: uninstall-dist_girDATA uni
+@@ -1529,14 +1531,15 @@ uninstall-am: uninstall-dist_girDATA uni
  @BUILD_AVAHI_TRUE@             --output $@ \
  @BUILD_AVAHI_TRUE@             --pkg avahi-gobject \
  @BUILD_AVAHI_TRUE@             $(AVAHI_INCLUDEDIR)/*.h
@@ -79,3 +89,7 @@
  @BUILD_BABL_TRUE@	    --libtool="$(LIBTOOL)" \
  @BUILD_BABL_TRUE@            --output $@ \
  @BUILD_BABL_TRUE@            --pkg babl \
++@BUILD_BABL_TRUE@            -DBABL_INSIDE_BABL_H \
+ @BUILD_BABL_TRUE@            $(BABL_INCLUDEDIR)/babl/*.h
+ @BUILD_UNIQUE_TRUE@Unique-1.0.gir: Gtk-2.0.gir $(INTROSPECTION_SCANNER)
+ @BUILD_UNIQUE_TRUE@	$(INTROSPECTION_SCANNER) -v --namespace Unique --nsversion=1.0 \