Version bump.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r4 i686

4 files changed, 153 insertions, 8 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 61a82b2c4d07..fb9c62a388b0 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.187 2008/06/02 22:09:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.188 2008/06/27 11:17:37 ulm Exp $
+
+*openmotif-2.3.1 (27 Jun 2008)
+
+  27 Jun 2008; Ulrich Mueller <ulm@gentoo.org> +openmotif-2.3.1.ebuild:
+  Version bump.
 
   02 Jun 2008; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.0-r1.ebuild,
   openmotif-2.3.0-r3.ebuild:
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index c24503446451..c07a976e14e6 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -8,14 +8,16 @@ AUX openmotif-2.3.0-freebsd-libiconv.patch 406 RMD160 56845c5fd29d8cfe6495145742
 AUX openmotif-2.3.0-sensitivity-invisible.patch 6503 RMD160 98ddb9cc9e8c84e28a2d8802f4a389f42f5f9715 SHA1 1da82de91d748b6eaf04fa9d320181b7a27138ff SHA256 d55d756548b6c8e7892f2d597cb8ac4dcd78d5164602d5878be314ed6d6cdcb3
 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.tar.gz 5932681 RMD160 8fe6f41a8b75636d9211d34cae96d47a7ed10ade SHA1 7132493712111e6846deda241137f28a957b5878 SHA256 46397a76e06dab0e31ffd2a9e2cf8f5ad408dc0f451f4e600889a8d5b0bae9a4
 EBUILD openmotif-2.3.0-r1.ebuild 4045 RMD160 41a400b6dd19108de0baada221c4baeda25cdfd3 SHA1 0c5785ebebfc8e11712e1df98bed9023e29ecbc4 SHA256 678529158984a47a1ba3d08b316c27691ba13e27d33d4c9c192cb75c603a11af
-EBUILD openmotif-2.3.0-r3.ebuild 4107 RMD160 45b3ef0d4c5fde07c910fde9a1e62df396f8db80 SHA1 62c3348be590fa4283d0a01619056d27c88864ed SHA256 e7b4eb05c342006e9c11ede8b6dc911c6e47b58b63570d473a0d4ce2e1346feb
-MISC ChangeLog 28823 RMD160 4c38a180899b8ef53e61d9983f2d3e25a0a5b4d4 SHA1 941f1902194757249cb60d6055b338d0d4618dba SHA256 03847e9410791a8a3d16ce5db66935f61c44f7d16ff68851b92b37b660ce5eec
+EBUILD openmotif-2.3.0-r3.ebuild 4112 RMD160 5cdd48a8599f0a7b8d0d06837ecf680205aa2c5b SHA1 4367741c73f114119bc8c5f83248b6e79b0ac0fc SHA256 9cc66d7a86794c5553928b812c505fa242187e197cef03d62666a8d9b00ec8df
+EBUILD openmotif-2.3.1.ebuild 4012 RMD160 ba1563fc0cd8d4c4cd651705121223dfe58ff200 SHA1 c218d3df86ef062fa29c4296983707fd49b7b108 SHA256 2dabcd317b2d627a604cdfd51ae9e47a7427bd715c32fb0ec74b8c9a6ada3545
+MISC ChangeLog 28944 RMD160 092cec614f5df3ffc175f03e57679c5cac4450d2 SHA1 6ec2ce3408cc1a8445a0d1d553bc728d339f79e9 SHA256 eabc163db6717311ceded7bd29274c4980dbb574072f2d62f9518844a348fa59
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkhEb9MACgkQOeoy/oIi7uxn2QCfW55lFaNrM0wXQXtRVp46YUAK
-yiQAoL+wYrP9BXdSPf1axROmSr5Pwbso
-=EjTp
+iEYEARECAAYFAkhkzIIACgkQOeoy/oIi7uyQfQCgu4dokxXLSPry3SMQOYNPIvYo
+RuAAn1CiXGAUS/y6gKq9AGz/Nr5/GhYT
+=IwFj
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild b/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild
index cb626d3ce385..b0163e313ce1 100644
--- a/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild
@@ -1,12 +1,12 @@
 # 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.0-r3.ebuild,v 1.8 2008/06/02 22:09:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r3.ebuild,v 1.9 2008/06/27 11:17:37 ulm Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
 DESCRIPTION="Open Motif"
 HOMEPAGE="http://www.motifzone.org/"
-SRC_URI="ftp://ftp.ics.com/openmotif/2.3/${PV}/${P}.tar.gz
+SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/${P}.tar.gz
 	doc? ( http://www.motifzone.net/files/documents/${P}-manual.pdf.tgz )"
 
 LICENSE="MOTIF libXpm doc? ( OPL )"
diff --git a/x11-libs/openmotif/openmotif-2.3.1.ebuild b/x11-libs/openmotif/openmotif-2.3.1.ebuild
new file mode 100644
index 000000000000..a0512e4a09b1
--- /dev/null
+++ b/x11-libs/openmotif/openmotif-2.3.1.ebuild
@@ -0,0 +1,138 @@
+# 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.1 2008/06/27 11:17:37 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 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
+	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}"
+	epatch "${FILESDIR}/${PN}-2.3.0-freebsd-libiconv.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 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
+}