- Remove unneeded patch

- Add USES=gnome
- Sort USE_GNOME
- Use CONFIGURE_ENABLE to cotrol NLS option
- Some cosmetic changes

PR:		235127
Approved by:	ehaupt (maintainer)

deskutils/xfce4-notifyd/Makefile

@@ -20,8 +20,9 @@ LIB_DEPENDS=	libnotify.so:devel/libnotify \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libdbus-1.so:devel/dbus
 
-USES=		gettext-tools gmake libtool pkgconfig tar:bzip2 xfce:gtk3
-USE_GNOME=	gtk30 glib20 cairo intltool
+USES=		gettext-tools gmake gnome libtool pkgconfig tar:bzip2 \
+		xfce:gtk3
+USE_GNOME=	cairo gtk30 glib20 intltool
 USE_XFCE=	libutil panel
 USE_XORG=	ice sm x11
 
@@ -29,10 +30,11 @@ GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	NLS
-NLS_USES=	gettext-runtime
-NLS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-configure
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		NLS
+OPTIONS_SUB=		yes
+
+NLS_CONFIGURE_ENABLE=	nls
+NLS_USES=		gettext-runtime
 
 # requires libxfce4panel-2.0 >= 4.13.0 (development version)
 PORTSCOUT=	skipv:0.4.3

deskutils/xfce4-notifyd/files/extra-patch-configure

@@ -1,20 +0,0 @@
---- configure.orig	2016-11-09 22:20:54 UTC
-+++ configure
-@@ -5771,7 +5771,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
- $as_echo_n "checking whether NLS is requested... " >&6; }
-     # Check whether --enable-nls was given.
- if test "${enable_nls+set}" = set; then :
--  enableval=$enable_nls; USE_NLS=$enableval
-+  enableval=$enable_nls; USE_NLS=no
- else
-   USE_NLS=yes
- fi
-@@ -13772,7 +13772,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
- 
-     fi
-   fi
--     USE_NLS=yes
-+#     USE_NLS=yes
- 
- 
-     gt_cv_have_gettext=no