Version bump

(Portage version: 2.2.0_alpha9/cvs/Linux i686)

4 files changed, 8 insertions, 94 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/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
 }