Chase libgnomekbd3 -> libgnomekbd change.

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

4 files changed, 12 insertions, 17 deletions

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 9e1c67dac..4c7c44d5b 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -91,7 +91,7 @@ _USE_GNOME_ALL+= atk atspi cairo desktopfileutils eel2 gal2 \
 # GNOME 3 components
 _USE_GNOME_ALL+=dconf evolutiondataserver3 gnomecontrolcenter3 gnomedesktop3 \
 		gnomemenus3 gnomepanel3 gtk30 gtkhtml4 gtksourceview3 libgda5 \
-		libgda5-ui libgnomekbd3 libwnck3 metacity3 nautilus3 pygobject3 vte3
+		libgda5-ui libwnck3 metacity3 nautilus3 pygobject3 vte3
 
 # C++ bindings
 _USE_GNOME_ALL+=atkmm cairomm gconfmm gconfmm26 glibmm gtkmm20 gtkmm24 \
@@ -432,7 +432,7 @@ gal2_USE_GNOME_IMPL=gnomeui libgnomeprintui
 gnomecontrolcenter3_DETECT=	${LOCALBASE}/libdata/pkgconfig/gnome-keybindings.pc
 gnomecontrolcenter3_BUILD_DEPENDS=	${gnomecontrolcenter3_DETECT}:${PORTSDIR}/sysutils/gnome-control-center
 gnomecontrolcenter3_RUN_DEPENDS=	${gnomecontrolcenter3_DETECT}:${PORTSDIR}/sysutils/gnome-control-center
-gnomecontrolcenter3_USE_GNOME_IMPL=gnomemenus3 libgnomekbd3 gnomedesktop3 gconf2
+gnomecontrolcenter3_USE_GNOME_IMPL=gnomemenus3 libgnomekbd gnomedesktop3 gconf2
 gnomecontrolcenter3_GNOME_DESKTOP_VERSION=3
 
 libgda2_LIB_DEPENDS=	libgda-2.so:${PORTSDIR}/databases/libgda2
@@ -564,17 +564,9 @@ gnomesharp20_BUILD_DEPENDS=	${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnom
 gnomesharp20_RUN_DEPENDS=	${gnomesharp20_DETECT}:${PORTSDIR}/x11-toolkits/gnome-sharp20
 gnomesharp20_USE_GNOME_IMPL=	gnomepanel3 gtkhtml3 gtksharp20 librsvg2 vte
 
-#libgnomekbd_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc
-libgnomekbd_DETECT=		${LOCALBASE}/lib/libgnomekbd.so.4
-libgnomekbd_LIB_DEPENDS=	libgnomekbd.so.4:${PORTSDIR}/x11/libgnomekbd
-libgnomekbd_USE_GNOME_IMPL=	gconf2
-libgnomekbd_GNOME_DESKTOP_VERSION=2
-
-#libgnomekbd3_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc
-libgnomekbd3_DETECT=		${LOCALBASE}/lib/libgnomekbd.so.8
-libgnomekbd3_LIB_DEPENDS=	libgnomekbd.so.8:${PORTSDIR}/x11/libgnomekbd3
-libgnomekbd3_USE_GNOME_IMPL=	gtk30
-libgnomekbd3_GNOME_DESKTOP_VERSION=3
+libgnomekbd_DETECT=		${LOCALBASE}/libdata/pkgconfig/libgnomekbd.pc
+libgnomekbd_LIB_DEPENDS=	libgnomekbd.so:${PORTSDIR}/x11/libgnomekbd
+libgnomekbd_USE_GNOME_IMPL=	gtk30
 
 pygtksourceview_DETECT=		${LOCALBASE}/libdata/pkgconfig/pygtksourceview-2.0.pc
 pygtksourceview_BUILD_DEPENDS=	${pygtksourceview_DETECT}:${PORTSDIR}/x11-toolkits/py-gtksourceview
@@ -788,7 +780,7 @@ USE_CSTD=	gnu89
 _GNOME_NEED_LIBTOOL=1
 . endif
 
-# this is splitted out from the above entry because fmake is trows a fit otherwise
+# this is splitted out from the above entry because fmake trows a fit otherwise
 . if defined(USE_AUTOTOOLS) && ${USE_AUTOTOOLS:Mlibtool*}
 .  if ${USE_GNOME:Mltverhack*}!= ""
 _GNOME_NEED_LIBTOOL=1
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 6c89a633b..beece4459 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	gnome-control-center
 PORTVERSION=	3.6.3
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -38,7 +39,7 @@ CONFLICTS=	gnome-media-2.[0-9]*
 USE_XZ=		yes
 USES=		gettext gmake pathfix pkgconfig shared-mime-info
 USE_GNOME=	gnomeprefix gnomehier intlhack libxml2 gnomemenus3 \
-		libgnomekbd3 gnomedesktop3 gconf2
+		libgnomekbd gnomedesktop3 gconf2
 USE_XORG=	xscrnsaver x11 xxf86misc kbproto xi
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/sysutils/gnome-settings-daemon/Makefile b/sysutils/gnome-settings-daemon/Makefile
index 72ff11f1e..f8b5981e8 100644
--- a/sysutils/gnome-settings-daemon/Makefile
+++ b/sysutils/gnome-settings-daemon/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	gnome-settings-daemon
 PORTVERSION=	3.6.3
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -27,7 +28,7 @@ RUN_DEPENDS=	gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
 
 USE_XORG=	xxf86misc
 USE_XZ=		yes
-USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libgnomekbd3 gnomehier
+USE_GNOME=	gnomeprefix intlhack gnomedesktop3 libgnomekbd gnomehier
 USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile
index 11a3cae05..212570b9d 100644
--- a/x11/gnome-screensaver/Makefile
+++ b/x11/gnome-screensaver/Makefile
@@ -4,6 +4,7 @@
 
 PORTNAME=	gnome-screensaver
 PORTVERSION=	3.6.1
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -22,7 +23,7 @@ USE_XZ=		yes
 USES=		gettext gmake pathfix pkgconfig
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xext xxf86vm xxf86misc xscrnsaver
-USE_GNOME=	gnomedesktop3 gnomeprefix intlhack libgnomekbd3
+USE_GNOME=	gnomedesktop3 gnomeprefix intlhack libgnomekbd
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-pam-prefix=${PREFIX}/etc/pam.d \