Version bump

Package-Manager: portage-2.2.0_alpha9/cvs/Linux i686

5 files changed, 11 insertions, 100 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index e9e416ad642b..d524ec53034a 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/texmacs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.87 2010/11/29 04:55:37 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.88 2010/12/21 07:48:15 grozin Exp $
+
+*texmacs-1.0.7.9 (21 Dec 2010)
+
+  21 Dec 2010; Andrey Grozin <grozin@gentoo.org> -texmacs-1.0.7.6.ebuild,
+  -texmacs-1.0.7.7.ebuild, +texmacs-1.0.7.9.ebuild, -files/texmacs-qt.patch:
+  Version bump
 
 *texmacs-1.0.7.8 (29 Nov 2010)
 
diff --git a/app-office/texmacs/Manifest b/app-office/texmacs/Manifest
index 6e29a829b108..1632bc3add15 100644
--- a/app-office/texmacs/Manifest
+++ b/app-office/texmacs/Manifest
@@ -1,15 +1,12 @@
 AUX TeXmacs.desktop 268 RMD160 92ca6c7c75a6e1edd671c2e5f766140382107ebb SHA1 f917105f37a16393ff8f6e1be111a9f00733de41 SHA256 9872d60c5080260a3dcc842cf1f74557954b0830b204ffc0e255f7ee52a13825
 AUX texmacs-ldflags.patch 3389 RMD160 981eec8bff794ed4f619a24fbda000ffe5d9f03c SHA1 caf6d40badfd07ec897ad323b95b49a1f65d80e4 SHA256 23e0514e1bfaed93c60b0ceae050dd6dbf0dfebb43fb08712c4db5b6288d6b3a
-AUX texmacs-qt.patch 922 RMD160 1f2eb03f68b9653a764e3fbaa1acff95e2e17f00 SHA1 9e672db30a6acef2f7015adcbf3559911e4763e9 SHA256 979edfb12f79e90f162a641a145d6002051fc1cab2bf0fa4aceb90f89fcce786
 AUX texmacs-strip.patch 710 RMD160 98f02d72e91fa00785af0702029edab26beb0a18 SHA1 1fff9b3aff919cf2cc48656748eb69d9e9e4af34 SHA256 851e6c9468d2db87d7c19b1041ab94a88dc7894af74edc06dec8f8b4b52eb701
 DIST TeXmacs-1.0.7.2-src.tar.gz 4763348 RMD160 06c8a9c93f79a576daf365ec229e98229f8563d0 SHA1 f011f4ef2b36b3f6531ecdadf96800105301b45d SHA256 98ca44418f4d4644bdee03add2e2baf18f0839d4d8336189ff4a095329f7a2ba
-DIST TeXmacs-1.0.7.6-src.tar.gz 5684288 RMD160 926ee849d73550988b8d5c3eb3c134cfe1a74de1 SHA1 9d1cbcc8e8a7afa091f3819f1a5d1f4d33c0e2ec SHA256 50d7e3973f4d39f01977945e5a79a7d4f3b7850d11af0a520cbfda14d5f09874
-DIST TeXmacs-1.0.7.7-src.tar.gz 5758524 RMD160 95d0bd16cac6ce4d85215b706b4029f4f921ad3a SHA1 93e8b24fe978e8f825c7898cf201bf1e962d41ef SHA256 c135379640dc4ff897e0d86db024706cbc650d45ac661a09128347dd12caa3d0
 DIST TeXmacs-1.0.7.8-src.tar.gz 5837070 RMD160 4ac488472b962df28ae8efb7aa9f5fb65f256436 SHA1 4d9b736d3f3b2a7321a4ab9c9d8e7f1d623a345b SHA256 b667d9ac52b2f9fee4612f73c75cf25b6f914fac572c2e96ebc7713b390df075
+DIST TeXmacs-1.0.7.9-src.tar.gz 6187387 RMD160 04c97399b8d1651c1b9adf1e43d7d1fddc7cb307 SHA1 738a559b912b36df3308ee4586d99fcf9c83b03a SHA256 95919f8edd5e0b9636668046f9fa9e1b2c9d6fad09e16485dfa21a3537d63e20
 DIST TeXmacs-600dpi-fonts.tar.gz 2899193 RMD160 b5a27a59ed0c178f94836b828d12d3534b506582 SHA1 0a3a279b842b63f55449856690483d07c6e1219c SHA256 e8eeb3c97a1405fd037b0567f683a6d2225d47c7829893b9768bd6c1c707cc81
 EBUILD texmacs-1.0.7.2.ebuild 1507 RMD160 2537533cdc873a174f77a4ba78a19b78a09e72ef SHA1 cadd84af65d6dcfcd7b79b3ab11e37d17f9035df SHA256 463c539fa5bb4734b8de842ae0cb210a500bdf9e54104db7ee07b2d21026e50a
-EBUILD texmacs-1.0.7.6.ebuild 1831 RMD160 c0b3f6e2a8a28f96ffed1fc39e9e3801b7a2d326 SHA1 de9c70c2c96b66f30053a83003abb7218e7264a8 SHA256 9d0e7887b30f3cd4ab88ef5ab5f20cc7562fede5e12921f7038b03bed5e047cc
-EBUILD texmacs-1.0.7.7.ebuild 1906 RMD160 874e61351bd5c842b8a4b92975d92481c385baee SHA1 e17dd4e42999117f5fa8c8836377c24cacf06fdd SHA256 6cfae0d8dc1685d3214e09f193472a29f98ceb21751c96925495617ef98a62b7
 EBUILD texmacs-1.0.7.8.ebuild 1823 RMD160 f28e362347d29705abbca474fdef6539020bc634 SHA1 eb46c561f2d819304807ac43bd16f15c32d95d85 SHA256 5268057776b142c5e5bd30957efa8f5f8072fb2c75338d7f180b045b7eaf41ff
