Fixing dependencies, cleanup

(Portage version: 2.2_rc20/cvs/Linux 2.6.26-tuxonice i686)

6 files changed, 21 insertions, 106 deletions

diff --git a/app-office/texmacs/ChangeLog b/app-office/texmacs/ChangeLog
index af91e7416547..788dc6d95007 100644
--- a/app-office/texmacs/ChangeLog
+++ b/app-office/texmacs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.68 2009/01/02 18:48:31 grozin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmacs/ChangeLog,v 1.69 2009/01/03 06:32:35 grozin Exp $
+
+  03 Jan 2009; Andrey Grozin <grozin@gentoo.org>
+  files/texmacs-1.0.7.1-strip.patch, -files/texmacs-1.0.7-autotroll.patch,
+  -files/texmacs-1.0.7-strip.patch, -texmacs-1.0.7.ebuild,
+  texmacs-1.0.7.1.ebuild:
+  Fixing dependencies, cleanup
 
 *texmacs-1.0.7.1 (03 Jan 2009)
 
diff --git a/app-office/texmacs/files/texmacs-1.0.7-autotroll.patch b/app-office/texmacs/files/texmacs-1.0.7-autotroll.patch
deleted file mode 100644
index 8c956cdcdce0..000000000000
--- a/app-office/texmacs/files/texmacs-1.0.7-autotroll.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -r -U2 TeXmacs-1.0.7-src.orig/misc/autotroll/autotroll.m4 TeXmacs-1.0.7-src/misc/autotroll/autotroll.m4
---- TeXmacs-1.0.7-src.orig/misc/autotroll/autotroll.m4	2008-10-16 13:41:18.000000000 +0700
-+++ TeXmacs-1.0.7-src/misc/autotroll/autotroll.m4	2008-11-02 18:03:26.000000000 +0600
-@@ -241,5 +241,5 @@
-   sed 's/^/| /' "$pro_file" >&AS_MESSAGE_LOG_FD
- 
--  if $QMAKE -spec macx-g++ ; then :; else
-+  if $QMAKE -spec linux-g++ ; then :; else
-     AC_MSG_ERROR([Calling $QMAKE failed.])
-   fi
diff --git a/app-office/texmacs/files/texmacs-1.0.7-strip.patch b/app-office/texmacs/files/texmacs-1.0.7-strip.patch
deleted file mode 100644
index 838d770685ae..000000000000
--- a/app-office/texmacs/files/texmacs-1.0.7-strip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r -U2 TeXmacs-1.0.7-src.orig/Makefile.in TeXmacs-1.0.7-src/Makefile.in
---- TeXmacs-1.0.7-src.orig/Makefile.in	2008-10-16 13:41:18.000000000 +0700
-+++ TeXmacs-1.0.7-src/Makefile.in	2008-11-02 18:20:51.000000000 +0600
-@@ -129,7 +129,5 @@
- 	$(CP) $(tmdir)/plugins/*/bin/* $(DESTDIR)$(tmbin)/bin
- 	$(CP) $(tmdir)/plugins/*/lib/*.$(so) $(DESTDIR)$(tmbin)/lib 2>/dev/null || :
--	$(STRIP) $(DESTDIR)$(tmbin)/bin/texmacs.bin
- 	$(CP) $(tmdir)/lib/*.$(so) $(DESTDIR)$(tmbin)/lib 2>/dev/null || :
--	$(STRIP) $(DESTDIR)$(tmbin)/lib/*.$(so) 2>/dev/null || :
- 	$(CHMOD) 755 $(DESTDIR)$(tmbin)/bin/*
- 	$(CHMOD) 755 $(DESTDIR)$(tmbin)/lib/*.$(so) 2>/dev/null || :
diff --git a/app-office/texmacs/files/texmacs-1.0.7.1-strip.patch b/app-office/texmacs/files/texmacs-1.0.7.1-strip.patch
index 838d770685ae..b6e660eac900 100644
--- a/app-office/texmacs/files/texmacs-1.0.7.1-strip.patch
+++ b/app-office/texmacs/files/texmacs-1.0.7.1-strip.patch
@@ -1,7 +1,9 @@
-diff -r -U2 TeXmacs-1.0.7-src.orig/Makefile.in TeXmacs-1.0.7-src/Makefile.in
---- TeXmacs-1.0.7-src.orig/Makefile.in	2008-10-16 13:41:18.000000000 +0700
-+++ TeXmacs-1.0.7-src/Makefile.in	2008-11-02 18:20:51.000000000 +0600
-@@ -129,7 +129,5 @@
+Index: TeXmacs-1.0.7.1-src/Makefile.in
+===================================================================
+--- TeXmacs-1.0.7.1-src.orig/Makefile.in
++++ TeXmacs-1.0.7.1-src/Makefile.in
+@@ -130,9 +130,7 @@ INSTALL:
+ 	$(CP) $(tmdir)/bin/tm_gs $(DESTDIR)$(tmbin)/bin
  	$(CP) $(tmdir)/plugins/*/bin/* $(DESTDIR)$(tmbin)/bin
  	$(CP) $(tmdir)/plugins/*/lib/*.$(so) $(DESTDIR)$(tmbin)/lib 2>/dev/null || :
 -	$(STRIP) $(DESTDIR)$(tmbin)/bin/texmacs.bin
@@ -9,3 +11,4 @@ diff -r -U2 TeXmacs-1.0.7-src.orig/Makefile.in TeXmacs-1.0.7-src/Makefile.in
 -	$(STRIP) $(DESTDIR)$(tmbin)/lib/*.$(so) 2>/dev/null || :
  	$(CHMOD) 755 $(DESTDIR)$(tmbin)/bin/*
  	$(CHMOD) 755 $(DESTDIR)$(tmbin)/lib/*.$(so) 2>/dev/null || :
+ 	$(RM) $(DESTDIR)$(tmbin)/lib/*.a
diff --git a/app-office/texmacs/texmacs-1.0.7.1.ebuild b/app-office/texmacs/texmacs-1.0.7.1.ebuild
index 6c7ee56bf3ba..5a2c3ced91e0 100644
--- a/app-office/texmacs/texmacs-1.0.7.1.ebuild
+++ b/app-office/texmacs/texmacs-1.0.7.1.ebuild
@@ -1,7 +1,7 @@
 # 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.1 2009/01/02 18:48:31 grozin Exp $
-EAPI=1
+# $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 $
+EAPI=2
 inherit autotools
 MY_P=${P/tex/TeX}-src
 DESCRIPTION="Wysiwyg text processor with high-quality maths"
@@ -15,11 +15,12 @@ SLOT="0"
 IUSE="imlib jpeg netpbm -qt4 svg spell"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
 
-RDEPEND="virtual/latex-base
+RDEPEND="dev-scheme/guile[deprecated]
+	virtual/latex-base
 	virtual/ghostscript
-	>=dev-scheme/guile-1.4
 	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 ) )
@@ -39,21 +40,17 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
+src_prepare() {
 	# don't strip
 	epatch "${FILESDIR}"/${P}-strip.patch
 
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	econf $(use_with imlib imlib2) \
 		--enable-optimize="${CXXFLAGS}" \
 		$(use_enable qt4 qt)
-	emake || die "emake failed"
 }
 
 src_install() {
diff --git a/app-office/texmacs/texmacs-1.0.7.ebuild b/app-office/texmacs/texmacs-1.0.7.ebuild
deleted file mode 100644
index 18b28c6ae908..000000000000
--- a/app-office/texmacs/texmacs-1.0.7.ebuild
+++ /dev/null
@@ -1,70 +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.7.ebuild,v 1.2 2008/11/03 16:38:59 mr_bones_ Exp $
-EAPI=1
-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-2"
-SLOT="0"
-IUSE="imlib jpeg netpbm -qt4 svg spell"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-
-RDEPEND="virtual/latex-base
-	virtual/ghostscript
-	>=dev-scheme/guile-1.4
-	media-libs/freetype
-	x11-libs/libXext
-	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_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# macx-g++ -> linux-g++
-	epatch "${FILESDIR}"/${P}-autotroll.patch
-
-	# don't strip
-	epatch "${FILESDIR}"/${P}-strip.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_with imlib imlib2) \
-		--enable-optimize="${CXXFLAGS}" \
-		$(use_enable qt4 qt)
-	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"
-}