Version bump. Fix DEPEND and RDEPEND.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

4 files changed, 183 insertions, 15 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index c4f16a0889da..e2742339f50a 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.229 2010/03/14 15:25:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.230 2010/03/19 00:25:59 ulm Exp $
+
+*openmotif-2.3.3 (18 Mar 2010)
+
+  18 Mar 2010; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.2-r2.ebuild,
+  +openmotif-2.3.3.ebuild:
+  Version bump. Fix DEPEND and RDEPEND.
 
   14 Mar 2010; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.2-r2.ebuild:
   Fix workaround for LANG, bug 15119.
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 7119919e0e56..45af7ff1ea9a 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -11,14 +11,16 @@ AUX openmotif-2.3.2-sanitise-paths.patch 734 RMD160 de091a0b8d232fc4507c9fc3b380
 AUX openmotif-2.3.2-solaris-2.11.patch 409 RMD160 78e04d1ea6985b663423058754b6d05fdacdf88d SHA1 dc19563eada1094f921d69d0415cdf643697e0a5 SHA256 cfd6f6dde2edd3907b3dc712d2df2096478b20ca4d4dc523b45058c50656a0b7
 DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb
 DIST openmotif-2.3.2.tar.gz 5941784 RMD160 2346a93fcec57b9c18b6657d1cc681b6001cba28 SHA1 c98ac1bf3640ce57da34a0704bdeb2b12011ae1f SHA256 f786f3724d33133e8c4b3c9b368c89d680e981ca1c0e8c3280f496976b390c7d
-EBUILD openmotif-2.3.2-r2.ebuild 5237 RMD160 02171763642fcf1bf82b4b3e55905b53a3082e21 SHA1 fed06ca9bab17afdaa818e04469b48f9c396408e SHA256 0c1497e848fe3ce26aa45196782162bcafc0e099e7e1f657110c4ac84088e0c3
+DIST openmotif-2.3.3.tar.gz 6051202 RMD160 015323e212e91ea3beaf039593de5ba75b01e4a6 SHA1 2a51e2f28078c4db7ff0c8517eb257001716b699 SHA256 c85f5545e218fa0c59a3789192132d472fc5a33e914a221a568eee4fc10cd103
+EBUILD openmotif-2.3.2-r2.ebuild 5158 RMD160 8caa8463db5e72629465026add4077c80cc1300e SHA1 801034c12573996e6cb6d6740e32258bc90d6c31 SHA256 c89af559a0fadf869b2a7f6cd43c275f041b3843e8f25fae6256af47228f248a
 EBUILD openmotif-2.3.2.ebuild 4084 RMD160 7bb056c12a1856bd954b1bc614c812745dd8e4d9 SHA1 c4f85b4050c4bfea88ba4c0f5df156cb94848ad2 SHA256 f6aa28e3b4bb6104ad52d0d487b0083c96f1a871c3603c125b31d1a0f5562f0e
-MISC ChangeLog 34749 RMD160 5529107fcd59e892a1124ce5eb692746ed9dbda1 SHA1 26dacfcda6a340e0778164e9a847ef5aa08241dd SHA256 191231c2bb62aea4e30836485fbd34e20573e637b103c5f64ae806e4183f070b
+EBUILD openmotif-2.3.3.ebuild 4851 RMD160 7f994f7f8763d10212bb83bfd87f3e6b5d84a0d1 SHA1 b0a75af4b5f1fea06bbf99e5e6a8b2297e59c202 SHA256 e5ae98b248256ebe77adb8c3ddc2876d892d71a5ab4e1abff307651a38007c49
+MISC ChangeLog 34923 RMD160 747898234aa3dc9162ebd3918d64eb96903926d8 SHA1 fcc211aa18e0f5e8482e467f804b001b3974f5f7 SHA256 45c799f7a3928a033fecb9c37db8c69cd65049c067e70050cfb7d2c286d10a87
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkudACAACgkQOeoy/oIi7uw1IACfTH4kRo8wCnQa+m3Ab3kynuTD
-kVsAoKvXopGoEGHs8kGN+QstQuh4WDJ4
-=Mfdl
+iEYEARECAAYFAkuixMYACgkQOeoy/oIi7uwmsgCeMUFuUmIoki024I+4+k2OShRJ
+QVgAnjrkNFSp2mbXOYfKjfGiKl0vQFlx
+=Xwj4
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild b/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
index 2fed5e7fa2ee..1c790b2e06ec 100644
--- a/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.6 2010/03/14 15:25:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.2-r2.ebuild,v 1.7 2010/03/19 00:25:59 ulm Exp $
 
 EAPI=3
 
