Version bump

Package-Manager: portage-2.2_rc30/cvs/Linux i686

6 files changed, 14 insertions, 182 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index 788dc6d95007..b34984852215 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/texmacs
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.69 2009/01/03 06:32:35 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.70 2009/04/19 13:19:20 grozin Exp $
+
+*texmacs-1.0.7.2 (19 Apr 2009)
+
+  19 Apr 2009; Andrey Grozin <grozin@gentoo.org>
+  -files/texmacs-1.0.6.15.patch, -files/texmacs-1.0.7.1-strip.patch,
+  +files/texmacs-1.0.7.2-strip.patch, -texmacs-1.0.6.15.ebuild,
+  -texmacs-1.0.7.1.ebuild, +texmacs-1.0.7.2.ebuild:
+  Version bump
 
   03 Jan 2009; Andrey Grozin <grozin@gentoo.org>
   files/texmacs-1.0.7.1-strip.patch, -files/texmacs-1.0.7-autotroll.patch,
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 25cec027778f..52d8d59aaf04 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,13 +1,10 @@
 AUX TeXmacs.desktop 268 RMD160 92ca6c7c75a6e1edd671c2e5f766140382107ebb SHA1 f917105f37a16393ff8f6e1be111a9f00733de41 SHA256 9872d60c5080260a3dcc842cf1f74557954b0830b204ffc0e255f7ee52a13825
 AUX texmacs-1.0.6.14.patch 4119 RMD160 c22e021dd215e7d450054d4c64b891faff0202b2 SHA1 66b0232e93e9b4697ce73cbcc10b8a8cba88ce0b SHA256 271c02834b01e0516834710267808373b2533bfd79f600c1421cfe38bae61ef3
-AUX texmacs-1.0.6.15.patch 4119 RMD160 eaf4e5fc525f766c6713c23311c520a02f3d78da SHA1 c84e9611ad45d3547976fd150a9e86f30523385a SHA256 0c1dde310ce67cdb401b57ace68e757d6ce0b7b3432b806f79359f4d7d3d68ca
-AUX texmacs-1.0.7.1-strip.patch 710 RMD160 98f02d72e91fa00785af0702029edab26beb0a18 SHA1 1fff9b3aff919cf2cc48656748eb69d9e9e4af34 SHA256 851e6c9468d2db87d7c19b1041ab94a88dc7894af74edc06dec8f8b4b52eb701
+AUX texmacs-1.0.7.2-strip.patch 710 RMD160 98f02d72e91fa00785af0702029edab26beb0a18 SHA1 1fff9b3aff919cf2cc48656748eb69d9e9e4af34 SHA256 851e6c9468d2db87d7c19b1041ab94a88dc7894af74edc06dec8f8b4b52eb701
 DIST TeXmacs-1.0.6.14-src.tar.gz 4313953 RMD160 1558176e93527367907cc461fe6075d4c508e23a SHA1 bab1a969be883608f5ffbaef9994d6b86c43226e SHA256 6912e66665fc8f0be3510930a280f407ef29959765b5caa89cc93886df3eee1c
-DIST TeXmacs-1.0.6.15-src.tar.gz 4456301 RMD160 97388fd96f110bd97ff5386e50b37530c24822ee SHA1 bd11a9176c7a3627322a374cd27d5eecfcd2527f SHA256 905c740907739530973d0aaac65f2973de73c29bc2574c4dcda8db230c1ec1ac
-DIST TeXmacs-1.0.7.1-src.tar.gz 4719183 RMD160 56eeee944163ee3de5952a90ed1d80e41ed0883a SHA1 728ace4b2a101be8019a1713a862f589a1f96bb6 SHA256 5ab4917fbfc0b6863fd8c8b16b6f6a3e2591ca2abe873fa32d4c6d34d2ea28af
+DIST TeXmacs-1.0.7.2-src.tar.gz 4763348 RMD160 06c8a9c93f79a576daf365ec229e98229f8563d0 SHA1 f011f4ef2b36b3f6531ecdadf96800105301b45d SHA256 98ca44418f4d4644bdee03add2e2baf18f0839d4d8336189ff4a095329f7a2ba
 DIST TeXmacs-600dpi-fonts.tar.gz 2899193 RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 SHA1 0a3a279b842b63f55449856690483d07c6e1219c SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81
 EBUILD texmacs-1.0.6.14.ebuild 1744 RMD160 e95a8829a36adb8416401f5fa487bb648aebb5bb SHA1 7e210b4bb0cdd95fb7d1f1af94d01b1df5515107 SHA256 6548b1ab8a219d98b3c702641ce29df4f37fd5e3fdb3e4e6b5583f7cce83cb00
