Version bumped. This closes bug #72789.

6 files changed, 94 insertions, 54 deletions

diff --git a/app-text/txt2tags/ChangeLog b/app-text/txt2tags/ChangeLog
index 75ef55a6188e..988cb9520ec8 100644
--- a/app-text/txt2tags/ChangeLog
+++ b/app-text/txt2tags/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/txt2tags
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/txt2tags/ChangeLog,v 1.10 2004/09/24 14:54:19 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/txt2tags/ChangeLog,v 1.11 2004/12/03 04:20:52 usata Exp $
+
+*txt2tags-2.1 (03 Dec 2004)
+
+  03 Dec 2004; Mamoru KOMACHI <usata@gentoo.org> -txt2tags-1.6.ebuild,
+  +txt2tags-2.1.ebuild:
+  Version bumped. This closes bug #72789.
 
   24 Sep 2004; <blubb@gentoo.org> txt2tags-2.0.ebuild:
   added ~amd64
diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest
index b7c0d73ba5bd..252966a0ea49 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -1,9 +1,9 @@
 MD5 59cbbf38c6048497ea48362672dd8b3c ChangeLog 1531
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 b9ed357df59fbc71e0b5aadaf808b915 txt2tags-1.6.ebuild 1243
-MD5 8b57b59c78e5b69cb59a1521e1398f63 txt2tags-1.7.ebuild 1566
 MD5 4a132e10c4fdc9776bdadd6c5277a799 txt2tags-2.0.ebuild 2016
+MD5 4a132e10c4fdc9776bdadd6c5277a799 txt2tags-2.1.ebuild 2016
+MD5 8b57b59c78e5b69cb59a1521e1398f63 txt2tags-1.7.ebuild 1566
+MD5 734efbcc17f64a55dae3456db95bb2ef files/digest-txt2tags-2.0 61
+MD5 c07466e13acebb2524d2a0820e3c9aba files/digest-txt2tags-2.1 61
 MD5 65443162499ba989ea00523e48e66904 files/50txt2tags-gentoo.el 100
-MD5 f92a9e53d7a89a6bbe6be50b1f0dc847 files/digest-txt2tags-1.6 61
 MD5 704c47e007ed4a2e1d9bd9231dbdea25 files/digest-txt2tags-1.7 61
-MD5 734efbcc17f64a55dae3456db95bb2ef files/digest-txt2tags-2.0 61
diff --git a/app-text/txt2tags/files/digest-txt2tags-1.6 b/app-text/txt2tags/files/digest-txt2tags-1.6
deleted file mode 100644
index 537d1daa463a..000000000000
--- a/app-text/txt2tags/files/digest-txt2tags-1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c87832ca70c12a83e4f0f0c2a51f0883 txt2tags-1.6.tgz 140449
diff --git a/app-text/txt2tags/files/digest-txt2tags-2.1 b/app-text/txt2tags/files/digest-txt2tags-2.1
new file mode 100644
index 000000000000..8003dbf0bd16
--- /dev/null
+++ b/app-text/txt2tags/files/digest-txt2tags-2.1
@@ -0,0 +1 @@
+MD5 05a0ddcd76aaca72584a12520c764034 txt2tags-2.1.tgz 593028
diff --git a/app-text/txt2tags/txt2tags-1.6.ebuild b/app-text/txt2tags/txt2tags-1.6.ebuild
deleted file mode 100644
index 7ddcbf39669c..000000000000
--- a/app-text/txt2tags/txt2tags-1.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/txt2tags/txt2tags-1.6.ebuild,v 1.6 2004/06/24 22:54:31 agriffis Exp $
-
-DESCRIPTION="Txt2tags is a tool for generating marked up documents (HTML, SGML, ...) from a plain text file with markup."
-SRC_URI="http://txt2tags.sourceforge.net/src/${P}.tgz"
-HOMEPAGE="http://txt2tags.sourceforge.net/"
-LICENSE="GPL-2"
-
-IUSE="tcltk"
-KEYWORDS="x86 sparc"
-SLOT="0"
-
-DEPEND="tcltk? ( dev-lang/tk )"
-
-DOCS="COPYING ChangeLog.txt README.txt RULES TODO"
-
-pkg_setup() {
-
-	# need to test if the tcltk support in python is working
-	if use tcltk; then
-		if ! python -c "import _tkinter" 2>&1 > /dev/null ; then
-			echo ""
-			eerror "You have requested tcltk, but your build of Python"
-			eerror "doesnt support import _tkinter. You may need to"
-			eerror "remerge dev-lang/python, or build ${P}"
-			eerror "with USE=\"-tcltk\""
-			die
-		fi
-	fi
-
-}
-
-src_install () {
-
-	dobin txt2tags
-	dodoc ${DOCS}
-	# samples go into "samples" doc directory
-	docinto samples
-	dodoc samples/*
-	# extras go into "extras" doc directory
-	docinto extras
-	dodoc extras/*
-	# the userguide as well
-	docinto userguide
-	dodoc userguide/*
-
-}
diff --git a/app-text/txt2tags/txt2tags-2.1.ebuild b/app-text/txt2tags/txt2tags-2.1.ebuild
new file mode 100644
index 000000000000..8c296f3da37a
--- /dev/null
+++ b/app-text/txt2tags/txt2tags-2.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/txt2tags/txt2tags-2.1.ebuild,v 1.1 2004/12/03 04:20:52 usata Exp $
+
+inherit elisp-common
+
+IUSE="emacs tcltk"
+
+DESCRIPTION="Txt2tags is a tool for generating marked up documents (HTML, SGML, ...) from a plain text file with markup."
+SRC_URI="http://txt2tags.sourceforge.net/src/${P}.tgz"
+HOMEPAGE="http://txt2tags.sourceforge.net/"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
+DEPEND="virtual/python
+	tcltk? ( dev-lang/tk )
+	emacs? ( virtual/emacs )"
+
+pkg_setup() {
+
+	# need to test if the tcltk support in python is working
+	if use tcltk; then
+		if ! python -c "import _tkinter" 2>&1 > /dev/null ; then
+			echo ""
+			eerror "You have requested tcltk, but your build of Python"
+			eerror "doesnt support import _tkinter. You may need to"
+			eerror "remerge dev-lang/python, or build ${P}"
+			eerror "with USE=\"-tcltk\""
+			die
+		fi
+	fi
+}
+
+src_compile() {
+	if use emacs; then
+		elisp-comp extras/txt2tags-mode.el
+	fi
+}
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_install() {
+	dobin t2tconv txt2tags
+
+	dodoc README* doc/RULES TODO ChangeLog* doc/txt2tagsrc
+	dohtml doc/userguide/*
+	# samples go into "samples" doc directory
+	docinto samples
+	dodoc samples/abuseme.* samples/sample.*
+	docinto samples/css
+	dodoc samples/css/*
+	docinto samples/img
+	dodoc samples/img/*
+	# extras go into "extras" doc directory
+	docinto extras
+	dodoc extras/*
+
+	newman doc/manpage.man txt2tags.1
+
+	# emacs support
+	if use emacs; then
+		elisp-install ${PN} extras/txt2tags-mode.el
+		elisp-site-file-install ${FILESDIR}/${SITEFILE}
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	echo
+	einfo "NOTE: the format of .t2t files has changed between versions"
+	einfo "1.7 -> 2.0.  To convert your .t2t files to the new format,"
+	einfo "use the included t2tconv script:"
+	einfo
+	einfo "    t2tconv file1.t2t file2.t2t ..."
+	echo
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}