Modular X porting.

(Portage version: 2.1_pre3-r1)

6 files changed, 21 insertions, 66 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 9e570dd0050e..5305aed0599d 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.16 2006/01/15 19:39:18 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.17 2006/01/25 14:08:57 nattfodd Exp $
+
+  25 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org> -texmaker-1.11.ebuild,
+  texmaker-1.11-r1.ebuild, texmaker-1.21.ebuild:
+  Modular X porting. Also removed old texmaker-1.11 which was still in ~arch.
 
   15 Jan 2006; Alexandre Buisse <nattfodd@gentoo.org> texmaker-1.21.ebuild:
   Added big ewarn about possible qt-4.0/4.1 up/down cycle in emerge world.
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index c0ca33e44176..17160363351f 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -3,6 +3,6 @@ MD5 6523b9d37f10392c4198cac68935cd93 files/digest-texmaker-1.11 66
 MD5 6523b9d37f10392c4198cac68935cd93 files/digest-texmaker-1.11-r1 66
 MD5 87c6b930962d1f18ddef65c23a1ccd79 files/digest-texmaker-1.21 67
 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164
-MD5 53c85051fb2b3d060934596cf6059fa9 texmaker-1.11-r1.ebuild 1500
+MD5 c2313b950f02ef70ce01ded2c3705df2 texmaker-1.11-r1.ebuild 1576
 MD5 4795d01e61e250245aef7dfeabff2d9a texmaker-1.11.ebuild 1395
-MD5 9084c6eb9115e81d504e76b19c68ad11 texmaker-1.21.ebuild 1985
+MD5 22a67dc7aa936f74ca23d84c68a9ad3c texmaker-1.21.ebuild 2061
diff --git a/app-office/texmaker/files/digest-texmaker-1.11 b/app-office/texmaker/files/digest-texmaker-1.11
deleted file mode 100644
index f0091fdd1ef3..000000000000
--- a/app-office/texmaker/files/digest-texmaker-1.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3ddb910aa5693f333635842e0223ed62 texmaker-1.11.tar.bz2 697937
diff --git a/app-office/texmaker/texmaker-1.11-r1.ebuild b/app-office/texmaker/texmaker-1.11-r1.ebuild
index 4740e51506e9..f1ea5349cfb9 100644
--- a/app-office/texmaker/texmaker-1.11-r1.ebuild
+++ b/app-office/texmaker/texmaker-1.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.11-r1.ebuild,v 1.5 2006/01/08 22:27:10 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.11-r1.ebuild,v 1.6 2006/01/25 14:08:57 nattfodd Exp $
 
 inherit kde-functions eutils
 
@@ -17,7 +17,12 @@ KEYWORDS="amd64 ppc sparc x86"
 
 IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11
+			   x11-libs/libXext )
+			virtual/x11
+		)"
+
+DEPEND="${DEPEND}
 	virtual/tetex
 	app-text/psutils
 	virtual/ghostscript
diff --git a/app-office/texmaker/texmaker-1.11.ebuild b/app-office/texmaker/texmaker-1.11.ebuild
deleted file mode 100644
index 7c1b3a280083..000000000000
--- a/app-office/texmaker/texmaker-1.11.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.11.ebuild,v 1.7 2005/07/01 14:55:07 caleb Exp $
-
-inherit kde-functions
-
-DESCRIPTION="a nice LaTeX-IDE"
-
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-
-IUSE=""
-
-DEPEND="virtual/x11
-	virtual/tetex
-	app-text/psutils
-	virtual/ghostscript
-	media-libs/netpbm"
-
-need-qt 3.2
-
-src_compile() {
-	einfo "using QTDIR: '$QTDIR'."
-
-	# from BUILD.sh:
-	PATH=${QTDIR}/bin:${PATH}
-	LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
-	DYLD_LIBRARY_PATH=${QTDIR}/lib:${DYLD_LIBRARY_PATH}
-	export QTDIR PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH
-
-	${QTDIR}/bin/qmake -unix texmaker.pro || die "qmake failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin texmaker || die "doexe failed"
-
-	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png || die "doins failed."
-
-	dodoc utilities/{AUTHORS,COPYING} || die "dodoc failed"
-
-	dohtml utilities/*.{html,gif,css,txt} utilities/doc*.png || die "dohtml failed"
-
-	dosym /usr/share/doc/${PF}/html /usr/share/${PN} || die "dosym failed"
-}
-
-pkg_postinst() {
-	einfo "A user manual with many screenshots is available at:"
-	einfo "/usr/share/doc/${PF}/html/usermanual.html"
-}
diff --git a/app-office/texmaker/texmaker-1.21.ebuild b/app-office/texmaker/texmaker-1.21.ebuild
index 324900da2976..83638c61e105 100644
--- a/app-office/texmaker/texmaker-1.21.ebuild
+++ b/app-office/texmaker/texmaker-1.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.21.ebuild,v 1.4 2006/01/15 19:39:18 nattfodd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.21.ebuild,v 1.5 2006/01/25 14:08:57 nattfodd Exp $
 
 inherit eutils versionator
 
@@ -24,7 +24,12 @@ KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 
 IUSE=""
 
-DEPEND="virtual/x11
+RDEPEND="|| ( ( x11-libs/libX11
+			   x11-libs/libXext )
+			virtual/x11
+		)"
+
+DEPEND="${DEPEND}
 	virtual/tetex
 	app-text/psutils
 	virtual/ghostscript