-EBUILD texmacs-1.0.6.15.ebuild 1748 RMD160 778f1b9e46abbc95e20d75a48a3af3ffb57c29d4 SHA1 e8ad6fd8e52f100f81d3f14c81b6e21739711215 SHA256 ba5ac823aa79789be9c6508b506ad089e9f6ad41258945589d35d20fef3ab129
-EBUILD texmacs-1.0.7.1.ebuild 1705 RMD160 467d0453341d733f5890f459e7caa66abe844dde SHA1 2ff4f1b420c7db67ec3e2039e652999131f6abd9 SHA256 a21fe66dd6cb43e8445254bd8e1e4fb4452f17434468135f3112cc5b04c7c52d
-MISC ChangeLog 11036 RMD160 6bdb56af4dfff6c5384538f79e56d29159a6245c SHA1 030aa4767c1da62007057eca3a72b8e2074ef7f5 SHA256 1266064450bc741e0793cc2e4bc83457557b230a5213842e6ba3c1890f0401e3
+EBUILD texmacs-1.0.7.2.ebuild 1705 RMD160 f580b8eac3b96777c9b98855233630cadc09e1fe SHA1 48b1b2591e3a16568e565e842f76bcbfb9a57485 SHA256 c2372d55af71186006e772efdfec288da5c29b81e681298fdcbce364adce32c4
+MISC ChangeLog 11318 RMD160 2e331c70cc67b6bd63a3bc390aa34d53269cbd76 SHA1 ac5d593eea12271280b14a480c82d80583361232 SHA256 71bc5dbeda83b5f34050f43100afd93547d4d12db636dc7bb3475783d5d46e4a
 MISC metadata.xml 346 RMD160 2c1ba8a5aa56c0547c8ca42baca77d46bdd5e6e7 SHA1 1fd3a62650f23d156dac006d2051b3fb22e57057 SHA256 992c947e112a6a4244e57336294ce5020079f90612f2d0093879a85814928813
