Remove intermediate version.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.25-gentoo-r6 i686

3 files changed, 8 insertions, 150 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index b105619b7735..e0bfb6d64158 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,9 @@
 # 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.193 2008/07/26 12:58:21 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.194 2008/08/04 06:42:48 ulm Exp $
+
+  04 Aug 2008; Ulrich Mueller <ulm@gentoo.org> -openmotif-2.3.1.ebuild:
+  Remove intermediate version.
 
 *openmotif-2.3.1-r1 (25 Jul 2008)
 
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index ce7c78750490..c8a00290003c 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -15,13 +15,12 @@ DIST openmotif-2.3.1.tar.gz 5932681 RMD160 8fe6f41a8b75636d9211d34cae96d47a7ed10
 EBUILD openmotif-2.3.0-r1.ebuild 4020 RMD160 504ac420272d842a9dacd10f2d827e19acff12d1 SHA1 3b81957cfb8cd8e70a6d218106d07cb71f46c379 SHA256 34ceb5f16e7373ff7c66f4ecfa918feb44299165a2eca4209878d6ad3eeb3bab
 EBUILD openmotif-2.3.0-r3.ebuild 4088 RMD160 43b3f3576e2febe253def1b3c0f344a36724d5de SHA1 ec15d89845471be1fa8a65afdd3467a493ef79d8 SHA256 2d5f3f1a304bf2c698040a3a379816c5c160800b8efb2c21d389d4980094af6c
 EBUILD openmotif-2.3.1-r1.ebuild 4431 RMD160 bee23be28cfa81d6cffa232a4cdab15fccc86645 SHA1 a1cd21b2cdae07692bf4ce7028b1c107ff379eb5 SHA256 d07e2eaf8b16bea9024f17f9d3cec0199418c75ea5c076d0240ae525853559fa
-EBUILD openmotif-2.3.1.ebuild 4214 RMD160 ecaff6d3b934e29c891f034036018f8b3894a8a2 SHA1 5513e81ea1d5eef202890ae21962b581bb1b9982 SHA256 c708e233e8dd3b768a5f4bdd700f7b421b0c4c26515149c4a43001ef848e3d0d
-MISC ChangeLog 29845 RMD160 dade8a07527c8f507022c8b0525091912d46c6e3 SHA1 b5252f13dce2fbe09c154e400606aadd8b92073a SHA256 99478eff00aa08f1b6539e89c82be481f36b5d25b86cc086a1e63c40cc0eb022
+MISC ChangeLog 29949 RMD160 c0004932d65ded1562ba25115d43e14bb6d2cc2f SHA1 f9e68e4419bce20ebcfa023083b4db3198a9ef4b SHA256 fc598dc48ae0f22e1aa2194c318d72e2f0ee80960e52c7bd87e689658d12c20c
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkiLH30ACgkQOeoy/oIi7uzoigCgwFcO8Yq02eQ5lVbv6VkSsn5a
-xykAoIKabT9qBOeOzoxFnkOvoAsah6kp
-=eTAi
+iEYEARECAAYFAkiWpPoACgkQOeoy/oIi7uySLwCg1ZJsthCFVcs8iiDxPzKhZ8CC
+mV4AmgLkA/GQsiWJDr9HfdlbyvB23LVZ
+=Nwqa
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/openmotif-2.3.1.ebuild b/x11-libs/openmotif/openmotif-2.3.1.ebuild
deleted file mode 100644
index 2099dcd495cb..000000000000
--- a/x11-libs/openmotif/openmotif-2.3.1.ebuild
+++ /dev/null
@@ -1,144 +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.ebuild,v 1.3 2008/07/01 19:30:39 ulm 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"
-
-	# 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
-}