Dropped virtual/x11, bug #156381.

(Portage version: 2.1.2-r9)

7 files changed, 25 insertions, 341 deletions

diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog
index a0a7cfd2f2e1..c93a0b9f5e5b 100644
--- a/app-office/lyx/ChangeLog
+++ b/app-office/lyx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/lyx
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.96 2007/02/18 23:52:29 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.97 2007/02/25 16:27:54 matsuu Exp $
+
+  25 Feb 2007; MATSUU Takuto <matsuu@gentoo.org>
+  -files/lyx-1.4.1-dvips-R0.patch, -files/lyx-1.4.1-gentoo.patch,
+  -lyx-1.4.1-r1.ebuild, lyx-1.4.2.ebuild, lyx-1.4.4.ebuild:
+  Dropped virtual/x11, bug #156381.
+  Remove old version.
 
   18 Feb 2007; Jason Wever <weeve@gentoo.org> lyx-1.4.2.ebuild:
   Stable on SPARC wrt bug #167012.
diff --git a/app-office/lyx/files/digest-lyx-1.4.1-r1 b/app-office/lyx/files/digest-lyx-1.4.1-r1
deleted file mode 100644
index 6f27d72b27e2..000000000000
--- a/app-office/lyx/files/digest-lyx-1.4.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-MD5 56a96428e726190a92e35ad9cf0afa8b CJK-LyX-qt-1.4.1-2.patch 420933
-RMD160 f25c197fe18aebbb0d93b64e0eabc6c5298e62eb CJK-LyX-qt-1.4.1-2.patch 420933
-SHA256 b853e308619f87bcd3f9e8e3243083ebede72f3938c9c68c4fbd1816974d5f5d CJK-LyX-qt-1.4.1-2.patch 420933
-MD5 f1df2f1426cca24c0dafa1dc1a832e6a hebrew.bind 45
-RMD160 1621bd311aa053798815fd6c795406a505761531 hebrew.bind 45
-SHA256 fc3b1e19560f7a22af1c6bca13c0c0d7786d6453e292201645abff54fd0b67dd hebrew.bind 45
-MD5 0f3275e403be5fdbd14117dd8a26675f latex-xft-fonts-0.1.tar.gz 91730
-RMD160 0a516eeba71ddc474e97f315e45e41028efa2e4d latex-xft-fonts-0.1.tar.gz 91730
-SHA256 78bceea8a055bc43bd0d246ae8e69f81d2f161ae4d8f1aaaa2dfff9e293ae964 latex-xft-fonts-0.1.tar.gz 91730
-MD5 368696695a05e428773626e3b0f8ae74 lyx-1.4.1.tar.bz2 6637018
-RMD160 8569859a1badb3f5f1869b61210bd743bd274c5c lyx-1.4.1.tar.bz2 6637018
-SHA256 290b55df4d2726581b9451289b4d73e53aab733fbd0f09e22385022e84424854 lyx-1.4.1.tar.bz2 6637018
-MD5 a0e3948595801a90d32d8b712596a5fe preferences 1669
-RMD160 26986d7bcc48c4ecf60f84d95490148a5e171785 preferences 1669
-SHA256 41867ac67bc729d1057253bf305aced1ff666ee4d648dfefc99fd0c3c0501d43 preferences 1669
diff --git a/app-office/lyx/files/lyx-1.4.1-dvips-R0.patch b/app-office/lyx/files/lyx-1.4.1-dvips-R0.patch
deleted file mode 100644
index 584f0e943756..000000000000
--- a/app-office/lyx/files/lyx-1.4.1-dvips-R0.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urN lyx-1.4.0.orig/lib/configure lyx-1.4.0/lib/configure
---- lyx-1.4.0.orig/lib/configure	2006-03-07 00:49:49.000000000 +0100
-+++ lyx-1.4.0/lib/configure	2006-03-29 18:07:01.000000000 +0200
-@@ -997,7 +997,7 @@
- echo $ac_n "checking for a DVI to PS converter""... $ac_c"
- echo "$ac_t"""
- dvi_to_ps_command=
--for ac_prog in "dvips -o \$\$o \$\$i"
-+for ac_prog in "dvips -R0 -o \$\$o \$\$i"
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog ; ac_word=$2
-diff -urN lyx-1.4.0.orig/lib/configure.m4 lyx-1.4.0/lib/configure.m4
---- lyx-1.4.0.orig/lib/configure.m4	2006-02-03 22:47:25.000000000 +0100
-+++ lyx-1.4.0/lib/configure.m4	2006-03-29 18:07:21.000000000 +0200
-@@ -302,7 +302,7 @@
- SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i")
- 
- # Search for a program to convert dvi to ps
--SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command, "dvips -o \$\$o \$\$i")
-+SEARCH_PROG([for a DVI to PS converter],dvi_to_ps_command, "dvips -R0 -o \$\$o \$\$i")
- 
- # Search for a program to convert dvi to pdf
- SEARCH_PROG([for a DVI to PDF converter],dvi_to_pdf_command, "dvipdfm \$\$i")
-diff -urN lyx-1.4.0.orig/lib/lyxrc.defaults lyx-1.4.0/lib/lyxrc.defaults
---- lyx-1.4.0.orig/lib/lyxrc.defaults	2006-03-07 00:50:44.000000000 +0100
-+++ lyx-1.4.0/lib/lyxrc.defaults	2006-03-29 18:05:20.000000000 +0200
-@@ -53,7 +53,7 @@
- \converter docbook    dvi        "db2dvi $$i"	""
- \converter docbook    html       "db2html $$i"	""
- \converter dvi        pdf3       "dvipdfm $$i"	""
--\converter dvi        ps         "dvips -o $$o $$i"	""
-+\converter dvi        ps         "dvips -R0 -o $$o $$i"	""
- \converter fen        asciichess "python $$s/scripts/fen2ascii.py $$i $$o"	""
- \converter fig        pdftex     "sh $$s/scripts/fig2pdftex.sh $$i $$o"	""
- \converter fig        pstex      "sh $$s/scripts/fig2pstex.sh $$i $$o"	""
-diff -urN lyx-1.4.0.orig/lib/lyxrc.example lyx-1.4.0/lib/lyxrc.example
---- lyx-1.4.0.orig/lib/lyxrc.example	2005-09-08 11:20:16.000000000 +0200
-+++ lyx-1.4.0/lib/lyxrc.example	2006-03-29 18:06:12.000000000 +0200
-@@ -348,7 +348,7 @@
- # The converter command has 4 arguments: The source format, the target format,
- # the command, and additional flags.
- # For example, the following defines a DVI->Postscript converter:
--#\converter dvi ps "dvips -o $$o $$i" ""
-+#\converter dvi ps "dvips -R0 -o $$o $$i" ""
- # The variable name $$i is replaced with the name of the source file,
- # and $$o is replaced with the name of the target file.
- # The flags argument is a list of comma separated flags.
diff --git a/app-office/lyx/files/lyx-1.4.1-gentoo.patch b/app-office/lyx/files/lyx-1.4.1-gentoo.patch
deleted file mode 100644
index 7d35ad2cf3b9..000000000000
--- a/app-office/lyx/files/lyx-1.4.1-gentoo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -urN lyx-1.4.1.orig/lib/configure lyx-1.4.1/lib/configure
---- lyx-1.4.1.orig/lib/configure	2006-04-11 11:18:17.000000000 +0200
-+++ lyx-1.4.1/lib/configure	2006-05-21 13:05:30.000000000 +0200
-@@ -95,7 +95,7 @@
-      echo "\\begin{document}\\end{document}" >> $tmpfname
-      inpname=`cygpath -w $tmpfname | tr '\\\\' /`
-      echo "\\input{$inpname}" > wrap_temp$$.ltx
--     check_err=`latex wrap_temp$$.ltx 2>&1 < /dev/null | grep Error`
-+     check_err=`latex --no-mktex=tfm wrap_temp$$.ltx 2>&1 < /dev/null | grep Error`
-      rm -f wrap_temp$$.* /tmp/x$$.*
-      if [ x"$check_err" = "x" ]
-      then
-@@ -151,7 +151,7 @@
- \\fi
- \\@@end
- EOF
--if eval ${LATEX} chklatex.ltx </dev/null 2>/dev/null \
-+if eval ${LATEX} --no-mktex=tfm chklatex.ltx </dev/null 2>/dev/null \
- 		       | grep 'ThisIsLaTeX2e' >/dev/null; then
-   :
- else
-@@ -1193,7 +1193,7 @@
- echo $ac_n "checking for a spellchecker""... $ac_c"
- echo "$ac_t"""
- prog=
--for ac_prog in ispell
-+for ac_prog in aspell
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog ; ac_word=$2
-@@ -1634,7 +1634,7 @@
- 	 fi ;;
-     esac
-   done > chklayouts.tex
--  ${LATEX} wrap_chkconfig.ltx 2>/dev/null | grep '^\+'
-+  ${LATEX} --no-mktex=tfm wrap_chkconfig.ltx 2>/dev/null | grep '^\+'
-   eval `cat chkconfig.vars | sed 's/-/_/g'`
-   test -n "${rmcopy}" && rm -f chkconfig.ltx
- fi
-@@ -1683,7 +1683,7 @@
-   fname="a b"
-   rm -f "$fname".tex
-   echo "\\message{working^^J}" >"$fname".tex
--  if ${LATEX} "$fname" </dev/null | grep 'working' >/dev/null ; then
-+  if ${LATEX} --no-mktex=tfm "$fname" </dev/null | grep 'working' >/dev/null ; then
-     echo "$ac_t""yes"
-     tex_allows_spaces=true
-   else
-@@ -1999,6 +1999,11 @@
- 
- $rc_entries
- \\font_encoding "$chk_fontenc"
-+
-+# Gentoo systems have TrueType fonts available, use them by default
-+\\screen_font_roman "Times New Roman"
-+\\screen_font_sans "Verdana"
-+\\screen_font_typewriter "Courier New"
- \\tex_allows_spaces $tex_allows_spaces
- EOF
- 
diff --git a/app-office/lyx/lyx-1.4.1-r1.ebuild b/app-office/lyx/lyx-1.4.1-r1.ebuild
deleted file mode 100644
index 2402139a09c1..000000000000
--- a/app-office/lyx/lyx-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.4.1-r1.ebuild,v 1.8 2007/02/18 05:11:23 matsuu Exp $
-
-inherit kde-functions fdo-mime eutils libtool flag-o-matic
-
-DESCRIPTION="WYSIWYM frontend for LaTeX"
-HOMEPAGE="http://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/${P}.tar.bz2
-	ftp://ftp.lyx.org/pub/lyx/contrib/latex-xft-fonts-0.1.tar.gz
-	http://cs.haifa.ac.il/~dekelts/lyx/files/hebrew.bind
-	http://cs.haifa.ac.il/~dekelts//lyx/files/preferences
-	cjk? ( ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/CJK-LyX-qt-${PV}-2.patch )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE="cjk cups debug gtk nls qt3 gnome"
-
-RDEPEND="|| (
-		virtual/x11
-		(
-			x11-libs/libXi
-			x11-libs/libXrandr
-			x11-libs/libXcursor
-			x11-libs/libXft
-		)
-	)
-	virtual/ghostscript
-	virtual/aspell-dict
-	dev-tex/latex2html
-	dev-tex/dvipost
-	media-gfx/imagemagick
-	cups? ( virtual/lpr )
-	app-text/sgmltools-lite
-	app-text/noweb
-	dev-tex/chktex"
-
-# these dependencies need looking at.
-# does lyx only need qt to compile but not run ?
-# I'll look into it <obz@gentoo.org>
-DEPEND="${RDEPEND}
-	|| (
-		virtual/x11
-		(
-			x11-libs/libX11
-			x11-libs/libXt
-			x11-libs/libXpm
-			x11-proto/xproto
-		)
-	)
-	virtual/tetex
-	>=dev-lang/perl-5
-	nls? ( sys-devel/gettext )
-	app-text/aiksaurus
-	dev-lang/python
-	>=sys-devel/autoconf-2.58
-	cjk? ( =x11-libs/qt-3* )
-	!cjk? (
-		qt3? ( =x11-libs/qt-3* )
-		!qt3? ( =x11-libs/xforms-1* )
-	)
-	gtk? (
-		>=dev-cpp/gtkmm-2.4
-		>=dev-cpp/libglademm-2.4
-	)"
-
-src_unpack() {
-	unpack ${P}.tar.bz2 || die "unpacking lyx failed"
-	unpack latex-xft-fonts-0.1.tar.gz || die "unpacking xft-fonts failed"
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.patch || die
-	# bug #125309
-	epatch ${FILESDIR}/${P}-dvips-R0.patch || die
-	if use cjk ; then
-		elog
-		elog "CJK-LyX now only supports the qt frontend"
-		elog "the xforms frontend has been removed."
-		elog
-		epatch ${DISTDIR}/CJK-LyX-qt-${PV}-2.patch || die
-	fi
-	elibtoolize || die "elibtoolize failed "
-}
-
-src_compile() {
-	local myconf=""
-
-	# Choose qt over gtk, since gtk is not feature complete
-	if use qt3 || use cjk ; then
-		set-qtdir 3
-		myconf="$myconf --with-frontend=qt --with-qt-dir=${QTDIR}"
-	elif use gtk ; then
-		ewarn
-		ewarn "GTK support for lyx is currently not feature complete."
-		ewarn "Don't report any bugs about missing or faulty features to gentoo,"
-		ewarn "instead you have the option of turning GTK support off by removing"
-		ewarn "the gtk use flag or enable the gt use flag"
-		ewarn "(or help implement the missing features at lyx.org)"
-		ewarn
-		myconf="$myconf --with-frontend=gtk"
-	else
-		myconf="$myconf --with-frontend=xforms"
-	fi
-
-	export WANT_AUTOCONF=2.5
-
-	append-flags "$(test-flags -fno-stack-protector -fno-stack-protector-all)"
-	filter-flags "-Os"
-	econf \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		${myconf} \
-		|| die "econf failed"
-
-	# bug 57479
-	emake || die "emake failed"
-
-}
-
-src_install() {
-	einstall || die "einstall failed"
-
-	dodoc README* UPGRADING ChangeLog NEWS ANNOUNCE ABOUT-NLS ${DISTDIR}/preferences
-
-	insinto /usr/share/lyx/bind
-	doins ${DISTDIR}/hebrew.bind
-
-	domenu ${FILESDIR}/lyx.desktop
-
-	# install the latex-xft fonts, which should fix
-	# the problems outlined in bug #15629
-	# <obz@gentoo.org>
-	cd ${WORKDIR}/latex-xft-fonts-0.1
-	make DESTDIR=${D} install || die "Font installation failed"
-
-	mkfontscale ${D}/usr/share/fonts/latex-xft-fonts
-	mkfontdir -e /usr/share/fonts/encodings \
-		-e /usr/share/fonts/encodings/large \
-		-e /usr/X11R6/$(get_libdir)/X11/fonts/encodings \
-		${D}/usr/share/fonts/latex-xft-fonts
-	HOME=/root fc-cache -f ${D}/usr/share/fonts/latex-xft-fonts
-
-	# bug #102310
-	if use gnome ; then
-		insinto /usr/share/icons/gnome/48x48/mimetypes
-		doins ${FILESDIR}/gnome-mime-application-x-lyx.png
-	fi
-
-	# fix for bug 91108
-	dodir /usr/share/texmf/tex/latex
-	cd ${D}/usr/share/texmf/tex/latex
-	ln -s ../../../lyx/tex lyx
-}
-
-pkg_postinst() {
-	# fix for bug 91108
-	texhash
-
-	# bug #102310
-	if use gnome ; then
-		fdo-mime_desktop_database_update
-	fi
-
-	elog
-	elog "How to use Hebrew in LyX:"
-	elog "1. emerge dev-tex/ivritex."
-	elog "2. unzip /usr/share/doc/${P}/preferences.gz into ~/.lyx/preferences"
-	elog "or, read http://www.math.tau.ac.il/~dekelts/lyx/instructions2.html"
-	elog "for instructions on using lyx's own preferences dialog to equal effect."
-	elog "3. use lyx's qt interface (compile with USE=qt3) for maximum effect."
-	elog
-
-	if ! useq qt3 ; then
-		elog
-		elog "If you have a multi-head setup not using xinerama you can only use lyx"
-		elog "on the 2nd head if not using qt (maybe due to a xforms bug). See bug #40392."
-		elog
-	fi
-}
diff --git a/app-office/lyx/lyx-1.4.2.ebuild b/app-office/lyx/lyx-1.4.2.ebuild
index 9fada76515ba..b5408bd52eb9 100644
--- a/app-office/lyx/lyx-1.4.2.ebuild
+++ b/app-office/lyx/lyx-1.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.4.2.ebuild,v 1.9 2007/02/18 23:52:29 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.4.2.ebuild,v 1.10 2007/02/25 16:27:54 matsuu Exp $
 
 inherit kde-functions fdo-mime eutils libtool flag-o-matic font
 