diff --git a/app-office/texmacs/files/texmacs-1.0.6.15.patch b/app-office/texmacs/files/texmacs-1.0.6.15.patch
deleted file mode 100644
index f5ba63325d91..000000000000
--- a/app-office/texmacs/files/texmacs-1.0.6.15.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -r -U2 TeXmacs-1.0.6.15-src.orig/plugins/maxima/bin/maxima_detect TeXmacs-1.0.6.15-src/plugins/maxima/bin/maxima_detect
---- TeXmacs-1.0.6.15-src.orig/plugins/maxima/bin/maxima_detect	2008-08-16 23:30:29.000000000 +0700
-+++ TeXmacs-1.0.6.15-src/plugins/maxima/bin/maxima_detect	2008-08-19 09:33:46.000000000 +0700
-@@ -37,4 +37,26 @@
- }
- 
-+# maximum version
-+V1=0; V2=0; V3=0
-+
-+max_ver() {
-+  while [ -n "$1" ]; do
-+    if [ $1 -gt $V1 ]
-+    then V1=$1; V2=$2; V3=$3
-+    elif [ $1 -eq $V1 ]
-+    then
-+      if [ $2 -gt $V2 ]
-+      then V2=$2; V3=$3
-+      elif [ $2 -eq $V2 ]
-+      then
-+        if [ $3 -gt $V3 ]
-+        then V3=$3
-+        fi
-+      fi
-+    fi
-+    shift; shift; shift
-+  done
-+}
-+
- if [ $OSTYPE = "cygwin" ] ; then EXT='.bat'; else EXT=''; fi
- MAXIMA=`which maxima$EXT 2>/dev/null`
-@@ -57,16 +79,28 @@
-       if [ "$1" ]
-       then
--        if $MAXIMA --list-avail | grep -F "version 5.9.1
--version 5.9.2
--version 5.9.3
--version 5.10
--version 5.11
--version 5.12
--version 5.13
--version 5.14" >/dev/null
-+        max_ver `maxima --list-avail | \
-+          grep '^version [A-Za-z0-9\.]\+, lisp [A_Za-z0-9]\+$' |\
-+          sed -e 's/^version \([0-9]\+\)\.\([0-9]\+\)\.\([0-9]\+\).*$/\1 \2 \3/'`
-+
-+        GOOD=no
-+        if [ $V1 -gt 5 ]
-+        then GOOD=yes
-+        elif [ $V1 -eq 5 ]
-+        then
-+          if [ $V2 -gt 9 ]
-+          then GOOD=yes
-+          elif [ $V2 -eq 9 ]
-+          then
-+            if [ $V3 -gt 0 ]
-+            then GOOD=yes
-+            fi
-+          fi
-+        fi
-+
-+        if [ $GOOD = yes ]
-         then
--          # 5.9.1 or 5.9.2 or 5.9.3 or 5.10 or 5.11 or 5.12 or 5.13 or 5.14
--          maxima -d | grep -F 'maxima-htmldir=' | sed -e \
--          's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|'
-+          # 5.9.1 or later
-+          maxima -d | grep -F 'maxima-htmldir=' |\
-+	    sed -e 's/maxima-htmldir=/"/' -e 's|$|/maxima_toc.html"|'
-         else
-           # 5.9.0
-@@ -74,6 +108,9 @@
-         fi
-       else
--        maxima --list-avail | sed -e '1d' -e 's/version /"/' \
--        -e 's/, lisp / /' -e 's/$/"/' -e '2s/^/(/' -e '$s/$/)/'
-+        echo '('
-+        maxima --list-avail |\
-+          grep '^version [a-z0-9\.]\+, lisp [a-zA-Z0-9]\+$' |\
-+          sed -e 's/^version \([a-z0-9\.]\+\), lisp \([a-zA_Z0-9]\+\)$/"\1 \2"/'
-+        echo ')'
-       fi
-     else
-diff -r -U2 TeXmacs-1.0.6.15-src.orig/plugins/maxima/bin/tm_maxima TeXmacs-1.0.6.15-src/plugins/maxima/bin/tm_maxima
---- TeXmacs-1.0.6.15-src.orig/plugins/maxima/bin/tm_maxima	2008-08-16 23:30:29.000000000 +0700
-+++ TeXmacs-1.0.6.15-src/plugins/maxima/bin/tm_maxima	2008-08-19 09:29:44.000000000 +0700
-@@ -5,4 +5,5 @@
- 
- case $1 in
-+  cygwin) exec maxima.bat -p "`echo $TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp|cygpath --windows -f -`";;
-   5.6)
-     case $2 in
-@@ -11,14 +12,9 @@
-       clisp) exec maxima -i "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.6.lisp" \
-           | maxima_filter;;
--      *) echo -e "\2latex:\\red Unsupported lisp for old maxima: $2\5"
-     esac;;
--  5.9.0) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.0.lisp" \
--      | maxima_filter;;
--  5.9.1) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.1.lisp";;
--  5.9.1.1* | 5.9.2* | 5.9.3*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";;
-+  5.9.0) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.0.lisp" | maxima_filter;;
-+  5.9.1*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.1.lisp";;
-+  5.9.2* | 5.9.3*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.9.2.lisp";;
-   5.10.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.10.0.lisp";;
--  5.11.* | 5.12.* | 5.13.* | 5.14.*) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";;
--  cygwin)
--    exec maxima.bat -p "`echo $TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp|cygpath --windows -f -`";;
--  *) echo -e "\2latex:\\red Unsupported version of maxima: $1\5"
-+  *) exec maxima -u $1 -l $2 -p "$TEXMACS_MAXIMA_PATH/texmacs-maxima-5.11.0.lisp";;
- esac
diff --git a/app-office/texmacs/files/texmacs-1.0.7.1-strip.patch b/app-office/texmacs/files/texmacs-1.0.7.2-strip.patch
index b6e660eac900..b6e660eac900 100644
--- a/app-office/texmacs/files/texmacs-1.0.7.1-strip.patch
+++ b/app-office/texmacs/files/texmacs-1.0.7.2-strip.patch
diff --git a/app-office/texmacs/texmacs-1.0.6.15.ebuild b/app-office/texmacs/texmacs-1.0.6.15.ebuild
deleted file mode 100644
index 205aed815047..000000000000
--- a/app-office/texmacs/texmacs-1.0.6.15.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.6.15.ebuild,v 1.2 2008/08/26 06:35:49 grozin Exp $
-inherit eutils
-MY_P=${P/tex/TeX}-src
-DESCRIPTION="Wysiwyg text processor with high-quality maths"
-
-SRC_URI="ftp://ftp.texmacs.org/pub/TeXmacs/targz/${MY_P}.tar.gz
-	ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-600dpi-fonts.tar.gz"
-
-HOMEPAGE="http://www.texmacs.org/"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="imlib jpeg svg netpbm spell"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="virtual/latex-base
-	virtual/ghostscript
-	>=dev-scheme/guile-1.4
-	media-libs/freetype
-	x11-libs/libXext
-	imlib? ( media-libs/imlib2 )
-	jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) )
-	svg? ( || ( media-gfx/inkscape gnome-base/librsvg ) )
-	netpbm? ( media-libs/netpbm )
-	spell? ( || ( >=app-text/ispell-3.2 >=app-text/aspell-0.5 ) )"
-
-DEPEND="${RDEPEND}
-	x11-proto/xproto"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	if has_version ">=dev-scheme/guile-1.8"; then
-		if ! built_with_use dev-scheme/guile deprecated; then
-			eerror "Please re-emerge dev-scheme/guile with the USE flag +deprecated"
-			die "Bad guile version"
-		fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PF}.patch
-}
-
-src_compile() {
-	econf $(use_with imlib imlib2 ) \
-		--enable-optimize="${CXXFLAGS}" \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc TODO || die "dodoc failed"
-	domenu "${FILESDIR}/TeXmacs.desktop" || die "domenu failed"
-
-	# now install the fonts
-	insinto /usr/share/texmf
-	doins -r "${WORKDIR}/fonts" || die "installing fonts failed"
-}
diff --git a/app-office/texmacs/texmacs-1.0.7.1.ebuild b/app-office/texmacs/texmacs-1.0.7.2.ebuild
index 5a2c3ced91e0..e97f63e4105b 100644
--- a/app-office/texmacs/texmacs-1.0.7.1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.1.ebuild,v 1.2 2009/01/03 06:32:35 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.2.ebuild,v 1.1 2009/04/19 13:19:20 grozin Exp $
 EAPI=2
 inherit autotools
 MY_P=${P/tex/TeX}-src