diff options
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/openmotif/ChangeLog | 8 | ||||
| -rw-r--r-- | x11-libs/openmotif/openmotif-2.3.2-r2.ebuild | 16 | ||||
| -rw-r--r-- | x11-libs/openmotif/openmotif-2.3.3.ebuild | 162 |
3 files changed, 176 insertions, 10 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/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 +} |