Install libraries and include files without slotting, bug 210021.

Package-Manager: portage-2.1.4.4

6 files changed, 239 insertions, 6 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 0127544e925d..f10ebd5b1031 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,15 @@
 # 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.150 2008/02/13 14:33:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.151 2008/02/14 10:09:57 ulm Exp $
+
+*openmotif-2.3.0-r1 (14 Feb 2008)
+
+  14 Feb 2008; Ulrich Mueller <ulm@gentoo.org> +files/motif-config-2.3,
+  +files/Mwm.defaults, openmotif-2.3.0.ebuild, +openmotif-2.3.0-r1.ebuild:
+  Install libraries and include files without slotting. Install application
+  defaults for Mwm and a stripped-down motif-config. Ebuild by Jakub Moc
+  <jakub@gentoo.org>, bug 210021. Remove demo binaries. Fix symlink for
+  system.mwmrc. Drop mips to unstable.
 
   13 Feb 2008; Raúl Porcel <armin76@gentoo.org> openmotif-2.3.0.ebuild:
   alpha/ia64/sparc stable wrt #204265
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 2567f7647b99..8056fee4c314 100644
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -1,4 +1,9 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX CAN-2005-0605.patch 1118 RMD160 56a1a4433bb71d54b6d5df33fab68aca74158730 SHA1 f9198a5629998790c2dfd112f71134f39f4b3e11 SHA256 20517fc5c4b61419528b658422fdcc9ed972762cffd605a844a4cfd1f628a331
+AUX Mwm.defaults 536 RMD160 99fc40c2e923b53a14b2911c37064f2c9cd3f63b SHA1 ddbe7ab7af3a8caf6ccb9d6ab2c721ce5940edd1 SHA256 5373d8c7bd5460ce83bda99f08725fe9154cd4b5ca2b0698e5a0fda10e50f250
+AUX motif-config-2.3 1522 RMD160 20835773f46a8ac434385b89764b713d13d06b5c SHA1 da8e1cc36d94fc3c3b54567d82ae35e83e13a02c SHA256 afb2e7b53f6a39b01b153985d12c4e674c6a2714219597b3b599f443242fdc76
 AUX openmotif-2.2.3-CAN-2004-0687-0688.patch 13114 RMD160 ff21f6f69e008737a445e974e2604b503cb4cbbd SHA1 37df674455734c730d7eae9db630fd8656420d2f SHA256 217db5425a1da21206fe6058f4a3ccf312870c0f7c90678b399f313edddf7545
 AUX openmotif-2.2.3-CAN-2004-0914_sec8.patch 491 RMD160 e48a0bf2c7576f9c641ad1f3ef013d4875e5c736 SHA1 7f4e9a65ed8b2a93baa36f3a6a798a6cb907db90 SHA256 6a2ea6dc149b31b77716fd23a32ea704e8f67a5287a8ef8e8c55624986193236
 AUX openmotif-2.2.3-XmResizeHashTable.patch 183 RMD160 19df6e6eed3b9a90797b38852f43e4e1b244be99 SHA1 20862472fccad7aaa068ffe5be9361ee3a13542e SHA256 23a4d23b21b81aa5eba5da8d999073e87636e60d493ec42f2cae96929dcd9b33
@@ -15,6 +20,14 @@ DIST openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986 RMD160 f04ccc46b82782d5
 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
 EBUILD openmotif-2.2.3-r9.ebuild 3665 RMD160 ff360947f706ae39ef3324a839427c9763700621 SHA1 5135beaf45008d74e937dbc133e3cd5a279fcfd3 SHA256 39e9f2336b0a0469108757436a5bd6dcc88cd0f28912009b75831f84c3a14b1a
