Merge branch '2.3' into 2.4

gettext/Pkgfile

@@ -5,7 +5,7 @@
 
 name=gettext
 version=0.17
-release=2
+release=3
 source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
 
 build() {
@@ -15,6 +15,7 @@ build() {
                 --disable-csharp \
                 --disable-{,native-}java \
                 --disable-nls \
+                --without-emacs \
                 --with-included-{glib,libcroco,libxml}
     make
     make -j1 DESTDIR=$PKG install