Remove intermediate version.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.26-gentoo-r1 i686

5 files changed, 17 insertions, 194 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/Manifest b/x11-libs/openmotif/Manifest
index f2f669d83918..7f5ab4b61067 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,16 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Mwm.defaults 536 RMD160 99fc40c2e923b53a14b2911c37064f2c9cd3f63b SHA1 ddbe7ab7af3a8caf6ccb9d6ab2c721ce5940edd1 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250
 AUX openmotif-2.3.0-fix-nedit-segfaults.patch 926 RMD160 c6ddd15bee038509cc7e18098f209ac6c14f8e48 SHA1 c87b69cb24d3004bd146cd1e8645c72956fcfbdc SHA256 8aeb1daed4862393c7dc10df469d43e2a98154d18c7a0c3e65ca2750a412072c
 AUX openmotif-2.3.0-freebsd-libiconv.patch 744 RMD160 e01f49c108b1393cfa408f5ec452f18afe852503 SHA1 7ba83a4da347bfa1ce94340fdaa5675dd104d5bb SHA256 15065447d0670b64242b9673113ecc23e90d7b3a778a9c5ae5da2b48940c08d0
 AUX openmotif-2.3.0-sensitivity-invisible.patch 6503 RMD160 98ddb9cc9e8c84e28a2d8802f4a389f42f5f9715 SHA1 1da82de91d748b6eaf04fa9d320181b7a27138ff SHA256 d55d756548b6c8e7892f2d597cb8ac4dcd78d5164602d5878be314ed6d6cdcb3
-AUX openmotif-2.3.1-XmRenderT-no-xft.patch 487 RMD160 97d8439eab1010072766ba56d1e999f154ed5d09 SHA1 3cb77f3cb67a772665a07bf440bd40a0516d63ca SHA256 df19a632372b3a351467fc4ed54c7f1954ad65d8b506f943a1c856f2b77d751e
-AUX openmotif-2.3.1-fix-grace-crash.patch 786 RMD160 a8f40c637680562e1c6095512d74f6ddc9c0abed SHA1 c126c3f1b61d8ac37add5bedae8c1043095d5cd2 SHA256 9caad200b6d8f771913dbe08cbd6ea0eca249e2a27ee8d373a851768e9a25b07
 AUX openmotif-2.3.1-multilist-stipple.patch 819 RMD160 756e0a20223b157f127197c74c5d71087a06c51f SHA1 c81c77fa9c47f463a851f3591ba9f370c4c7a347 SHA256 2ccc3b9292eb8a2f6eab49198ea54f51bc243d14b64b4bd07aea6712526dd828
 DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb
 DIST openmotif-2.3.0.tar.gz 5661471 RMD160 317c8d13d59c6fdd4a9f0e3b63000695f6677b6c SHA1 efb5f5fdc4cc43ef6065594f4ebe98953b7af15e SHA256 81d63e4145fab729621cba38bb0e88fccfbcbb5918473319e9b01a6fbe909544
 DIST openmotif-2.3.1-1.tar.gz 5937284 RMD160 e03422204b6077fa6556894f194236d40e92e42b SHA1 3245375f4bd8e2d2eb02c2636d5491e834d8bb1a SHA256 1f831a1a2feb63af3167e54eacc12856d8a38b9caf6342f30daf901a414a986e
-DIST openmotif-2.3.1.tar.gz 5932681 RMD160 8fe6f41a8b75636d9211d34cae96d47a7ed10ade SHA1 7132493712111e6846deda241137f28a957b5878 SHA256 46397a76e06dab0e31ffd2a9e2cf8f5ad408dc0f451f4e600889a8d5b0bae9a4
 EBUILD openmotif-2.3.0-r3.ebuild 4088 RMD160 43b3f3576e2febe253def1b3c0f344a36724d5de SHA1 ec15d89845471be1fa8a65afdd3467a493ef79d8 SHA256 2d5f3f1a304bf2c698040a3a379816c5c160800b8efb2c21d389d4980094af6c
-EBUILD openmotif-2.3.1-r1.ebuild 4423 RMD160 7bc2f8c19aac96fa46a7022216afe54f1adb156a SHA1 d642cc8fa7f7a8f1aa67322362b8a4b8d699d7bc SHA256 881e7f40749d0764b1789c2576a3557f42e25b67ad90fb29d411b2f4f0003ef8
 EBUILD openmotif-2.3.1.1.ebuild 4186 RMD160 ea7ad3bca45c8136d5ff943a6373a159e8ab137c SHA1 bf37acc6ad5e4df5f25fccabd787ae547a0e698d SHA256 7de784c0c82638cb17dd733c4efe28d83ff1e190486057e4cde0a68e3338beb6
-MISC ChangeLog 31627 RMD160 4ddb77b221cf425e37fd8456307a224a9d4ad1e4 SHA1 160b244b8271702b59d697985741a65c321387b8 SHA256 526a31b8d126355339153c114cffeefa4427739a326c5cbedd8f2a4a5cec6dfb
+MISC ChangeLog 31828 RMD160 cc947dee4808289b87571cb534b46495d95ff794 SHA1 92c562159267d526869674600c57f9312bbf738c SHA256 9d943f1bbaf20e328de17ff2152f7877d5ee45eddab708e65247c8f5e49ac589
 MISC metadata.xml 342 RMD160 68b69a8e56d517dc7d4d6ac2137365e2cf5c57e7 SHA1 f21a9441cc2e1f294f55af4ae6d3c9209f6028a5 SHA256 1c72c9d69d9f15d6692338b0b0108c38828d60465455174fc4af7b23d7f1585d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkkbV+MACgkQOeoy/oIi7uyKiQCguZblSilvRutefA6/Hp35i2+R
+G3kAoNs1EkaTcGrwv4UFHe1jyuOIAxZr
+=5QEi
+-----END PGP SIGNATURE-----
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
-}