@@ -22,22 +22,20 @@ RESTRICT="!kernel_linux? (
 		fetch bindist
 	) ) ) )"
 
-# 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
+RDEPEND="x11-libs/libXmu
 	x11-libs/libXp
-	doc? ( app-doc/openmotif-manual )
 	unicode? ( virtual/libiconv )
 	xft? ( x11-libs/libXft )
 	jpeg? ( media-libs/jpeg )
 	png? ( media-libs/libpng )"
-
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	x11-misc/xbitmaps"
+RDEPEND="${RDEPEND}
+	!x11-libs/motif-config
+	!x11-libs/lesstif
+	!<=x11-libs/openmotif-2.3.0
+	doc? ( app-doc/openmotif-manual )"
 
 pkg_nofetch() {
 	local line
diff --git a/x11-libs/openmotif/openmotif-2.3.3.ebuild b/x11-libs/openmotif/openmotif-2.3.3.ebuild
new file mode 100644
index 000000000000..64916e98827a
--- /dev/null
+++ b/x11-libs/openmotif/openmotif-2.3.3.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.3.ebuild,v 1.1 2010/03/19 00:25:59 ulm Exp $
+
+EAPI=3
+
+inherit autotools eutils flag-o-matic multilib
+
+DESCRIPTION="Open Motif"
+HOMEPAGE="http://www.motifzone.net/"
+SRC_URI="ftp://ftp.ics.com/openmotif/${PV%.*}/${PV}/${P}.tar.gz"
+
+LICENSE="MOTIF MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc examples jpeg png unicode xft"
+# license allows distribution only for "open source operating systems"
+RESTRICT="!kernel_linux? (
+	!kernel_FreeBSD? (
+	!kernel_Darwin? (
+	!kernel_SunOS? (
+		fetch bindist
+	) ) ) )"
+
+RDEPEND="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"
+RDEPEND="${RDEPEND}
+	!x11-libs/motif-config
+	!x11-libs/lesstif
+	!<=x11-libs/openmotif-2.3.0
+	doc? ( app-doc/openmotif-manual )"
+
+pkg_nofetch() {
+	local line
+	while read line; do einfo "${line}"; done <<-EOF
+	From the Open Motif license: "This software is subject to an open
+	license. It may only be used on, with or for operating systems which
+	are themselves open source systems. You must contact The Open Group
+	for a license allowing distribution and sublicensing of this software
+	on, with, or for operating systems which are not open source programs."
+
+	If you have got such a license, you may download the file:
+	${SRC_URI}
+	and place it in ${DISTDIR}.
+	EOF
+}
+
+pkg_setup() {
+	# clean up orphaned cruft left over by motif-config
+	local i l count=0
+	for i in "${EROOT}"/usr/bin/{mwm,uil,xmbind} \
+		"${EROOT}"/usr/include/{Xm,uil,Mrm} \
+		"${EROOT}"/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 "${EROOT}"/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 ${EROOT}/usr/share/man"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.3.2-sanitise-paths.patch"
+	epatch "${FILESDIR}/${PN}-2.3.2-libpng14.patch"
+	[[ ${CHOST} == *-solaris2.11 ]] \
+		&& epatch "${FILESDIR}/${PN}-2.3.2-solaris-2.11.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_configure() {
+	# get around some LANG problems in make (#15119)
+	LANG=C
+
+	# 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
+
+	# For Solaris Xos_r.h :(
+	[[ ${CHOST} == *-solaris2.11 ]] && append-flags -DNEED_XOS_R_H=1
+
+	if use !elibc_glibc && use !elibc_uclibc && use unicode; then
+		# libiconv detection in configure script doesn't always work
+		# http://bugs.motifzone.net/show_bug.cgi?id=1423
+		export LIBS="${LIBS} -liconv"
+	fi
+
+	econf --with-x \
+		$(use_enable unicode utf8) \
+		$(use_enable xft) \
+		$(use_enable jpeg) \
+		$(use_enable png)
+}
+
+src_compile() {
+	emake -j1 MWMRCDIR=/etc/X11/mwm || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" MWMRCDIR=/etc/X11/mwm install \
+		|| die "emake install failed"
+
+	# mwm default configs
+	insinto /usr/share/X11/app-defaults
+	newins "${FILESDIR}"/Mwm.defaults Mwm
+
+	if use examples; then
+		emake -j1 -C demos DESTDIR="${D}" install-data \
+			|| die "installation of demos failed"
+		dodir /usr/share/doc/${PF}/demos
+		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos
+	fi
+	rm -rf "${ED}"/usr/share/Xm
+
+	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
+}
+
+pkg_postinst() {
+	local line
+	while read line; do elog "${line}"; done <<-EOF
+	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
+}