@@ -20,15 +20,10 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 sparc x86"
 IUSE="cjk cups debug gtk nls qt3 gnome"
 
-RDEPEND="|| (
-		virtual/x11
-		(
-			x11-libs/libXi
-			x11-libs/libXrandr
-			x11-libs/libXcursor
-			x11-libs/libXft
-		)
-	)
+RDEPEND="x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXft
 	virtual/ghostscript
 	virtual/aspell-dict
 	dev-tex/latex2html
@@ -43,15 +38,10 @@ RDEPEND="|| (
 # does lyx only need qt to compile but not run ?
 # I'll look into it <obz@gentoo.org>
 DEPEND="${RDEPEND}
-	|| (
-		virtual/x11
-		(
-			x11-libs/libX11
-			x11-libs/libXt
-			x11-libs/libXpm
-			x11-proto/xproto
-		)
-	)
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXpm
+	x11-proto/xproto
 	virtual/tetex
 	>=dev-lang/perl-5
 	nls? ( sys-devel/gettext )
diff --git a/app-office/lyx/lyx-1.4.4.ebuild b/app-office/lyx/lyx-1.4.4.ebuild
index 51fbbdf3573d..af838d15e2d6 100644
--- a/app-office/lyx/lyx-1.4.4.ebuild
+++ b/app-office/lyx/lyx-1.4.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.4.4.ebuild,v 1.2 2007/02/18 05:11:23 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.4.4.ebuild,v 1.3 2007/02/25 16:27:54 matsuu Exp $
 
 inherit kde-functions fdo-mime eutils libtool flag-o-matic font
 
@@ -20,15 +20,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cjk cups debug gtk nls qt3 gnome"
 
-RDEPEND="|| (
-		virtual/x11
-		(
-			x11-libs/libXi
-			x11-libs/libXrandr
-			x11-libs/libXcursor
-			x11-libs/libXft
-		)
-	)
+RDEPEND="x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXcursor
+	x11-libs/libXft
 	virtual/ghostscript
 	virtual/aspell-dict
 	dev-tex/latex2html
@@ -43,15 +38,10 @@ RDEPEND="|| (
 # does lyx only need qt to compile but not run ?
 # I'll look into it <obz@gentoo.org>
 DEPEND="${RDEPEND}
-	|| (
-		virtual/x11
-		(
-			x11-libs/libX11
-			x11-libs/libXt
-			x11-libs/libXpm
-			x11-proto/xproto
-		)
-	)
+	x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXpm
+	x11-proto/xproto
 	virtual/tetex
 	>=dev-lang/perl-5
 	nls? ( sys-devel/gettext )