fixed motif dep; removed old versions

10 files changed, 24 insertions, 249 deletions

diff --git a/net-www/opera/ChangeLog b/net-www/opera/ChangeLog
index 775980815ebe..26f3bbf0559d 100644
--- a/net-www/opera/ChangeLog
+++ b/net-www/opera/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/opera
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.46 2003/12/30 07:25:46 seemant Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/ChangeLog,v 1.47 2004/01/11 13:48:42 lanius Exp $
+
+  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> opera-6.12.ebuild,
+  opera-7.11-r2.ebuild, opera-7.21.ebuild, opera-7.22.ebuild,
+  opera-7.23.ebuild, opera-7.50_alpha1.ebuild:
+  fixed motif dep; removed old versions
 
   29 Dec 2003; Seemant Kulleen <seemant@gentoo.org> opera-7.50_alpha1.ebuild:
   some cleanups, and switch to virtual/motif instead
diff --git a/net-www/opera/Manifest b/net-www/opera/Manifest
index 73de343c5d00..13db9a79693e 100644
--- a/net-www/opera/Manifest
+++ b/net-www/opera/Manifest
@@ -1,13 +1,9 @@
-MD5 0825bd32298b0f723104dfe91d0a7bc1 opera-6.12.ebuild 3343
-MD5 349ba5d49034485b40ae4230e368149a opera-7.22.ebuild 3233
-MD5 a5767d86fb69d2dc0b6fcc57d11cd648 opera-7.50_alpha1.ebuild 2391
-MD5 1b7c1f0c4e1dd14c6381cf8b4937fc09 opera-7.11-r2.ebuild 3717
-MD5 ab8203ea5ed2129e5b083fabd736a297 opera-7.21.ebuild 3431
-MD5 fe2e26286f68b639ad9909ad91998573 ChangeLog 7863
-MD5 982d1f60bd62077b280222583356afbb opera-7.23.ebuild 3411
+MD5 5f73745f3ea4dea663aee6a41b11162d opera-6.12.ebuild 3335
+MD5 845f91d5da09e9da14dfddd7e26ef5fa opera-7.50_alpha1.ebuild 2182
+MD5 e6f999047cae80f596671ce356d82eb7 opera-7.11-r2.ebuild 3709
+MD5 7eaae3a431c704682b21b5fc66430247 ChangeLog 8082
+MD5 048fbbc6f1a7bd0cb848213e54854fc1 opera-7.23.ebuild 3202
 MD5 cbaaedfc5f57eea800b4a64928d77683 files/digest-opera-6.12 89
-MD5 5f9b38271737e848dc0c7748b2ade4fe files/digest-opera-7.21 270
-MD5 7464c29efa9fc9c53b68a3b08d967480 files/digest-opera-7.22 279
 MD5 3713aa7ae0771d916247b5e616ee599b files/digest-opera-7.23 279
 MD5 fd6b6eba741abd18ba590e9a5c0f225f files/digest-opera-7.11-r2 177
 MD5 8336a92d029cd448620bf4bbd4c55715 files/opera.desktop 135
diff --git a/net-www/opera/files/digest-opera-7.21 b/net-www/opera/files/digest-opera-7.21
deleted file mode 100644
index 447e61d7be93..000000000000
--- a/net-www/opera/files/digest-opera-7.21
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 40a1287ffd0c7b9dfa60c278e15dce43 opera-7.21-20031013.1-static-qt.i386.tar.bz2 4724451
-MD5 d44dd518c4dbda1b7bc320de38dce7a9 opera-7.21-20031013.1-static-qt.ppc.tar.bz2 4781863
-MD5 45464228df4fcbaa7336fb12c579e839 opera-7.21-20031013.1-static-qt.sparc.tar.bz2 4733715
diff --git a/net-www/opera/files/digest-opera-7.22 b/net-www/opera/files/digest-opera-7.22
deleted file mode 100644
index 83622abdb429..000000000000
--- a/net-www/opera/files/digest-opera-7.22
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 86efbee18a13596977874377ccf3cb01 opera-7.22-20031103.1-static-qt.i386-en.tar.bz2 4786633
-MD5 fb87a2e40956577545fa08de2fa425b3 opera-7.22-20031103.1-static-qt.ppc-en.tar.bz2 4876162
-MD5 17e83395d6f01b75e63769bed34f95a9 opera-7.22-20031103.1-static-qt.sparc-en.tar.bz2 4807777
diff --git a/net-www/opera/opera-6.12.ebuild b/net-www/opera/opera-6.12.ebuild
index 77b919adc019..70531484cc13 100644
--- a/net-www/opera/opera-6.12.ebuild
+++ b/net-www/opera/opera-6.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-6.12.ebuild,v 1.4 2003/10/04 17:21:24 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-6.12.ebuild,v 1.5 2004/01/11 13:48:42 lanius Exp $
 #
 # 1. static       # Statically linked libraries, default.
 # 2. shared-2.95  # Dynamically linked libaries, compiled with gcc 2.95.
