Added patch to handle properly disabled NLS support as per bug #103386. Fixes Gentoo/FreeBSD.

Package-Manager: portage-2.0.52-r1

5 files changed, 524 insertions, 4 deletions

diff --git a/app-text/scrollkeeper/ChangeLog b/app-text/scrollkeeper/ChangeLog
index 8aace3c234fd..5f242345217c 100644
--- a/app-text/scrollkeeper/ChangeLog
+++ b/app-text/scrollkeeper/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-text/scrollkeeper
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.56 2005/09/10 06:25:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/ChangeLog,v 1.57 2005/09/24 14:25:40 flameeyes Exp $
+
+*scrollkeeper-0.3.14-r2 (24 Sep 2005)
+
+  24 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/scrollkeeper-0.3.14-nls.patch, +scrollkeeper-0.3.14-r2.ebuild:
+  Added patch to handle properly disabled NLS support as per bug #103386.
+  Fixes Gentoo/FreeBSD.
 
   10 Sep 2005; Aron Griffis <agriffis@gentoo.org>
   scrollkeeper-0.3.14-r1.ebuild:
diff --git a/app-text/scrollkeeper/Manifest b/app-text/scrollkeeper/Manifest
index f27351e2ccde..06adde9b8774 100644
--- a/app-text/scrollkeeper/Manifest
+++ b/app-text/scrollkeeper/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 5b1aa08e537f3efafa58a0c91e507570 scrollkeeper-0.3.14-r1.ebuild 2547
+MD5 0bfbcaad886f200e34d441d1044d07ce ChangeLog 8365
+MD5 b2ee58745125e1e320c748d1afa07baa scrollkeeper-0.3.14-r2.ebuild 2469
 MD5 6a5f16d1c02485adc69fffaa6d44bfe1 scrollkeeper-0.3.14.ebuild 2446
 MD5 50da2ea188fbcc09d9f995915da8af85 metadata.xml 183
-MD5 c0fce898a34d742d5946cd38042abee6 ChangeLog 8101
-MD5 5b1aa08e537f3efafa58a0c91e507570 scrollkeeper-0.3.14-r1.ebuild 2547
 MD5 ca681d7dde4a4d560fa091cf7b7e0d85 files/digest-scrollkeeper-0.3.14-r1 71
+MD5 ca681d7dde4a4d560fa091cf7b7e0d85 files/digest-scrollkeeper-0.3.14-r2 71
 MD5 ca681d7dde4a4d560fa091cf7b7e0d85 files/digest-scrollkeeper-0.3.14 71
-MD5 865456e567efe5df6f1069f2d99b46ed files/scrollkeeper-logrotate 265
 MD5 06af22aa6855f6289846d84e78f17588 files/scrollkeeper-0.3.14-gentoo.patch 1268
