New revision: 3.0.3-r8, resolving bug #87509. Removed obsolete ebuild.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 48 insertions, 73 deletions

diff --git a/app-text/sgmltools-lite/ChangeLog b/app-text/sgmltools-lite/ChangeLog
index 75c4198f072b..2ffc22e0a585 100644
--- a/app-text/sgmltools-lite/ChangeLog
+++ b/app-text/sgmltools-lite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/sgmltools-lite
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/ChangeLog,v 1.34 2005/03/15 14:28:09 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/ChangeLog,v 1.35 2005/05/29 14:23:03 leonardop Exp $
+
+*sgmltools-lite-3.0.3-r8 (29 May 2005)
+
+  29 May 2005; Leonardo Boshell <leonardop@gentoo.org>
+  sgmltools-lite-3.0.3-r8.ebuild:
+  New revision, creates binaries from the python scripts; resolves bug
+  #87509. Thanks to Torsten Veller. Removed lynx dependency, as it is not
+  necessary.
 
   15 Mar 2005; Seemant Kulleen <seemant@gentoo.org>
   sgmltools-lite-3.0.3-r6.ebuild, sgmltools-lite-3.0.3-r7.ebuild:
diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest
index e60ed6271be1..27642bccec21 100644
--- a/app-text/sgmltools-lite/Manifest
+++ b/app-text/sgmltools-lite/Manifest
@@ -1,17 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4d03e7204293a4ba7fee4c6a8f802b45 sgmltools-lite-3.0.3-r6.ebuild 2171
-MD5 2ac24822d6d1ce779a25a384da2709f5 ChangeLog 6012
+MD5 8c219a3be9509266349fd82ed494e7e2 ChangeLog 6302
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
+MD5 0178466100a285d241d10b9f30d72e39 sgmltools-lite-3.0.3-r8.ebuild 2307
 MD5 0591c36449998317fed358dc63014316 sgmltools-lite-3.0.3-r7.ebuild 2053
-MD5 4068e19bd2400f18c7b90fc071c31619 files/digest-sgmltools-lite-3.0.3-r6 139
+MD5 4068e19bd2400f18c7b90fc071c31619 files/digest-sgmltools-lite-3.0.3-r8 139
 MD5 4068e19bd2400f18c7b90fc071c31619 files/digest-sgmltools-lite-3.0.3-r7 139
-MD5 5a72138dcb78d9d707c734eaf04d248b files/sgmltools-lite-3.0.3-gentoo.diff 679
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCNwtvI1lqEGTUzyQRAiW4AKCWK/3aEUGSureCVP4THZENs+v+RgCbBkKC
-8AWffYh4pZ7sGJnP0jUId3Y=
-=+5ib
------END PGP SIGNATURE-----
diff --git a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r6 b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r8
index caf2a88ba3cb..caf2a88ba3cb 100644
--- a/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r6
+++ b/app-text/sgmltools-lite/files/digest-sgmltools-lite-3.0.3-r8
diff --git a/app-text/sgmltools-lite/files/sgmltools-lite-3.0.3-gentoo.diff b/app-text/sgmltools-lite/files/sgmltools-lite-3.0.3-gentoo.diff
deleted file mode 100644
index 87439c17de9d..000000000000
--- a/app-text/sgmltools-lite/files/sgmltools-lite-3.0.3-gentoo.diff
+++ /dev/null
@@ -1,23 +0,0 @@
---- Makefile.in.orig	Tue Apr 24 21:37:22 2001
-+++ Makefile.in	Tue Jul 31 22:57:37 2001
-@@ -20,17 +20,17 @@
- #  along with this program; if not, write to the Free Software
- #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
--prefix=@prefix@
-+prefix=${DESTDIR}/@prefix@
- exec_prefix=@exec_prefix@
- bindir=@bindir@
- datadir=@datadir@
- SHAREDIR=$(datadir)/sgml
- stylesheets=$(SHAREDIR)/stylesheets/sgmltools
- dtds=$(SHAREDIR)/dtd/sgmltools
--DOCDIR=@prefix@/doc
-+DOCDIR=${DESTDIR}/@prefix@/doc
- mandir=@mandir@
- sysconfdir=@sysconfdir@
--etcdir=@etcsgml@
-+etcdir=${DESTDIR}/@etcsgml@
- PERL=@PERL@      
- INSTALL=@INSTALL@
- INSTALL_PROGRAM=@INSTALL_PROGRAM@
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r6.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r8.ebuild
index 84a0abd1306a..6ef7df557195 100644
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r6.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r8.ebuild
@@ -1,57 +1,41 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r6.ebuild,v 1.14 2005/03/15 14:28:09 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r8.ebuild,v 1.1 2005/05/29 14:23:03 leonardop Exp $
 