@@ -16,7 +16,7 @@ IUSE="gnome kde"
 
 # Dependencies may be augmented later (see below).
 RDEPEND="virtual/x11
-	>=x11-libs/lesstif-0.93.40" #lesstif resolves Bug 25767
+	x11-libs/openmotif" #lesstif resolves Bug 25767
 
 SLOT="0"
 LICENSE="OPERA"
diff --git a/net-www/opera/opera-7.11-r2.ebuild b/net-www/opera/opera-7.11-r2.ebuild
index 7d3ffd00e928..1c39ee9e88b7 100644
--- a/net-www/opera/opera-7.11-r2.ebuild
+++ b/net-www/opera/opera-7.11-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.11-r2.ebuild,v 1.3 2003/09/29 18:52:04 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.11-r2.ebuild,v 1.4 2004/01/11 13:48:42 lanius Exp $
 #
 # 1. static       # Statically linked libraries, default.
 # 2. shared-2.95  # Dynamically linked libaries, compiled with gcc 2.95.
@@ -23,7 +23,7 @@ DEPEND=">=sys-apps/sed-4"
 
 RDEPEND="virtual/x11
 	>=media-libs/fontconfig-2.1.94-r1
-	>=x11-libs/lesstif-0.93.40" #lesstif resolves Bug 25767
+	x11-libs/openmotif" #lesstif resolves Bug 25767
 
 KEYWORDS="x86 ~ppc" #please test on x86
 SLOT="0"
