(#118687) Re-add dgs to the tree, because X.Org 7 no longer provides client-side DPS utilities but things in the tree depend on them.

(Portage version: 2.1_pre6-r3)

9 files changed, 148 insertions, 36 deletions

diff --git a/app-text/dgs/ChangeLog b/app-text/dgs/ChangeLog
index 9dc4645ebe5f..15dcc2244ab6 100644
--- a/app-text/dgs/ChangeLog
+++ b/app-text/dgs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-text/dgs
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dgs/ChangeLog,v 1.21 2005/09/15 19:36:57 swegener Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/dgs/ChangeLog,v 1.22 2006/03/23 08:54:21 spyderous Exp $
+
+*dgs-0.5.10-r1 (23 Mar 2006)
+
+  23 Mar 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/dgs-0.5.10-gs-time_.h-gentoo.diff,
+  +files/0.5.10-workaround-include-in-comments.patch,
+  +files/dgs-0.5.10-gcc-3.4.diff, +files/dgs-0.5.10-tcpd-gentoo.diff,
+  +dgs-0.5.10-r1.ebuild, -dgs-1234.ebuild:
+  (#118687) Re-add dgs to the tree, because X.Org 7 no longer provides
+  client-side DPS utilities but things in the tree depend on them.
 
   15 Sep 2005; Sven Wegener <swegener@gentoo.org> ChangeLog:
   Added missing ChangeLog
diff --git a/app-text/dgs/dgs-0.5.10-r1.ebuild b/app-text/dgs/dgs-0.5.10-r1.ebuild
new file mode 100644
index 000000000000..ebc1a1549cdc
--- /dev/null
+++ b/app-text/dgs/dgs-0.5.10-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/dgs/dgs-0.5.10-r1.ebuild,v 1.32 2006/03/23 08:54:21 spyderous Exp $
+
+inherit gnuconfig eutils
+
+DESCRIPTION="A Ghostscript based Display Postscript (DPS) server"
+HOMEPAGE="http://www.gyve.org/dgs/"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/old/dgs/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha amd64 hppa mips ppc64 ia64"
+IUSE="tcpd"
+RDEPEND="=dev-libs/glib-1.2*"
+DEPEND="${RDEPEND}
+	sys-apps/texinfo
+	sys-devel/autoconf
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gs-time_.h-gentoo.diff
+	epatch ${FILESDIR}/${P}-tcpd-gentoo.diff
+	epatch ${FILESDIR}/${P}-gcc-3.4.diff
+	epatch ${FILESDIR}/${PV}-workaround-include-in-comments.patch
+
+	# needed for amd64 and alphaev67 at least
+	gnuconfig_update
+}
+
+src_compile() {
+	WANT_AUTOCONF=2.1 autoconf
+	econf --with-x $(use_enable tcpd) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	einstall || die "einstall failed"
+
+	rm -rf ${D}/usr/share/man/manm
+	newman ${S}/DPS/demos/xepsf/xepsf.man xepsf.1
+	newman ${S}/DPS/demos/dpsexec/dpsexec.man dpsexec.1
+	newman ${S}/DPS/clients/makepsres/makepsres.man makepsres.1
+
+	dodoc ANNOUNCE ChangeLog FAQ NEWS NOTES README STATUS TODO Version
+}
diff --git a/app-text/dgs/dgs-1234.ebuild b/app-text/dgs/dgs-1234.ebuild
deleted file mode 100644
index f61758a3e09c..000000000000
--- a/app-text/dgs/dgs-1234.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/dgs/dgs-1234.ebuild,v 1.1 2005/09/15 04:38:29 vapier Exp $
-
-DESCRIPTION="fake ebuild to force removal of broken path_dps.m4"
-HOMEPAGE="http://ronaldmcnightrider.ytmnd.com/"
-SRC_URI=""
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-pkg_postinst() {
-	echo
-	ewarn "This is a fake ebuild to force removal of a broken"
-	ewarn "m4 file installed by earlier dps packages."
-	echo
-	ewarn "For more info: http://bugs.gentoo.org/98762"
-	echo
-
-	if [[ -e ${ROOT}/usr/share/aclocal/path_dps.m4 ]] ; then
-		ewarn "You should probably delete this yourself:"
-		ewarn " /usr/share/aclocal/path_dps.m4"
-		echo
-	fi
-
-	ewarn "Now that we've faked it, please unmerge me:"
-	ewarn "emerge -C dgs"
-	die "Please unmerge me: emerge -C dgs"
-}
diff --git a/app-text/dgs/files/0.5.10-workaround-include-in-comments.patch b/app-text/dgs/files/0.5.10-workaround-include-in-comments.patch
new file mode 100644
index 000000000000..9187fcbb18a1
--- /dev/null
+++ b/app-text/dgs/files/0.5.10-workaround-include-in-comments.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/show_bug.cgi?id=126388
+http://lists.gnu.org/archive/html/automake/2006-03/msg00037.html
+automake-1.9.6 fails to ignore dnl ... include() statements and dies horribly
+
+diff -urN dgs-0.5.10.orig/path_dps.m4 dgs-0.5.10/path_dps.m4
+--- dgs-0.5.10.orig/path_dps.m4	2006-03-23 00:32:59.000000000 -0800
++++ dgs-0.5.10/path_dps.m4	2006-03-23 00:33:50.000000000 -0800
+@@ -169,7 +169,7 @@
+ dnl * If you use automake and  if you didn't install path_dps.m4
+ dnl   [1] Create a file named acinclude.m4 at the root directory of your package.
+ dnl   [2] Put follwoing codes in the acinclude.m4
+-dnl       include(path_dps.m4)
++dnl       CODE CENSORED, AUTOMAKE 1.9.6 BUG
+ dnl   [3] Add path_dps.m4 to EXTRA_DIST in the Makefile.am at the directory .
+ dnl   [4] Invoke the follwoing commands at the directory:
+ dnl       automake; aclocal -I .; autoconf 
diff --git a/app-text/dgs/files/dgs-0.5.10-gcc-3.4.diff b/app-text/dgs/files/dgs-0.5.10-gcc-3.4.diff
new file mode 100644
index 000000000000..e66ab479cf10
--- /dev/null
+++ b/app-text/dgs/files/dgs-0.5.10-gcc-3.4.diff
@@ -0,0 +1,29 @@
+--- DPS/clients/makepsres/makepsres.c.old	2004-04-22 19:48:50.568331512 +0100
++++ DPS/clients/makepsres/makepsres.c	2004-04-22 19:50:34.076595864 +0100
+@@ -124,8 +124,6 @@
+ 
+ char *program;
+ 
+-extern char *malloc(), *realloc();
+-
+ #if !defined(__NetBSD__) && !defined(__FreeBSD__)
+ # if !defined(__GLIBC__)
+ extern char *sys_errlist[];
+--- DPS/clients/pswrap/psw.c.old	2004-04-22 19:54:13.609221832 +0100
++++ DPS/clients/pswrap/psw.c	2004-04-22 19:54:39.149339144 +0100
+@@ -1906,7 +1906,6 @@
+ 
+ char *psw_malloc(s) int s; {
+     char *temp;
+-    extern char *malloc();
+     if ((temp = malloc((unsigned) s)) == NULL)
+         AllocFailure();
+     return(temp);
+@@ -1914,7 +1913,6 @@
+ 
+ char *psw_calloc(n,s) int n,s; {
+     char *temp;
+-    extern char *calloc();
+     if ((temp = calloc((unsigned) n, (unsigned) s)) == NULL)
+         AllocFailure();
+     return(temp);
diff --git a/app-text/dgs/files/dgs-0.5.10-gs-time_.h-gentoo.diff b/app-text/dgs/files/dgs-0.5.10-gs-time_.h-gentoo.diff
new file mode 100644
index 000000000000..d02bcf3514ad
--- /dev/null
+++ b/app-text/dgs/files/dgs-0.5.10-gs-time_.h-gentoo.diff
@@ -0,0 +1,13 @@
+--- gs/time_.h~	Thu Apr  1 07:31:53 1999
++++ gs/time_.h	Wed Mar 14 17:11:12 2001
+@@ -43,9 +43,7 @@
+  */
+ #ifdef HAVE_SYS_TIME_H
+ #  include <sys/time.h>
+-#  if defined(Plan9) || defined(M_UNIX) || defined(_IBMR2) || defined(_SEQUENT_)	/* Plan 9, SCO, AIX and Sequent's DYNIX/ptx need both time.h and sys/time.h! */
+-#    include <time.h>
+-#  endif
++#  include <time.h>
+ #else
+ #  include <time.h>
+ #  ifndef __DECC
diff --git a/app-text/dgs/files/dgs-0.5.10-tcpd-gentoo.diff b/app-text/dgs/files/dgs-0.5.10-tcpd-gentoo.diff
new file mode 100644
index 000000000000..fe80988f0b6c
--- /dev/null
+++ b/app-text/dgs/files/dgs-0.5.10-tcpd-gentoo.diff
@@ -0,0 +1,28 @@
+diff -urN dgs-0.5.10.ORIG/configure.in dgs-0.5.10/configure.in
+--- dgs-0.5.10.ORIG/configure.in	2000-05-08 12:38:17.000000000 +0900
++++ dgs-0.5.10/configure.in	2004-04-16 02:14:40.029905480 +0900
+@@ -163,9 +163,13 @@
+ # TCP wrappers check from gnome-core
+ #--------------------------------------------------------------------
+ 
++AC_ARG_ENABLE(tcpd,
++   [  --disable-tcpd           Disable tcpd support.],,
++   enable_tcpd=yes)
+ AC_CHECK_HEADERS(tcpd.h)
+ AC_CHECK_HEADERS(syslog.h)
+ AC_MSG_CHECKING("whether to use TCP wrappers")
++if test "x$enable_tcpd" = "xyes"; then
+ LIBWRAP_PATH=""
+ for I in $LDFLAGS $LIBS -L/usr/lib -L/usr/local/lib; do
+         case "$I" in
+@@ -246,6 +250,10 @@
+         AC_DEFINE(HAVE_HOSTS_ACCESS)
+ fi
+ AC_SUBST(LIBWRAP_LIBS)
++else
++	AC_MSG_RESULT(no)
++	enable_tcpd=no
++fi
+ 
+ #--------------------------------------------------------------------
+ # For now we assume that gcc will be used to compile ghostscript.
diff --git a/app-text/dgs/files/digest-dgs-0.5.10-r1 b/app-text/dgs/files/digest-dgs-0.5.10-r1
new file mode 100644
index 000000000000..fdfe5767c10f
--- /dev/null
+++ b/app-text/dgs/files/digest-dgs-0.5.10-r1
@@ -0,0 +1,3 @@
+MD5 85bf4c0be3e5325bc3bf2da3196aa299 dgs-0.5.10.tar.gz 3572504
+RMD160 4538e098ad4fab1ff4e1f483838fd3dd9515cd5c dgs-0.5.10.tar.gz 3572504
+SHA256 b01f21609241414fe92d8838e63150bfd7359d74ce05dfa38d2798e9d0f8a0ff dgs-0.5.10.tar.gz 3572504
diff --git a/app-text/dgs/files/digest-dgs-1234 b/app-text/dgs/files/digest-dgs-1234
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/app-text/dgs/files/digest-dgs-1234
+++ /dev/null