-inherit sgml-catalog
+inherit python sgml-catalog
 
-SRC_URI="mirror://sourceforge/sgmltools-lite/${P}.tar.gz
-		 mirror://sourceforge/sgmltools-lite/nw-eps-icons-0.0.1.tar.gz"
+DESCRIPTION="Python interface to SGML software in a DocBook/OpenJade env"
 HOMEPAGE="http://sgmltools-lite.sourceforge.net/"
-LICENSE="GPL-2"
-DESCRIPTION="Python interface to SGML software specifically in a
-DocBook/OpenJade environment.  Provides sgml2{html,txt,rtf,dvi,ps}"
+SRC_URI="mirror://sourceforge/sgmltools-lite/${P}.tar.gz
+	mirror://sourceforge/sgmltools-lite/nw-eps-icons-0.0.1.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
-IUSE=""
-KEYWORDS="x86 ppc sparc alpha amd64"
+KEYWORDS="~alpha ~arm ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="tetex"
 
 DEPEND="virtual/python
 	app-text/sgml-common
 	~app-text/docbook-sgml-dtd-3.1
 	app-text/docbook-dsssl-stylesheets
-	app-text/jadetex
 	app-text/openjade
-	www-client/lynx"
+	tetex? ( app-text/jadetex )"
 
-src_compile() {
-	./configure 	\
-		--prefix=/usr \
-		--exec-prefix=/usr	\
-		--bindir=/usr/bin	\
-		--sbindir=/usr/sbin	\
-		--datadir=/usr/share	\
-		--mandir=/usr/share/man	|| die
-
-	make || die
+src_unpack() {
+	unpack ${A}
+	cd ${S}
 
 	#remove CVS directories from the tree
-	for dirs in bin doc dsssl dtd man python rpm
-	do
-		rm -rf ${dirs}/CVS
-	done
+	find . -name CVS | xargs rm -rf
+}
 
+src_compile() {
+	econf || die
+	emake || die
 }
 
 src_install() {
-	make	\
-		prefix=${D}/usr	\
-		exec-prefix=${D}/usr	\
-		datadir=${D}/usr/share	\
-		bindir=${D}/usr/bin	\
-		sysconfdir=${D}/etc	\
-		mandir=${D}/usr/share/man	\
-		etcdir=${D}/etc/sgml	\
-		install || die
+	einstall etcdir=${D}/etc/sgml || die
 
 	dodoc COPYING ChangeLog POSTINSTALL README*
 	dohtml -r .
@@ -66,11 +50,19 @@ src_install() {
 
 	rm ${D}/etc/sgml/catalog.{suse,rh62}
 
+	# Remove the backends that require tetex
+	use tetex || \
+		rm ${D}/usr/share/sgml/misc/sgmltools/python/backends/{Dvi,Ps,Pdf,JadeTeX}.py
+
+	# The list of backends to alias with sgml2* 
+	BACKENDS="html rtf txt"
+	use tetex && BACKENDS="${BACKENDS} ps dvi pdf"
+
 	# Create simple alias scripts that people are used to
 	# And make the manpages for those link to the sgmltools-lite manpage
 	mandir=${D}/usr/share/man/man1
 	ScripTEXT="#!/bin/sh\n/usr/bin/sgmltools --backend="
-	for back in html ps dvi rtf txt
+	for back in ${BACKENDS}
 	do
 		echo -e ${ScripTEXT}${back} '$*' > sgml2${back}
 		exeinto /usr/bin
@@ -80,7 +72,16 @@ src_install() {
 		ln -sf sgmltools-lite.1.gz sgml2${back}.1.gz
 		cd ${S}
 	done
+}
+
+pkg_postinst() {
+	python_mod_optimize ${ROOT}usr/share/sgml/misc/sgmltools/python
+	sgml-catalog_pkg_postinst
+}
 
+pkg_postrm() {
+	python_mod_cleanup ${ROOT}usr/share/sgml/misc/sgmltools/python
+	sgml-catalog_pkg_postrm
 }
 
 sgml-catalog_cat_include "/etc/sgml/sgml-lite.cat" \