+MD5 865456e567efe5df6f1069f2d99b46ed files/scrollkeeper-logrotate 265
+MD5 4eed4de8024d2cf496f50695b0a5e71f files/scrollkeeper-0.3.14-nls.patch 10005
 MD5 a1bbb6129b61f8b8c59a1fcedd8b2b3e files/scrollkeeper-0.3.14-gcc2_fix.patch 692
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDNWIEj5H05b2HAEkRAsWpAKCillWK5VVXjOtX7yTWPU/vZuhuoACgjMzr
+5aNYKkdJJpZoQJVUmB4/xG4=
+=QWAu
+-----END PGP SIGNATURE-----
diff --git a/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.14-r2 b/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.14-r2
new file mode 100644
index 000000000000..4cfbc6123884
--- /dev/null
+++ b/app-text/scrollkeeper/files/digest-scrollkeeper-0.3.14-r2
@@ -0,0 +1 @@
+MD5 161eb3f29e30e7b24f84eb93ac696155 scrollkeeper-0.3.14.tar.gz 679513
diff --git a/app-text/scrollkeeper/files/scrollkeeper-0.3.14-nls.patch b/app-text/scrollkeeper/files/scrollkeeper-0.3.14-nls.patch
new file mode 100644
index 000000000000..f3b92e2791f1
--- /dev/null
+++ b/app-text/scrollkeeper/files/scrollkeeper-0.3.14-nls.patch
@@ -0,0 +1,409 @@
+Index: scrollkeeper-0.3.14/buildtools/separate.c
+===================================================================
+--- scrollkeeper-0.3.14.orig/buildtools/separate.c
++++ scrollkeeper-0.3.14/buildtools/separate.c
+@@ -25,9 +25,14 @@
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <errno.h>
+-#include <libintl.h>
+ #include <scrollkeeper.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#else
++#define _(x) x
++#endif
++
+ typedef struct {
+ 	char *filename;
+ 	char *locale;
+@@ -306,9 +311,11 @@ main (int argc, char *argv[])
+ 	int locale_num, i;
+ 	int locale_tree_error=0;
+ 
++#ifdef ENABLE_NLS
+     	setlocale (LC_ALL, "");
+     	bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
+     	textdomain (PACKAGE);
++#endif
+     
+     	if (argc != 3) {
+     		usage();
+Index: scrollkeeper-0.3.14/libs/database.c
+===================================================================
+--- scrollkeeper-0.3.14.orig/libs/database.c
++++ scrollkeeper-0.3.14/libs/database.c
+@@ -23,12 +23,17 @@
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <errno.h>
+-#include <libintl.h>
+ #include <dirent.h>
+ #include <scrollkeeper.h>
+ 
+ #define PATHLEN		256
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#define _(String) gettext (String)
++#else
++#define _(String) String
++#endif
+ 
+ /*
+  * Create a directory.  Send errors to appropriate places (STDOUT and log 
+Index: scrollkeeper-0.3.14/libs/error.c
+===================================================================
+--- scrollkeeper-0.3.14.orig/libs/error.c
++++ scrollkeeper-0.3.14/libs/error.c
+@@ -22,11 +22,17 @@
+ #include <scrollkeeper.h>
+ #include <errno.h>
+ #include <string.h>
+-#include <libintl.h>
+ #include <stdlib.h>
+ #include <sys/stat.h>
+ #include <time.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#define _(String) gettext (String)
++#else
++#define _(String) String
++#endif
++
+ /*
+  * sk_warning:
+  *               This is a general purpose function for sending error and 
+Index: scrollkeeper-0.3.14/libs/extract.c
+===================================================================
+--- scrollkeeper-0.3.14.orig/libs/extract.c
++++ scrollkeeper-0.3.14/libs/extract.c
+@@ -18,7 +18,6 @@
+ 
+ #include <config.h>
+ #include <locale.h>
+-#include <libintl.h>
+ #include <libxslt/xslt.h>
+ #include <libxslt/xsltInternals.h>
+ #include <libxslt/transform.h>
+@@ -33,6 +32,13 @@
+ #include <errno.h>
+ #include <sys/stat.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#define _(String) gettext (String)
++#else
++#define _(String) String
++#endif
++
+ extern int xmlLoadExtDtdDefaultValue;
+ 
+ int apply_stylesheets (char *input_file, char *type, int stylesheet_num,
+Index: scrollkeeper-0.3.14/libs/install.c
+===================================================================
+--- scrollkeeper-0.3.14.orig/libs/install.c
++++ scrollkeeper-0.3.14/libs/install.c
+@@ -25,11 +25,15 @@
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <errno.h>
+-#include <libintl.h>
+ #include <dirent.h>
+ #include <scrollkeeper.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
+ #define _(String) gettext (String)
++#else
++#define _(String) String
++#endif
+ 
+ #define SEP		"|"
+ #define PATHLEN		256
+Index: scrollkeeper-0.3.14/libs/uninstall.c
+===================================================================
+--- scrollkeeper-0.3.14.orig/libs/uninstall.c
++++ scrollkeeper-0.3.14/libs/uninstall.c
+@@ -23,11 +23,15 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+-#include <libintl.h>
+ #include <locale.h>
+ #include <scrollkeeper.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
+ #define _(String) gettext (String)
++#else
++#define _(String) String
++#endif
+ 
+ #define PATHLEN		256
+ 
+Index: scrollkeeper-0.3.14/libs/update-url.c
+===================================================================
+--- scrollkeeper-0.3.14.orig/libs/update-url.c
++++ scrollkeeper-0.3.14/libs/update-url.c
+@@ -23,10 +23,14 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+-#include <libintl.h>
+ #include <scrollkeeper.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
+ #define _(String) gettext (String)
++#else
++#define _(String) String
++#endif
+ 
+ int update_doc_url_in_omf_file(char *omf_name, char *url, char *omf_new_name)
+ {
+Index: scrollkeeper-0.3.14/cl/src/preinstall.c
+===================================================================
+--- scrollkeeper-0.3.14.orig/cl/src/preinstall.c
++++ scrollkeeper-0.3.14/cl/src/preinstall.c
+@@ -23,10 +23,15 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+-#include <libintl.h>
+ #include <locale.h>
+ #include <scrollkeeper.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#else
++#define _(x) x
++#endif
++
+ static xmlExternalEntityLoader defaultEntityLoader = NULL;
+ 
+ static void usage()
+@@ -41,9 +46,11 @@ main (int argc, char *argv[])
+     char *omf_name, *url, *omf_new_name;
+     int i;
+     
++#ifdef ENABLE_NLS
+     setlocale (LC_ALL, "");
+     bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
+     textdomain (PACKAGE);
++#endif
+     
+ 	
+     if (argc < 3) {
+Index: scrollkeeper-0.3.14/cl/src/get-cl.c
+===================================================================
+--- scrollkeeper-0.3.14.orig/cl/src/get-cl.c
++++ scrollkeeper-0.3.14/cl/src/get-cl.c
+@@ -25,7 +25,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-#include <libintl.h>
+ #include <libxml/tree.h>
+ #include <scrollkeeper.h>
+ #include <errno.h>
+@@ -37,6 +36,12 @@
+ #include <utime.h>
+ #include <pwd.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#else
++#define _(x) x
++#endif
++
+ /*
+  * make_local_tmpdir:
+  * @dirname: directory name.
+@@ -198,9 +203,11 @@ int main(int argc, char **argv)
+ 	xmlDocPtr merged_tree;
+         char outputprefs=0;
+ 
++#ifdef ENABLE_NLS
+     	setlocale (LC_ALL, "");
+     	bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
+     	textdomain (PACKAGE);
++#endif
+ 
+     	usage(argc, argv);
+ 
+Index: scrollkeeper-0.3.14/cl/src/scrollkeeper-install.c
+===================================================================
+--- scrollkeeper-0.3.14.orig/cl/src/scrollkeeper-install.c
++++ scrollkeeper-0.3.14/cl/src/scrollkeeper-install.c
+@@ -25,10 +25,15 @@
+ #include <unistd.h>
+ #include <sys/stat.h>
+ #include <errno.h>
+-#include <libintl.h>
+ #include <dirent.h>
+ #include <scrollkeeper.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#else
++#define _(x) x
++#endif
++
+ static xmlExternalEntityLoader defaultEntityLoader = NULL;
+ 
+ static void usage()
+@@ -47,9 +52,11 @@ main (int argc, char *argv[])
+     char outputprefs=0;
+     int i;
+     
++#ifdef ENABLE_NLS
+     setlocale (LC_ALL, "");
+     bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
+     textdomain (PACKAGE);
++#endif
+ 
+     if (argc == 1) {
+ 	usage();
+Index: scrollkeeper-0.3.14/cl/src/scrollkeeper-uninstall.c
+===================================================================
+--- scrollkeeper-0.3.14.orig/cl/src/scrollkeeper-uninstall.c
++++ scrollkeeper-0.3.14/cl/src/scrollkeeper-uninstall.c
+@@ -23,10 +23,15 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/stat.h>
+-#include <libintl.h>
+ #include <locale.h>
+ #include <scrollkeeper.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#else
++#define _(x) x
++#endif
++
+ static void usage()
+ {
+     printf(_("Usage: scrollkeeper-uninstall [-v] [-q] [-p <SCROLLKEEPER_DB_DIR>] <OMF FILE>\n"));
+@@ -41,9 +46,11 @@ main (int argc, char *argv[])
+     char outputprefs=0;
+     int i;
+  
++#ifdef ENABLE_NLS
+     setlocale (LC_ALL, "");
+     bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
+     textdomain (PACKAGE);
++#endif
+     
+     if (argc == 1)
+ 	usage();
+Index: scrollkeeper-0.3.14/cl/src/update.c
+===================================================================
+--- scrollkeeper-0.3.14.orig/cl/src/update.c
++++ scrollkeeper-0.3.14/cl/src/update.c
+@@ -24,12 +24,17 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+-#include <libintl.h>
+ #include <locale.h>
+ #include <dirent.h>
+ #include <unistd.h>
+ #include <scrollkeeper.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#else
++#define _(x) x
++#endif
++
+ static char **av;
+ static char config_omf_dir[PATHLEN];
+ static xmlExternalEntityLoader defaultEntityLoader = NULL;
+@@ -361,9 +366,11 @@ int main(int argc, char **argv)
+ 
+     av = argv;
+     
++#ifdef ENABLE_NLS
+     setlocale (LC_ALL, "");
+     bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
+     textdomain (PACKAGE);
++#endif
+ 
+     scrollkeeper_dir[0] = '\0';
+     omf_dir[0] = '\0';
+Index: scrollkeeper-0.3.14/extract/src/scrollkeeper-extract.c
+===================================================================
+--- scrollkeeper-0.3.14.orig/extract/src/scrollkeeper-extract.c
++++ scrollkeeper-0.3.14/extract/src/scrollkeeper-extract.c
+@@ -18,13 +18,18 @@
+ 
+ #include <config.h>
+ #include <locale.h>
+-#include <libintl.h>
+ #include <scrollkeeper.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <errno.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#else
++#define _(x) x
++#endif
++
+ static void usage()
+ {
+ 	printf(_("Usage: scrollkeeper-extract <xml file> <stylesheet 1> <output file 1> <stylesheet 2> <output file 2> ...\n"));
+@@ -38,9 +43,11 @@ main (int argc, char *argv[])
+ 	char *extension;
+         char outputprefs=0;
+ 
++#ifdef ENABLE_NLS
+ 	setlocale (LC_ALL, "");
+   	bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
+   	textdomain (PACKAGE);
++#endif
+ 
+ 	num = (argc-2)/2;
+ 
+Index: scrollkeeper-0.3.14/scripts/gen-docuid.c
+===================================================================
+--- scrollkeeper-0.3.14.orig/scripts/gen-docuid.c
++++ scrollkeeper-0.3.14/scripts/gen-docuid.c
+@@ -17,13 +17,18 @@
+  */
+ 
+ #include <config.h>
+-#include <libintl.h>
+ #include <locale.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <uuid.h>
+ #include <scrollkeeper.h>
+ 
++#ifdef ENABLE_NLS
++#include <libintl.h>
++#else
++#define _(x) x
++#endif
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -32,9 +37,11 @@ main (int argc, char *argv[])
+ 
+ 	if (argc > 1)
+ 	{
++#ifdef ENABLE_NLS
+ 	     setlocale (LC_ALL, "");
+ 	     bindtextdomain (PACKAGE, SCROLLKEEPERLOCALEDIR);
+ 	     textdomain (PACKAGE);
++#endif
+ 
+ 	     if (strcmp (argv[1], "--help") == 0)
+ 	     {
diff --git a/app-text/scrollkeeper/scrollkeeper-0.3.14-r2.ebuild b/app-text/scrollkeeper/scrollkeeper-0.3.14-r2.ebuild
new file mode 100644
index 000000000000..d1b2b17ce4ce
--- /dev/null
+++ b/app-text/scrollkeeper/scrollkeeper-0.3.14-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/scrollkeeper/scrollkeeper-0.3.14-r2.ebuild,v 1.1 2005/09/24 14:25:40 flameeyes Exp $
+
+inherit libtool eutils
+
+DESCRIPTION="cataloging system for documentation on open systems"
+HOMEPAGE="http://scrollkeeper.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="FDL-1.1 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/libxml2-2.4.19
+	>=dev-libs/libxslt-1.0.14
+	>=sys-libs/zlib-1.1.3
+	~app-text/docbook-xml-dtd-4.1.2
+	>=app-text/docbook-sgml-utils-0.6.6"
+DEPEND="${RDEPEND}
+	 >=dev-util/intltool-0.29
+	nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${P}-gcc2_fix.patch
+	epatch ${FILESDIR}/${P}-nls.patch
+}
+
+src_compile() {
+	elibtoolize
+
+	local myconf=""
+
+	econf \
+		--localstatedir=/var \
+		$(use_enable nls) \
+		${myconf} || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	insinto /etc/logrotate.d
+	newins ${FILESDIR}/scrollkeeper-logrotate scrollkeeper
+
+	dodoc ABOUT-NLS AUTHORS ChangeLog NEWS README TODO scrollkeeper-spec.txt
+}
+
+pkg_preinst() {
+	if [ -d ${ROOT}/usr/share/scrollkeeper/Templates ]
+	then
+		rm -rf ${ROOT}/usr/share/scrollkeeper/Templates
+	fi
+}
+
+pkg_postinst() {
+	einfo "Installing catalog..."
+	${ROOT}/usr/bin/xmlcatalog --noout --add "public" \
+		"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
+		"`echo "${ROOT}/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" |sed -e "s://:/:g"`" \
+		${ROOT}/etc/xml/catalog
+	einfo "Rebuilding Scrollkeeper database..."
+	scrollkeeper-rebuilddb -q -p ${ROOT}/var/lib/scrollkeeper
+	einfo "Updating Scrollkeeper database..."
+	scrollkeeper-update -v &>${T}/foo
+}
+
+pkg_postrm() {
+	if [ ! -x ${ROOT}/usr/bin/scrollkeeper-config ]
+	then
+		# SK is being removed, not upgraded.
+		# Remove all generated files
+		einfo "Cleaning up ${ROOT}/var/lib/scrollkeeper..."
+		rm -rf ${ROOT}/var/lib/scrollkeeper
+		rm -rf ${ROOT}/var/log/scrollkeeper.log
+		rm -rf ${ROOT}/var/log/scrollkeeper.log.1
+		${ROOT}/usr/bin/xmlcatalog --noout --del \
+			"${ROOT}/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" \
+			${ROOT}/etc/xml/catalog
+
+		einfo "Scrollkeeper ${PV} unmerged, if you removed the package"
+		einfo "you might want to clean up /var/lib/scrollkeeper."
+	fi
+}