-EBUILD openmotif-2.3.0.ebuild 3249 RMD160 99fdbbbeee7116a62f88fd6a80cd349a538a25f5 SHA1 499b78c78ee6f5e87aaea2975e3fd64403c23a8b SHA256 726765f16cbf78d9d501145f0ce8dea2a26c62208b391331f9602275902a1c0a
-MISC ChangeLog 23278 RMD160 e9c1f7b577be58322f138421992f063d0eac1705 SHA1 c4ed0f4b22eca6410fa77f53719f1211eb517078 SHA256 8a2a9f64f9995cbc0fb368fce3e28f2df5a72981710fd20980af263fc34e18cf
+EBUILD openmotif-2.3.0-r1.ebuild 2882 RMD160 37f302673f38eb697569cd007444bd1a23280556 SHA1 098e53f81c176484fa0f61e72047bea156122f79 SHA256 33a8a7788077c2112ae345f95f6151de5de306ea6086c395a382ae639b0f0666
+EBUILD openmotif-2.3.0.ebuild 3244 RMD160 b35036e0e2a6466813056537feb10f2872bdc342 SHA1 7e15bcf6e186f93c2a12cb8b4be59f5e4a78c909 SHA256 be71f3b21b980441ba83117b3f31604b702c76bd3c58bbcec0d44a6335cfea8a
+MISC ChangeLog 23717 RMD160 fde5d5bb0af0742dc871599599cfb31a32e4e135 SHA1 66d4c393c1031803e31e2a59f76a0f13fb295ebe SHA256 b5a8a184696617571b1bcbca5eb3da4e85ff76420b4a038c91185ff41e796d3d
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.8 (GNU/Linux)
+
+iEYEARECAAYFAke0E5gACgkQOeoy/oIi7uxBxACeK9cGJ1+oyp9misUaIu5fPZnU
+E8YAoL757GZdMIEHs+nPgOivRqwzgxRC
+=x7dp
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/files/Mwm.defaults b/x11-libs/openmotif/files/Mwm.defaults
new file mode 100644
index 000000000000..ea91b6fb8d86
--- /dev/null
+++ b/x11-libs/openmotif/files/Mwm.defaults
@@ -0,0 +1,14 @@
+Mwm*fontList:			variable
+Mwm*iconClick:			False
+Mwm*iconPlacement:		top left
+Mwm*moveOpaque:			True
+Mwm*rootButtonClick:		True
+Mwm*foreground:			#000000
+Mwm*background:			#B8B8C0
+Mwm*enableThinThickness:	True
+Mwm*enableEtchedInMenu:		True
+Mwm*menu*fontList:		-adobe-helvetica-medium-r-*--*-120-*-*-*-*-*-*
+Mwm*client*title*fontList:	-adobe-helvetica-bold-r-*--*-100-*-*-*-*-*-*
+Mwm*icon*fontList:		-adobe-helvetica-bold-r-*--*-80-*-*-*-*-*-*
+Mwm*feedback*fontList:		-adobe-helvetica-bold-r-*--*-100-*-*-*-*-*-*
+Mwm*multiClickTime:		300
diff --git a/x11-libs/openmotif/files/motif-config-2.3 b/x11-libs/openmotif/files/motif-config-2.3
new file mode 100644
index 000000000000..fe225e7c77bb
--- /dev/null
+++ b/x11-libs/openmotif/files/motif-config-2.3
@@ -0,0 +1,91 @@
+#!/bin/bash
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# based on gcc-config by Martin Schlemmer <azarah@gentoo.org
+# Author:  Heinrich Wendel <lanius@gentoo.org>
+
+# Stripped down minimal version for backwards compatibility only.
+# We now just provide the info that other applications might use
+# to compile and link against openmotif - Jakub Moc <jakub@gentoo.org>
+
+usage() {
+cat << "USAGE_END"
+Usage: motif-config [option]
+
+Options:
+
+  -L, --get-lib-path         Print path where openmotif libraries are located.
+
+  -I, --get-inc-path         Print path where openmotif includes are located.
+
+      --libs                 Print link flags for openmotif
+
+      --cflags               Print compilation flags for openmotif
+
+USAGE_END
+    exit $1
+}
+[[ $# -lt 1 ]] && usage 1
+[[ $# -gt 2 ]] && usage 1
+
+get_lib_path() {
+	echo "/usr/@@LIBDIR@@/"
+	exit 0
+}
+
+get_inc_path() {
+	echo "/usr/include/"
+	exit 0
+}
+
+get_cflags() {
+	echo "-I/usr/include/"
+	exit 0
+}
+
+get_libs() {
+	echo "-L/usr/@@LIBDIR@@/"
+	exit 0
+}
+
+for x in "$@"; do
+	case "${x}" in
+		-L|--get-lib-path)
+			[[ $# -gt 2 ]] && usage 1
+			get_lib_path $2
+		;;
+
+		-I|--get-inc-path)
+			[[ $# -gt 2 ]] && usage 1
+			get_inc_path $2
+		;;
+
+		--cflags)
+			[[ $# -gt 2 ]] && usage 1
+			get_cflags $2
+		;;
+
+		--libs)
+			[[ $# -gt 2 ]] && usage 1
+			get_libs $2
+		;;
+
+		-h|--help)
+			usage 0
+		;;
+
+		-v|--version)
+			echo "motif-config-2.3"
+			exit 0
+		;;
+
+		-*)
+			usage 1
+		;;
+
+		*)
+			usage 1
+		;;
+
+	esac
+done
diff --git a/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild b/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..4ed399667b1b
--- /dev/null
+++ b/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild
@@ -0,0 +1,106 @@
+# 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-r1.ebuild,v 1.1 2008/02/14 10:09:57 ulm Exp $
+
+inherit 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
+	doc? ( http://www.motifzone.net/files/documents/${P}-manual.pdf.tgz )"
+
+LICENSE="MOTIF"
+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/libXaw
+	x11-libs/libXp
+	xft? ( x11-libs/libXft )
+	jpeg? ( media-libs/jpeg )
+	png? ( media-libs/libpng )"
+DEPEND="${RDEPEND}
+	x11-misc/xbitmaps
+	x11-proto/printproto"
+
+PROVIDE="virtual/motif"
+
+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"
+}
+
+pkg_preinst() {
+	# clean up orphaned cruft left over by motif-config
+	local i
+	local stalesyms="usr/bin/mwm \
+				usr/bin/uil \
+				usr/bin/xmbind \
+				usr/include/Xm \
+				usr/include/uil \
+				usr/include/Mrm"
+
+	for i in ${stalesyms} ; do
+		if [[ -L "${ROOT}"${i} ]] ; then
+			einfo "Cleaning up orphaned ${ROOT}${i} symlink ..."
+			rm -f "${ROOT}"${i}
+		fi
+	done
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
+
+	newbin "${FILESDIR}"/motif-config-2.3 motif-config
+	dosed "s:@@LIBDIR@@:$(get_libdir):g" /usr/bin/motif-config
+
+	# mwm default configs
+	insinto /etc/X11/app-defaults
+	doins "${FILESDIR}"/Mwm.defaults
+
+	for f in /usr/share/man/man1/mwm.1 /usr/share/man/man4/mwmrc.4; do
+		dosed 's:/usr/lib/X11/\(.*system\\&\.mwmrc\):/etc/X11/mwm/\1:g' ${f}
+		dosed 's:/usr/lib/X11/app-defaults:/etc/X11/app-defaults:g' ${f}
+	done
+
+	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/
+
+	# cleanup
+	einfo "Removing demo applications ..."
+	find "${D}"/usr/bin/ -type f ! -name motif-config ! -name mwm \
+		! -name uil ! -name xmbind | xargs rm -f
+
+	if use examples ; then
+		dodir /usr/share/doc/${PF}/demos
+		mv "${D}"/usr/share/Xm/* "${D}"/usr/share/doc/${PF}/demos
+	fi
+	rm -rf "${D}"/usr/share/Xm
+
+	# documentation
+	dodoc README RELEASE RELNOTES BUGREPORT TODO
+	use doc && cp "${WORKDIR}"/*.pdf "${D}"/usr/share/doc/${PF}
+}
diff --git a/x11-libs/openmotif/openmotif-2.3.0.ebuild b/x11-libs/openmotif/openmotif-2.3.0.ebuild
index 442f20a34d47..f7c645fcc751 100644
--- a/x11-libs/openmotif/openmotif-2.3.0.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.0.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.13 2008/02/13 14:33:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild,v 1.14 2008/02/14 10:09:57 ulm Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.6"
@@ -13,8 +13,8 @@ SRC_URI="ftp://ftp.ics.com/openmotif/2.3/${PV}/${P}.tar.gz
 	doc? ( http://www.motifzone.net/files/documents/${P}-manual.pdf.tgz )"
 
 LICENSE="MOTIF"
-SLOT="2.3"
-KEYWORDS="alpha ~amd64 ~arm hppa ia64 mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="doc xft jpeg png examples"
 
 RDEPEND="