-MISC ChangeLog 14330 RMD160 42ef8d6787ee59776028ad05c2567c70f043e331 SHA1 3bbf952d3e45e365237c40a86dfaf59567db9876 SHA256 8be8c4189688ea4995803b0513a2c880dec47eae00bf3af5162ff9ed6f9f68c3
+EBUILD texmacs-1.0.7.9.ebuild 1823 RMD160 bfe387850745c239fa0f4d10adad8aa8a7bacbac SHA1 0267635195a96bfeb99928656330c6c8a0a7c8f3 SHA256 2e9811c3f8a302a67c55b352bdb29cff1d84481b6e05f1134b91bca9842f5fdd
+MISC ChangeLog 14529 RMD160 164a06f47d9857be2343f5fa291c58fa38411613 SHA1 be94ed096ae3d9916da46d370bc16cacba8dfbde SHA256 af506db7f46fd7030ef33752685b1f858cc4615f6e37da7de1825f99d0fded0c
 MISC metadata.xml 346 RMD160 2c1ba8a5aa56c0547c8ca42baca77d46bdd5e6e7 SHA1 1fd3a62650f23d156dac006d2051b3fb22e57057 SHA256 992c947e112a6a4244e57336294ce5020079f90612f2d0093879a85814928813
diff --git a/app-office/texmacs/files/texmacs-qt.patch b/app-office/texmacs/files/texmacs-qt.patch
deleted file mode 100644
index ebb73553ade2..000000000000
--- a/app-office/texmacs/files/texmacs-qt.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -r -U1 TeXmacs-1.0.7.7-src.orig//src/Plugins/Imlib2/imlib2.cpp TeXmacs-1.0.7.7-src//src/Plugins/Imlib2/imlib2.cpp
---- TeXmacs-1.0.7.7-src.orig//src/Plugins/Imlib2/imlib2.cpp	2010-10-23 02:38:01.000000000 +0700
-+++ TeXmacs-1.0.7.7-src//src/Plugins/Imlib2/imlib2.cpp	2010-11-11 00:00:12.000000000 +0600
-@@ -17,2 +17,6 @@
- 
-+#include <Imlib2.h>
-+#include <stdio.h>
-+#include <string.h>
-+
- /******************************************************************************
-diff -r -U1 TeXmacs-1.0.7.7-src.orig//src/Plugins/Imlib2/imlib2.hpp TeXmacs-1.0.7.7-src//src/Plugins/Imlib2/imlib2.hpp
---- TeXmacs-1.0.7.7-src.orig//src/Plugins/Imlib2/imlib2.hpp	2010-10-23 02:38:01.000000000 +0700
-+++ TeXmacs-1.0.7.7-src//src/Plugins/Imlib2/imlib2.hpp	2010-11-11 00:01:11.000000000 +0600
-@@ -25,8 +25,2 @@
- 
--#ifdef USE_IMLIB2
--#include <Imlib2.h>
--#include <stdio.h>
--#include <string.h>
--#endif // USE_IMLIB2
--
- #endif // IMLIB2_H
diff --git a/app-office/texmacs/texmacs-1.0.7.6.ebuild b/app-office/texmacs/texmacs-1.0.7.6.ebuild
deleted file mode 100644
index 9612cd63141e..000000000000
--- a/app-office/texmacs/texmacs-1.0.7.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2010 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.6.ebuild,v 1.3 2010/11/10 12:55:14 grozin Exp $
-EAPI=2
-inherit autotools
-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-3"
-SLOT="0"
-IUSE="imlib jpeg netpbm -qt4 svg spell"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-scheme/guile[deprecated]
-	virtual/latex-base
-	app-text/ghostscript-gpl
-	media-libs/freetype
-	x11-libs/libXext
-	x11-apps/xmodmap
-	qt4? ( x11-libs/qt-gui:4 )
-	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 use qt4; then
-		ewarn "Qt port is highly experimental"
-		ewarn "If you want a stable TeXmacs, emerge with USE=-qt4"
-	fi
-}
-
-src_prepare() {
-	# don't strip
-	epatch "${FILESDIR}"/${PN}-strip.patch
-
-	# CursorShape was #define'd to 0 by X11/X.h
-	epatch "${FILESDIR}"/${PN}-qt.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with imlib imlib2) \
-		--enable-optimize="${CXXFLAGS}" \
-		$(use_enable qt4 qt)
-}
-
-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.7.ebuild b/app-office/texmacs/texmacs-1.0.7.9.ebuild
index 2b3b5b0dc24e..ad12fc843d75 100644
--- a/app-office/texmacs/texmacs-1.0.7.7.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.7.ebuild,v 1.2 2010/11/10 12:55:14 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/texmacs-1.0.7.9.ebuild,v 1.1 2010/12/21 07:48:16 grozin Exp $
 EAPI=2
 inherit autotools
 MY_P=${P/tex/TeX}-src
@@ -47,9 +47,6 @@ src_prepare() {
 	# respect LDFLAGS, bug #338459
 	epatch "${FILESDIR}"/${PN}-ldflags.patch
 
-	# CursorShape was #define'd to 0 by X11/X.h
-	epatch "${FILESDIR}"/${PN}-qt.patch
-
 	eautoreconf
 }