diff --git a/net-www/opera/opera-7.21.ebuild b/net-www/opera/opera-7.21.ebuild
deleted file mode 100644
index d096eb08ec95..000000000000
--- a/net-www/opera/opera-7.21.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.21.ebuild,v 1.3 2003/10/22 22:47:49 lanius Exp $
-
-# Here, like in the other .ebuilds, the static version is
-# forced for simplicity's sake
-
-DESCRIPTION="Opera web browser."
-HOMEPAGE="http://www.opera.com/linux/"
-LICENSE="OPERA"
-IUSE="gnome kde"
-
-# Dependencies may be augmented later (see below).
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="virtual/x11
-	>=media-libs/fontconfig-2.1.94-r1
-	media-libs/libexif
-	|| ( x11-libs/lesstif x11-libs/openmotif )"
-
-KEYWORDS="x86 ppc sparc"
-SLOT="0"
-
-OPERAVER="7.21-20031013"
-OPERATYPE="1-static-qt"
-
-SRC_URI="x86? ( ftp://ftp.opera.com/pub/opera/linux/721/final/en/i386/static/${PN}-${OPERAVER}.${OPERATYPE}.i386.tar.bz2 )
-	ppc? ( ftp://ftp.opera.com/pub/opera/linux/721/final/en/ppc/static/${PN}-${OPERAVER}.${OPERATYPE}.ppc.tar.bz2 )
-	sparc? ( ftp://ftp.opera.com/pub/opera/linux/721/final/en/sparc/static/${PN}-${OPERAVER}.${OPERATYPE}.sparc.tar.bz2 )"
-
-S=${WORKDIR}/${A/.tar.bz2/}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e "s:/etc:${D}/etc:g" \
-	       -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
-	       -e "s:read install_config:install_config=yes:" \
-	       -e "s:/opt/kde2:${D}/usr/kde/2:g" \
-	       -e "s:/opt/kde2:${D}/usr/kde/2:g" \
-	       -e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \
-	       -e "s:/usr/share/pixmaps:${D}/usr/share/pixmaps:g" \
-	       -e "s:/usr/share/icons:${D}/usr/share/icons:g" \
-	       -e "s:/etc/X11:${D}/etc/X11:g" \
-	       -e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
-	       -e 's:#\(LD_PRELOAD=.*libawt.so\):\1:' \
-	       -e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-	       -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-		   -e 's:chop "${DESTDIR}" "str_localdirexec"::' \
-		   -e 's:chop "${DESTDIR}" "str_localdirshare"::' \
-		   -e 's:chop "${DESTDIR}" "str_localdirplugin"::' \
-		   -e 's:read str_answer:return 0:' \
-	       install.sh || die
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-	if [ "`use kde`" ]
-	then
-		# Install stuff for KDE2, and then simply copy it over
-		# into the KDE3 directories.
-		dodir /usr/kde/2/share/icons/{locolor,hicolor}/{16x16,22x22,32x32,48x48}/apps
-		dodir /usr/kde/2/share/applnk/Internet
-	fi
-	if [ "`use gnome`" ]
-	then
-		dodir /usr/share/gnome/pixmaps
-		dodir /usr/share/gnome/apps/Internet
-	fi
-
-	# Opera's native installer.
-	./install.sh --prefix="${D}"/opt/opera || die
-	if [ "`use kde`" ]
-	then
-		cp -R ${D}/usr/kde/2 ${D}/usr/kde/3
-	fi
-	rm ${D}/opt/opera/share/doc/opera/help
-	dosym /opt/share/doc/opera/help /opt/opera/share/opera/help
-
-	dosed /opt/opera/bin/opera
-	dosed /opt/opera/share/opera/java/opera.policy
-
-	# Install the icons
-	insinto /usr/share/icons /etc/X11/wmconfig /etc/X11/applnk/Internet \
-		/usr/share/pixmaps
-	doins images/opera.xpm
-
-	# Install a symlink /usr/bin/opera
-	dodir /usr/bin
-	dosym /opt/opera/bin/opera /usr/bin/opera
-
-	# install correct motifwrapper
-	if has_version '=x11-libs/openmotif-2.2*'; then
-		rm ${D}/opt/opera/lib/opera/plugins/operamotifwrapper
-		cp ${S}/plugins/operamotifwrapper-3 ${D}/opt/opera/lib/opera/plugins
-	fi
-}
-
-pkg_postinst() {
-	einfo "For localized language files take a look at:"
-	einfo "http://www.opera.com/download/languagefiles/index.dml?platform=linux"
-}
diff --git a/net-www/opera/opera-7.22.ebuild b/net-www/opera/opera-7.22.ebuild
deleted file mode 100644
index ecb58bbe5912..000000000000
--- a/net-www/opera/opera-7.22.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.22.ebuild,v 1.2 2003/11/20 13:08:19 lanius Exp $
-
-# Here, like in the other .ebuilds, the static version is
-# forced for simplicity's sake
-
-DESCRIPTION="Opera web browser."
-HOMEPAGE="http://www.opera.com/linux/"
-LICENSE="OPERA"
-IUSE="gnome kde"
-
-# Dependencies may be augmented later (see below).
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="virtual/x11
-	>=media-libs/fontconfig-2.1.94-r1
-	media-libs/libexif
-	|| ( x11-libs/lesstif =x11-libs/openmotif-2.1* )"
-
-KEYWORDS="x86 ppc sparc"
-SLOT="0"
-
-OPERAVER="7.22-20031103"
-OPERATYPE="1-static-qt"
-
-SRC_URI="x86? ( ftp://ftp.opera.com/pub/opera/linux/722/final/en/i386/static/${PN}-${OPERAVER}.${OPERATYPE}.i386-en.tar.bz2 )
-	ppc? ( ftp://ftp.opera.com/pub/opera/linux/722/final/en/ppc/static/${PN}-${OPERAVER}.${OPERATYPE}.ppc-en.tar.bz2 )
-	sparc? ( ftp://ftp.opera.com/pub/opera/linux/722/final/en/sparc/static/${PN}-${OPERAVER}.${OPERATYPE}.sparc-en.tar.bz2 )"
-
-S=${WORKDIR}/${A/.tar.bz2/}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	sed -i -e "s:/etc:${D}/etc:g" \
-	       -e "s:config_dir=\"/etc\":config_dir=\"${D}/etc/\":g" \
-	       -e "s:read install_config:install_config=yes:" \
-	       -e "s:/opt/kde2:${D}/usr/kde/2:g" \
-	       -e "s:/opt/kde2:${D}/usr/kde/2:g" \
-	       -e "s:/usr/share/applnk:${D}/usr/share/applnk:g" \
-	       -e "s:/usr/share/pixmaps:${D}/usr/share/pixmaps:g" \
-	       -e "s:/usr/share/icons:${D}/usr/share/icons:g" \
-	       -e "s:/etc/X11:${D}/etc/X11:g" \
-	       -e "s:/usr/share/gnome:${D}/usr/share/gnome:g" \
-	       -e 's:#\(LD_PRELOAD=.*libawt.so\):\1:' \
-	       -e 's:#\(OPERA_FORCE_JAVA_ENABLED=\):\1:' \
-	       -e 's:#\(export LD_PRELOAD OPERA_FORCE_JAVA_ENABLED\):\1:' \
-		   -e 's:chop "${DESTDIR}" "str_localdirexec"::' \
-		   -e 's:chop "${DESTDIR}" "str_localdirshare"::' \
-		   -e 's:chop "${DESTDIR}" "str_localdirplugin"::' \
-		   -e 's:read str_answer:return 0:' \
-	       install.sh || die
-}
-
-src_compile() {
-	true
-}
-
-src_install() {
-	# Prepare installation directories for Opera's installer script.
-	dodir /etc
-	if [ "`use kde`" ]
-	then
-		# Install stuff for KDE2, and then simply copy it over
-		# into the KDE3 directories.
-		dodir /usr/kde/2/share/icons/{locolor,hicolor}/{16x16,22x22,32x32,48x48}/apps
-		dodir /usr/kde/2/share/applnk/Internet
-	fi
-	if [ "`use gnome`" ]
-	then
-		dodir /usr/share/gnome/pixmaps
-		dodir /usr/share/gnome/apps/Internet
-	fi
-
-	# Opera's native installer.
-	./install.sh --prefix="${D}"/opt/opera || die
-	if [ "`use kde`" ]
-	then
-		cp -R ${D}/usr/kde/2 ${D}/usr/kde/3
-	fi
-	rm ${D}/opt/opera/share/doc/opera/help
-	dosym /opt/share/doc/opera/help /opt/opera/share/opera/help
-
-	dosed /opt/opera/bin/opera
-	dosed /opt/opera/share/opera/java/opera.policy
-
-	# Install the icons
-	insinto /usr/share/icons /etc/X11/wmconfig /etc/X11/applnk/Internet \
-		/usr/share/pixmaps
-	doins images/opera.xpm
-
-	# Install a symlink /usr/bin/opera
-	dodir /usr/bin
-	dosym /opt/opera/bin/opera /usr/bin/opera
-}
-
-pkg_postinst() {
-	einfo "For localized language files take a look at:"
-	einfo "http://www.opera.com/download/languagefiles/index.dml?platform=linux"
-}
diff --git a/net-www/opera/opera-7.23.ebuild b/net-www/opera/opera-7.23.ebuild
index 4f0a72400584..a1a459eb618b 100644
--- a/net-www/opera/opera-7.23.ebuild
+++ b/net-www/opera/opera-7.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.23.ebuild,v 1.2 2003/12/30 07:34:06 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.23.ebuild,v 1.3 2004/01/11 13:48:42 lanius Exp $
 
 # Here, like in the other .ebuilds, the static version is
 # forced for simplicity's sake
@@ -27,7 +27,7 @@ DEPEND=">=sys-apps/sed-4"
 RDEPEND="virtual/x11
 	>=media-libs/fontconfig-2.1.94-r1
 	media-libs/libexif
-	virtual/motif"
+	x11-libs/openmotif"
 
 src_unpack() {
 	unpack ${A}
@@ -92,12 +92,6 @@ src_install() {
 	# Install a symlink /usr/bin/opera
 	dodir /usr/bin
 	dosym /opt/opera/bin/opera /usr/bin/opera
-
-	# install correct motifwrapper
-	if has_version '=x11-libs/openmotif-2.2*'; then
-		rm ${D}/opt/opera/lib/opera/plugins/operamotifwrapper
-		cp ${S}/plugins/operamotifwrapper-3 ${D}/opt/opera/lib/opera/plugins
-	fi
 }
 
 pkg_postinst() {
diff --git a/net-www/opera/opera-7.50_alpha1.ebuild b/net-www/opera/opera-7.50_alpha1.ebuild
index d76f14175b7b..1cf8e3fd7d5e 100644
--- a/net-www/opera/opera-7.50_alpha1.ebuild
+++ b/net-www/opera/opera-7.50_alpha1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.50_alpha1.ebuild,v 1.4 2003/12/30 07:25:46 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/opera/opera-7.50_alpha1.ebuild,v 1.5 2004/01/11 13:48:42 lanius Exp $
 
 # Here, like in the other .ebuilds, the static version is
 # forced for simplicity's sake
@@ -21,7 +21,7 @@ DEPEND=">=sys-apps/sed-4"
 RDEPEND="virtual/x11
 	>=media-libs/fontconfig-2.1.94-r1
 	media-libs/libexif
-	virtual/motif"
+	x11-libs/openmotif"
 
 SLOT="0"
 LICENSE="OPERA"
@@ -70,12 +70,6 @@ src_install() {
 	# Install a symlink /usr/bin/opera
 	dodir /usr/bin
 	dosym /opt/opera/bin/opera /usr/bin/opera
-
-	# install correct motifwrapper
-	if has_version '=x11-libs/openmotif-2.2*'; then
-		rm ${D}/opt/opera/lib/opera/plugins/operamotifwrapper
-		cp ${S}/plugins/operamotifwrapper-3 ${D}/opt/opera/lib/opera/plugins
-	fi
 }
 
 pkg_postinst() {