gnome.mk: rename gdkpixbuf2 to gdkpixbuf to prepare for port move

The GTK 1-based gdk-pixbuf has not existed for some time.

No functional or package changes.

Mk/Scripts/qa.sh

@@ -410,7 +410,7 @@ proxydeps_suggest_uses() {
 	# grep LIB_DEPENDS= Mk/Uses/gnome.mk |sed -e 's|\(.*\)_LIB_DEPENDS.*:\(.*\)\/\(.*\)|[ "\1" = "\3" ] \|\| echo "elif [ \\${pkg} = \\\"\2/\3\\\" ]; then; warn \\\"you need USE_GNOME+=\1\\\""|'|sort|sh
 	elif [ ${pkg} = "databases/evolution-data-server" ]; then warn "you need USE_GNOME+=evolutiondataserver3"
 	elif [ ${pkg} = "graphics/gdk-pixbuf" ]; then warn "you need USE_GNOME+=gdkpixbuf"
-	elif [ ${pkg} = "graphics/gdk-pixbuf2" ]; then warn "you need USE_GNOME+=gdkpixbuf2"
+	elif [ ${pkg} = "graphics/gdk-pixbuf2" ]; then warn "you need USE_GNOME+=gdkpixbuf"
 	elif [ ${pkg} = "x11/gnome-desktop" ]; then warn "you need USE_GNOME+=gnomedesktop3"
 	elif [ ${pkg} = "devel/gobject-introspection" ]; then warn "you need USE_GNOME+=introspection"
 	elif [ ${pkg} = "graphics/libart_lgpl" ]; then warn "you need USE_GNOME+=libartlgpl2"

Mk/Uses/gnome.mk

@@ -63,7 +63,7 @@ _USE_GNOME_ALL= intlhack intltool introspection \
 
 # GNOME 2 components
 _USE_GNOME_ALL+= atk cairo \
-		gdkpixbuf2 gdkpixbuf2xlib gconf2 glib20 \
+		gdkpixbuf gdkpixbuf2xlib gconf2 glib20 \
 		gtk-update-icon-cache gtk20 \
 		gtksharp20 gtksourceview2 gvfs libartlgpl2 \
 		libglade2 libgnomecanvas \
@@ -131,7 +131,7 @@ gtkmm24_LIB_DEPENDS=	libgtkmm-2.4.so:x11-toolkits/gtkmm24
 gtkmm24_USE_GNOME_IMPL=	glibmm cairomm atkmm pangomm gtk20
 
 gtkmm30_LIB_DEPENDS=	libgtkmm-3.0.so:x11-toolkits/gtkmm30
-gtkmm30_USE_GNOME_IMPL=	atkmm cairomm gdkpixbuf2 glibmm gtk30 pangomm
+gtkmm30_USE_GNOME_IMPL=	atkmm cairomm gdkpixbuf glibmm gtk30 pangomm
 
 gtksourceviewmm3_LIB_DEPENDS=		libgtksourceviewmm-3.0.so:x11-toolkits/gtksourceviewmm3
 gtksourceviewmm3_USE_GNOME_IMPL=	gtkmm30 gtksourceview3
@@ -171,20 +171,20 @@ pangoft2_USE_GNOME_IMPL=pango
 pangox-compat_LIB_DEPENDS=	libpangox-1.0.so:x11-toolkits/pangox-compat
 pangox-compat_USE_GNOME_IMPL=	glib20 pango
 
-gdkpixbuf2_LIB_DEPENDS=	libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2
-gdkpixbuf2_USE_GNOME_IMPL=glib20
+gdkpixbuf_LIB_DEPENDS=	libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2
+gdkpixbuf_USE_GNOME_IMPL=glib20
 
 gdkpixbuf2xlib_LIB_DEPENDS=	libgdk_pixbuf_xlib-2.0.so:graphics/gdk-pixbuf2-xlib
-gdkpixbuf2xlib_USE_GNOME_IMPL=	glib20 gdkpixbuf2
+gdkpixbuf2xlib_USE_GNOME_IMPL=	glib20 gdkpixbuf
 
 gtk-update-icon-cache_RUN_DEPENDS=	gtk-update-icon-cache:graphics/gtk-update-icon-cache
 
 gtk20_LIB_DEPENDS=	libgtk-x11-2.0.so:x11-toolkits/gtk20
-gtk20_USE_GNOME_IMPL=	atk cairo gdkpixbuf2 pangoft2
+gtk20_USE_GNOME_IMPL=	atk cairo gdkpixbuf pangoft2
 GTK2_VERSION=		2.10.0
 
 gtk30_LIB_DEPENDS=	libgtk-3.so:x11-toolkits/gtk30
-gtk30_USE_GNOME_IMPL=	atk cairo gdkpixbuf2 pango
+gtk30_USE_GNOME_IMPL=	atk cairo gdkpixbuf pango
 GTK3_VERSION=		3.0.0
 
 gtk40_LIB_DEPENDS=	libgtk-4.so:x11-toolkits/gtk40
@@ -245,7 +245,7 @@ librsvg2_BUILD_DEPENDS=	librsvg2>=0:graphics/librsvg2
 librsvg2_LIB_DEPENDS=	librsvg-2.so:graphics/librsvg2
 librsvg2_RUN_DEPENDS=	librsvg2>=0:graphics/librsvg2
 .  endif
-librsvg2_USE_GNOME_IMPL=cairo gdkpixbuf2
+librsvg2_USE_GNOME_IMPL=cairo gdkpixbuf
 
 nautilus3_LIB_DEPENDS=	libnautilus-extension.so:x11-fm/nautilus
 nautilus3_USE_GNOME_IMPL=gnomedesktop3 libxml2

Mk/bsd.gecko.mk

@@ -65,7 +65,7 @@ USES+=		compiler:c++17-lang cpe elfctl gl gmake gnome iconv \
 			pkgconfig python:build desktop-file-utils
 CPE_VENDOR?=mozilla
 USE_GL=		gl
-USE_GNOME=	cairo gdkpixbuf2 gtk30
+USE_GNOME=	cairo gdkpixbuf gtk30
 USE_XORG=	x11 xcb xcomposite xdamage xext xfixes xrandr xrender xt xtst
 HAS_CONFIGURE=	yes
 CONFIGURE_OUTSOURCE=	yes

accessibility/caribou/Makefile

@@ -23,7 +23,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}atspi>=2.1.91:accessibility/py-atspi@${PY_FL
 
 USES=		gettext gl gmake gnome libtool localbase pathfix \
 		pkgconfig python shebangfix tar:xz xorg
-USE_GNOME=	cairo gdkpixbuf2 gtk30 intlhack introspection:build libxml2 \
+USE_GNOME=	cairo gdkpixbuf gtk30 intlhack introspection:build libxml2 \
 		libxslt:build pygobject3
 USE_PYTHON=	py3kplist
 SHEBANG_FILES=	tools/fix_gir.py tools/make_schema.py

archivers/file-roller/Makefile

@@ -24,7 +24,7 @@ PORTSCOUT=	limitw:1,even
 
 USES=		cpe desktop-file-utils gettext gnome libarchive localbase \
 		meson pkgconfig python:build tar:xz
-USE_GNOME=	cairo gdkpixbuf2 gtk40
+USE_GNOME=	cairo gdkpixbuf gtk40
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Dpackagekit=false
 BINARY_ALIAS=	python3=${PYTHON_VERSION}

archivers/gnome-autoar/Makefile

@@ -15,7 +15,7 @@ USES=		cpe gettext-runtime gmake gnome libarchive meson pkgconfig \
 		tar:xz vala:build
 
 CPE_VENDOR=	gnome
-USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build
+USE_GNOME=	cairo gdkpixbuf gtk30 introspection:build
 
 OPTIONS_DEFINE=	DOCS
 

archivers/thunar-archive-plugin/Makefile

@@ -15,7 +15,7 @@ LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 
 USES=		compiler:c11 gettext-tools gmake gnome libtool pkgconfig \
 		tar:bzip2 xfce
-USE_GNOME=	cairo gdkpixbuf2 gtk30
+USE_GNOME=	cairo gdkpixbuf gtk30
 USE_XFCE=	libexo thunar
 
 GNU_CONFIGURE=	yes

archivers/xarchiver/Makefile

@@ -20,7 +20,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/gzip:archivers/gzip \
 USES=		desktop-file-utils gmake gnome libtool:build pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	ib
-USE_GNOME=	cairo gdkpixbuf2 glib20 intltool
+USE_GNOME=	cairo gdkpixbuf glib20 intltool
 
 GNU_CONFIGURE=	yes
 

astro/gpscorrelate/Makefile

@@ -22,7 +22,7 @@ USES=		compiler:c++11-lang gettext-runtime gmake gnome pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	freefoote
 
-USE_GNOME=	cairo gdkpixbuf2 glib20 gtk20 libxml2 pango
+USE_GNOME=	cairo gdkpixbuf glib20 gtk20 libxml2 pango
 
 PLIST_FILES=	bin/gpscorrelate bin/gpscorrelate-gui \
 		share/man/man1/gpscorrelate.1.gz share/man/man1/gpscorrelate-gui.1.gz

astro/nightfall/Makefile

@@ -12,7 +12,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		compiler gettext gmake gnome jpeg pathfix perl5 pkgconfig
-USE_GNOME=	cairo gdkpixbuf2 gtk20
+USE_GNOME=	cairo gdkpixbuf gtk20
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CPPFLAGS+=	-I${LOCALBASE}/include

astro/opencpn/Makefile

@@ -26,7 +26,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	${GH_PROJECT}
 GH_PROJECT=	OpenCPN
 USE_GL=		gl glu
-USE_GNOME=	cairo gdkpixbuf2 gtk30 pango
+USE_GNOME=	cairo gdkpixbuf gtk30 pango
 USE_LDCONFIG=	${PREFIX}/lib/opencpn
 USE_WX=		3.0+
 WX_CONF_ARGS=	absolute

astro/siril/Makefile

@@ -38,7 +38,7 @@ LIB_DEPENDS+=	libopencv_photo.so:graphics/opencv # for some reason, configure fa
 
 USES=		cmake:indirect compiler:c++11-lang desktop-file-utils gettext \
 		gnome meson pkgconfig jpeg shared-mime-info tar:bz2
-USE_GNOME=	atk cairo gdkpixbuf2 gtk30 intltool pango
+USE_GNOME=	atk cairo gdkpixbuf gtk30 intltool pango
 
 BINARY_ALIAS=	git=false
 

astro/viking/Makefile

@@ -27,7 +27,7 @@ RUN_DEPENDS=	gpsbabel:astro/gpsbabel
 USES=		compiler:c++11-lib desktop-file-utils gettext gmake gnome \
 		iconv localbase perl5 pkgconfig tar:bzip2 xorg
 USE_XORG=	x11
-USE_GNOME=	cairo gdkpixbuf2 gtk30 intlhack
+USE_GNOME=	cairo gdkpixbuf gtk30 intlhack
 USE_PERL5=	run
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share

audio/abx/Makefile

@@ -18,7 +18,7 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libsndfile.so:audio/libsndfile
 
 USES=		gettext-runtime gmake gnome pkgconfig
-USE_GNOME=	atk cairo glib20 gdkpixbuf2 gtk20 pango
+USE_GNOME=	atk cairo glib20 gdkpixbuf gtk20 pango
 
 GNU_CONFIGURE=	yes
 

audio/amberol/Makefile

@@ -20,7 +20,7 @@ USES=		cargo desktop-file-utils gettext gnome gstreamer meson \
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.gnome.org
 GL_ACCOUNT=	World
-USE_GNOME=	gdkpixbuf2 gtk40 libadwaita
+USE_GNOME=	gdkpixbuf gtk40 libadwaita
 GLIB_SCHEMAS=	io.bassi.Amberol.gschema.xml
 USE_GSTREAMER=	bad good libav
 

audio/amsynth/Makefile

@@ -27,7 +27,7 @@ RUN_DEPENDS=	dssi>0:audio/dssi
 
 USES=		compiler:c++11-lang gettext-tools gmake gnome libtool localbase \
 		pkgconfig xorg
-USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 intltool pango
+USE_GNOME=	atk cairo gdkpixbuf glib20 gtk20 intltool pango
 USE_XORG=	x11
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share

audio/aqualung/Makefile

@@ -36,7 +36,7 @@ LIB_DEPENDS=	libFLAC.so:audio/flac \
 		libfontconfig.so:x11-fonts/fontconfig
 
 USES=		autoreconf compiler:c++11-lang cpe gettext gnome localbase lua:52 pkgconfig
-USE_GNOME=	cairo gdkpixbuf2 gtk20 libxml2 libxslt
+USE_GNOME=	cairo gdkpixbuf gtk20 libxml2 libxslt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jeremyevans

audio/ardour/Makefile

@@ -48,7 +48,7 @@ USES=		compiler:c++14-lang desktop-file-utils gettext gnome \
 		libarchive pkgconfig python:build readline ssl tar:bzip2 \
 		waf xorg shared-mime-info
 USE_CXXSTD=	c++14
-USE_GNOME=	atk cairo cairomm gdkpixbuf2 glib20 glibmm gtk20 gtkmm24 libxml2 pango
+USE_GNOME=	atk cairo cairomm gdkpixbuf glib20 glibmm gtk20 gtkmm24 libxml2 pango
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 

audio/ario/Makefile

@@ -17,7 +17,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl
 GNU_CONFIGURE=	yes
 USES=		gmake gnome libtool pkgconfig
 USE_LDCONFIG=	yes
-USE_GNOME=	gtk30 pango atk cairo gdkpixbuf2 glib20 libxml2
+USE_GNOME=	gtk30 pango atk cairo gdkpixbuf glib20 libxml2
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	AVAHI DBUS DEBUG LIBMPDCLIENT2 MPDIDLE NLS PLAYLISTS SEARCH TAGLIB

audio/audacity/Makefile

@@ -41,7 +41,7 @@ USES=		cmake compiler:c++20-lang cpe desktop-file-utils gettext \
 CPE_VENDOR=	audacityteam
 
 USE_GITHUB=	yes
-USE_GNOME=	cairo gdkpixbuf2 gtk30
+USE_GNOME=	cairo gdkpixbuf gtk30
 USE_WX=		3.2+
 WX_COMPS=	wx