Version bump, bug 239480.

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

3 files changed, 163 insertions, 2 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index ae7a7be1e46f..94298f90459b 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.201 2008/08/26 00:42:47 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.202 2008/10/05 15:18:15 ulm Exp $
+
+*openmotif-2.3.1.1 (05 Oct 2008)
+
+  05 Oct 2008; Ulrich Mueller <ulm@gentoo.org> +openmotif-2.3.1.1.ebuild:
+  Version bump, bug 239480.
 
   26 Aug 2008; Jeroen Roovers <jer@gentoo.org> openmotif-2.3.1-r1.ebuild:
   Stable for HPPA (bug #235459).
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 95bfbf4c1e85..5d4943ebc8ab 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX Mwm.defaults 536 RMD160 99fc40c2e923b53a14b2911c37064f2c9cd3f63b SHA1 ddbe7ab7af3a8caf6ccb9d6ab2c721ce5940edd1 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250
 AUX motif-config-2.3 1181 RMD160 66b0f8eafe0726eda72bb9776ccff38c984a2a2b SHA1 adb4781789521d74c1c004d5b964e97f57a712f7 SHA256 72257c9682c26e59bd9e3c036fc622bd108920d5ec9b72120426d988f08b6bfd
 AUX openmotif-2.3.0-fix-nedit-segfaults.patch 926 RMD160 c6ddd15bee038509cc7e18098f209ac6c14f8e48 SHA1 c87b69cb24d3004bd146cd1e8645c72956fcfbdc SHA256 8aeb1daed4862393c7dc10df469d43e2a98154d18c7a0c3e65ca2750a412072c
@@ -8,9 +11,18 @@ AUX openmotif-2.3.1-fix-grace-crash.patch 786 RMD160 a8f40c637680562e1c6095512d7
 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-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 4423 RMD160 7bc2f8c19aac96fa46a7022216afe54f1adb156a SHA1 d642cc8fa7f7a8f1aa67322362b8a4b8d699d7bc SHA256 881e7f40749d0764b1789c2576a3557f42e25b67ad90fb29d411b2f4f0003ef8
-MISC ChangeLog 30712 RMD160 51fe4f0c81d795f8acfa2bd786ad83920e551ac4 SHA1 b6a4303fb2c10afceaa19220423c17cdb7adf5c5 SHA256 2f105e4d957c24b11d03249f383877cff1019cb4d34d1dea02a7c14f36d720d4
+EBUILD openmotif-2.3.1.1.ebuild 4193 RMD160 8a60f6c0e99502810d46cbcf80d6e3aa4102fce4 SHA1 58a530c44aefd9a7b99924481513c5c4aea77413 SHA256 dec82274fe62e102347b1c19a230ca4e3b1be8ab2b0b9c400a153046b7b9cc9b
+MISC ChangeLog 30849 RMD160 fc89d0d7e679897bf741b2e539c2200ce2ee02b7 SHA1 287736147432f3656a8dbae338efd588262f9dcb SHA256 cfb8d1a315b392e8446c04751c5afb9b74cf5f3a8af81c0a8dce25373b7da858
 MISC metadata.xml 342 RMD160 68b69a8e56d517dc7d4d6ac2137365e2cf5c57e7 SHA1 f21a9441cc2e1f294f55af4ae6d3c9209f6028a5 SHA256 1c72c9d69d9f15d6692338b0b0108c38828d60465455174fc4af7b23d7f1585d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkjo2swACgkQOeoy/oIi7ux4DgCfYweiYVsstt3V2ko7IYOFnzAf
+lfEAoKJOnCs4QR1SElEq9HNc+tp577o+
+=NNgB
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/openmotif-2.3.1.1.ebuild b/x11-libs/openmotif/openmotif-2.3.1.1.ebuild
new file mode 100644
index 000000000000..ffc1610bca25
--- /dev/null
+++ b/x11-libs/openmotif/openmotif-2.3.1.1.ebuild
@@ -0,0 +1,144 @@
+# 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.1.ebuild,v 1.1 2008/10/05 15:18:15 ulm Exp $
+
+inherit autotools eutils flag-o-matic multilib versionator
+
+MY_PV=$(get_version_component_range 1-3)
+MY_P=${PN}-${MY_PV}
+SRC_P=${PN}-$(replace_version_separator 3 "-")
+DOC_P=${PN}-2.3.0
+
+DESCRIPTION="Open Motif"
+HOMEPAGE="http://www.motifzone.org/"
+SRC_URI="ftp://ftp.ics.com/openmotif/${MY_PV%.*}/${MY_PV}/${SRC_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"
+
+S="${WORKDIR}/${MY_P}"
+
+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}"
+
+	# display stippled multilist items correctly, bug 215984
+	epatch "${FILESDIR}/${MY_P}-multilist-stipple.patch"
+
+	# disable compilation of demo binaries
+	sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
+
+	# 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 BUGREPORT ChangeLog README RELEASE RELNOTES 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
+}