Remove intermediate version.

(Portage version: 2.2_rc14/cvs/Linux 2.6.26-gentoo-r1 i686)

4 files changed, 6 insertions, 189 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 61ba9f3cc22a..104a715b8005 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.209 2008/11/12 22:07:04 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.210 2008/11/12 22:25:13 ulm Exp $
+
+  12 Nov 2008; Ulrich Mueller <ulm@gentoo.org>
+  -files/openmotif-2.3.1-XmRenderT-no-xft.patch,
+  -files/openmotif-2.3.1-fix-grace-crash.patch, -openmotif-2.3.1-r1.ebuild:
+  Remove intermediate version.
 
   12 Nov 2008; Brent Baude <ranger@gentoo.org> openmotif-2.3.1.1.ebuild:
   stable ppc64, bug 245635
diff --git a/x11-libs/openmotif/files/openmotif-2.3.1-XmRenderT-no-xft.patch b/x11-libs/openmotif/files/openmotif-2.3.1-XmRenderT-no-xft.patch
deleted file mode 100644
index 8508dbbb9d65..000000000000
--- a/x11-libs/openmotif/files/openmotif-2.3.1-XmRenderT-no-xft.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- openmotif-2.3.1-orig/lib/Xm/XmRenderT.c	2008-04-23 16:58:27.000000000 +0200
-+++ openmotif-2.3.1/lib/Xm/XmRenderT.c	2008-06-28 10:05:58.000000000 +0200
-@@ -1979,6 +1979,7 @@
- }
- 
- #ifdef FIX_1414
-+#ifdef USE_XFT
- static int
- GetSameRenditions(XmRendition *rend_cache, XmRendition rend, int count_rend)
- {
-@@ -2009,6 +2010,7 @@
- 
- }
- #endif
-+#endif
- 
- /* Make sure all the font related resources make sense together and */
- /* then load the font specified by fontName if necessary. */
diff --git a/x11-libs/openmotif/files/openmotif-2.3.1-fix-grace-crash.patch b/x11-libs/openmotif/files/openmotif-2.3.1-fix-grace-crash.patch
deleted file mode 100644
index 9a7425b24e8f..000000000000
--- a/x11-libs/openmotif/files/openmotif-2.3.1-fix-grace-crash.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- openmotif-2.3.1-orig/lib/Xm/TextF.c	2008-04-22 18:34:22.000000000 +0200
-+++ openmotif-2.3.1/lib/Xm/TextF.c	2008-07-25 23:31:47.000000000 +0200
-@@ -1959,6 +1959,7 @@
-   
-   if (change_stipple) {
-     valueMask |= GCFillStyle;
-+    values.fill_style = FillStippled;
-     if (stipple) {
- #ifdef FIX_1381
- 		  /*added for gray insensitive foreground (instead stipple)*/
---- openmotif-2.3.1-orig/lib/Xm/TextOut.c	2008-02-11 17:19:52.000000000 +0100
-+++ openmotif-2.3.1/lib/Xm/TextOut.c	2008-07-25 23:31:47.000000000 +0200
-@@ -623,6 +623,7 @@
-   values.background = tw->core.background_pixel;
-   if (change_stipple) {
-     valueMask |= GCFillStyle;
-+    values.fill_style = FillStippled;
-     if (stipple) {
- #ifdef FIX_1381
- 		/*added for gray insensitive foreground (instead stipple)*/
diff --git a/x11-libs/openmotif/openmotif-2.3.1-r1.ebuild b/x11-libs/openmotif/openmotif-2.3.1-r1.ebuild
deleted file mode 100644
index 8241af13e3d5..000000000000
--- a/x11-libs/openmotif/openmotif-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.1-r1.ebuild,v 1.7 2008/08/26 00:42:47 jer Exp $
-
-inherit eutils flag-o-matic multilib autotools
-
-DOC_P=${PN}-2.3.0
-DESCRIPTION="Open Motif"
-HOMEPAGE="http://www.motifzone.org/"
-SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/${P}.tar.gz
-	doc? ( http://www.motifzone.net/files/documents/${DOC_P}-manual.pdf.tgz )"
-
-LICENSE="MOTIF libXpm doc? ( OPL )"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="doc examples jpeg png unicode xft"
-
-# make people unmerge motif-config and all previous slots
-# since the slotting is finally gone now
-RDEPEND="!x11-libs/motif-config
-	!x11-libs/lesstif
-	!<=x11-libs/openmotif-2.3.0
-	x11-libs/libXmu
-	x11-libs/libXp
-	unicode? ( virtual/libiconv )
-	xft? ( x11-libs/libXft )
-	jpeg? ( media-libs/jpeg )
-	png? ( media-libs/libpng )"
-
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	x11-misc/xbitmaps"
-
-pkg_setup() {
-	# clean up orphaned cruft left over by motif-config
-	local i l count=0
-	for i in "${ROOT}"usr/bin/{mwm,uil,xmbind} \
-		"${ROOT}"usr/include/{Xm,uil,Mrm} \
-		"${ROOT}"usr/$(get_libdir)/lib{Xm,Uil,Mrm}.*; do
-		[[ -L "${i}" ]] || continue
-		l=$(readlink "${i}")
-		if [[ ${l} == *openmotif-* || ${l} == *lesstif-* ]]; then
-			einfo "Cleaning up orphaned ${i} symlink ..."
-			rm -f "${i}"
-		fi
-	done
-
-	cd "${ROOT}"usr/share/man
-	for i in $(find . -type l); do
-		l=$(readlink "${i}")
-		if [[ ${l} == *-openmotif-* || ${l} == *-lesstif-* ]]; then
-			(( count++ ))
-			rm -f "${i}"
-		fi
-	done
-	[[ ${count} -ne 0 ]] && \
-		einfo "Cleaned up ${count} orphaned symlinks in ${ROOT}usr/share/man"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix linking problem on FreeBSD, bug 219040
-	epatch "${FILESDIR}/${PN}-2.3.0-freebsd-libiconv.patch"
-
-	# add missing conditional for USE=-xft, bug 229779
-	epatch "${FILESDIR}/${P}-XmRenderT-no-xft.patch"
-
-	# display stippled multilist items correctly, bug 215984
-	epatch "${FILESDIR}/${P}-multilist-stipple.patch"
-
-	# fix crash with sci-visualization/grace, bug 232742
-	epatch "${FILESDIR}/${P}-fix-grace-crash.patch"
-
-	# disable compilation of demo binaries
-	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
-
-	# fix libtool-2.2 breakage, bug 220599
-	sed -i -e 's/LT_HAVE/FINDXFT_HAVE/g' ac_find_xft.m4
-
-	# add X.Org vendor string to aliases for virtual bindings
-	echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
-
-	AT_M4DIR=. eautoreconf
-}
-
-src_compile() {
-	# get around some LANG problems in make (#15119)
-	unset LANG
-
-	# bug #80421
-	filter-flags -ftracer
-
-	# multilib includes don't work right in this package...
-	has_multilib_profile && append-flags "-I$(get_ml_incdir)"
-
-	# feel free to fix properly if you care
-	append-flags -fno-strict-aliasing
-
-	econf --with-x \
-		$(use_enable unicode utf8) \
-		$(use_enable xft) \
-		$(use_enable jpeg) \
-		$(use_enable png)
-
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	# mwm default configs
-	insinto /usr/share/X11/app-defaults
-	newins "${FILESDIR}"/Mwm.defaults Mwm
-
-	dodir /etc/X11/mwm
-	mv -f "${D}"/usr/$(get_libdir)/X11/system.mwmrc "${D}"/etc/X11/mwm
-	dosym /etc/X11/mwm/system.mwmrc /usr/$(get_libdir)/X11/
-
-	if use examples; then
-		emake -j1 -C demos DESTDIR="${D}" install-data \
-			|| die "installation of demos failed"
-		dodir /usr/share/doc/${PF}/demos
-		mv "${D}"/usr/share/Xm/* "${D}"/usr/share/doc/${PF}/demos
-	fi
-	rm -rf "${D}"/usr/share/Xm
-
-	dodoc README RELEASE RELNOTES BUGREPORT TODO
-	use doc && cp "${WORKDIR}"/*.pdf "${D}"/usr/share/doc/${PF}
-}
-
-pkg_postinst() {
-	local line
-	while read line; do elog "${line}"; done <<-EOF
-	Gentoo is no longer providing slotted Open Motif libraries.
-	See bug 204249 and its dependencies for the reasons.
-
-	From the Open Motif 2.3.0 (upstream) release notes:
-	"Open Motif 2.3 is an updated version of 2.2. Any applications
-	built against a previous 2.x release of Open Motif will be binary
-	compatible with this release."
-
-	If you have binary-only applications requiring libXm.so.3, you may
-	therefore create a symlink from libXm.so.3 to libXm.so.4.
-	Please note, however, that there will be no Gentoo support for this.
-	Alternatively, you may install x11-libs/openmotif-compat-2.2* for
-	the Open Motif 2.2 libraries.
-	EOF
-}