public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in x11-libs/openmotif: ChangeLog openmotif-2.3.0.ebuild openmotif-2.3.0-r1.ebuild
@ 2008-02-14 10:09 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Mueller (ulm) @ 2008-02-14 10:09 UTC (permalink / raw
  To: gentoo-commits

ulm         08/02/14 10:09:57

  Modified:             ChangeLog openmotif-2.3.0.ebuild
  Added:                openmotif-2.3.0-r1.ebuild
  Log:
  Install libraries and include files without slotting, bug 210021.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.151                x11-libs/openmotif/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.151&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.151&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?r1=1.150&r2=1.151

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- ChangeLog	13 Feb 2008 14:33:22 -0000	1.150
+++ ChangeLog	14 Feb 2008 10:09:57 -0000	1.151
@@ -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



1.14                 x11-libs/openmotif/openmotif-2.3.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild?r1=1.13&r2=1.14

Index: openmotif-2.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- openmotif-2.3.0.ebuild	13 Feb 2008 14:33:22 -0000	1.13
+++ openmotif-2.3.0.ebuild	14 Feb 2008 10:09:57 -0000	1.14
@@ -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 @@
 	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="



1.1                  x11-libs/openmotif/openmotif-2.3.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: openmotif-2.3.0-r1.ebuild
===================================================================
# 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}
}



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in x11-libs/openmotif: ChangeLog openmotif-2.3.0.ebuild openmotif-2.3.0-r1.ebuild
@ 2008-02-14 11:44 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Mueller (ulm) @ 2008-02-14 11:44 UTC (permalink / raw
  To: gentoo-commits

ulm         08/02/14 11:44:29

  Modified:             ChangeLog openmotif-2.3.0.ebuild
                        openmotif-2.3.0-r1.ebuild
  Log:
  Don't compile demo binaries. Add OPL licence.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.152                x11-libs/openmotif/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.152&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.152&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?r1=1.151&r2=1.152

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- ChangeLog	14 Feb 2008 10:09:57 -0000	1.151
+++ ChangeLog	14 Feb 2008 11:44:29 -0000	1.152
@@ -1,6 +1,6 @@
 # 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.151 2008/02/14 10:09:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.152 2008/02/14 11:44:29 ulm Exp $
 
 *openmotif-2.3.0-r1 (14 Feb 2008)
 
@@ -8,8 +8,8 @@
   +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.
+  <jakub@gentoo.org>, bug 210021. Don't compile demo binaries. Fix symlink for
+  system.mwmrc. Drop mips to unstable. Add missing OPL licence.
 
   13 Feb 2008; Raúl Porcel <armin76@gentoo.org> openmotif-2.3.0.ebuild:
   alpha/ia64/sparc stable wrt #204265



1.15                 x11-libs/openmotif/openmotif-2.3.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild?r1=1.14&r2=1.15

Index: openmotif-2.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- openmotif-2.3.0.ebuild	14 Feb 2008 10:09:57 -0000	1.14
+++ openmotif-2.3.0.ebuild	14 Feb 2008 11:44:29 -0000	1.15
@@ -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.14 2008/02/14 10:09:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild,v 1.15 2008/02/14 11:44:29 ulm Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.6"
@@ -12,7 +12,7 @@
 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"
+LICENSE="MOTIF doc? ( OPL )"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ~arm hppa ia64 ~mips ~ppc ppc64 ~sh sparc x86 ~x86-fbsd"
 IUSE="doc xft jpeg png examples"



1.2                  x11-libs/openmotif/openmotif-2.3.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild?r1=1.1&r2=1.2

Index: openmotif-2.3.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openmotif-2.3.0-r1.ebuild	14 Feb 2008 10:09:57 -0000	1.1
+++ openmotif-2.3.0-r1.ebuild	14 Feb 2008 11:44:29 -0000	1.2
@@ -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-r1.ebuild,v 1.1 2008/02/14 10:09:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild,v 1.2 2008/02/14 11:44:29 ulm Exp $
 
 inherit flag-o-matic multilib autotools
 
@@ -9,7 +9,7 @@
 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"
+LICENSE="MOTIF doc? ( OPL )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="doc examples jpeg png xft"
@@ -31,6 +31,14 @@
 
 PROVIDE="virtual/motif"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# disable compilation of demo binaries
+	sed -i -e 's/^[ \t]*demos//' Makefile.in
+}
+
 src_compile() {
 	# get around some LANG problems in make (#15119)
 	unset LANG
@@ -89,11 +97,6 @@
 	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



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in x11-libs/openmotif: ChangeLog openmotif-2.3.0.ebuild openmotif-2.3.0-r1.ebuild
@ 2008-02-14 17:41 Ulrich Mueller (ulm)
  0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Mueller (ulm) @ 2008-02-14 17:41 UTC (permalink / raw
  To: gentoo-commits

ulm         08/02/14 17:41:41

  Modified:             ChangeLog openmotif-2.3.0.ebuild
                        openmotif-2.3.0-r1.ebuild
  Log:
  Also remove stale symlinks for libraries and man pages.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.153                x11-libs/openmotif/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.153&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?rev=1.153&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/ChangeLog?r1=1.152&r2=1.153

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- ChangeLog	14 Feb 2008 11:44:29 -0000	1.152
+++ ChangeLog	14 Feb 2008 17:41:41 -0000	1.153
@@ -1,6 +1,10 @@
 # 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.152 2008/02/14 11:44:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.153 2008/02/14 17:41:41 ulm Exp $
+
+  14 Feb 2008; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.0.ebuild,
+  openmotif-2.3.0-r1.ebuild:
+  Also remove stale symlinks for libraries and man pages.
 
 *openmotif-2.3.0-r1 (14 Feb 2008)
 



1.16                 x11-libs/openmotif/openmotif-2.3.0.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild?r1=1.15&r2=1.16

Index: openmotif-2.3.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openmotif-2.3.0.ebuild	14 Feb 2008 11:44:29 -0000	1.15
+++ openmotif-2.3.0.ebuild	14 Feb 2008 17:41:41 -0000	1.16
@@ -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.15 2008/02/14 11:44:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0.ebuild,v 1.16 2008/02/14 17:41:41 ulm Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.6"
@@ -69,18 +69,18 @@
 	done
 
 	einfo "Fixing binaries"
-	dodir /usr/$(get_libdir)/openmotif-${SLOT}
+	dodir /usr/$(get_libdir)/openmotif-2.3
 	for file in `ls "${D}"/usr/bin`
 	do
-		mv "${D}"/usr/bin/${file} "${D}"/usr/$(get_libdir)/openmotif-${SLOT}/${file}
+		mv "${D}"/usr/bin/${file} "${D}"/usr/$(get_libdir)/openmotif-2.3/${file}
 	done
 
 	einfo "Fixing libraries"
-	mv "${D}"/usr/$(get_libdir)/* "${D}"/usr/$(get_libdir)/openmotif-${SLOT}/
+	mv "${D}"/usr/$(get_libdir)/* "${D}"/usr/$(get_libdir)/openmotif-2.3/
 
 	einfo "Fixing includes"
-	dodir /usr/include/openmotif-${SLOT}/
-	mv "${D}"/usr/include/* "${D}"/usr/include/openmotif-${SLOT}
+	dodir /usr/include/openmotif-2.3/
+	mv "${D}"/usr/include/* "${D}"/usr/include/openmotif-2.3
 
 	einfo "Fixing man pages"
 	mans="1 3 4 5"
@@ -89,7 +89,7 @@
 		for file in `ls "${D}"/usr/share/man/man${man}`
 		do
 			file=${file/.${man}/}
-			mv "${D}"/usr/share/man/man$man/${file}.${man} "${D}"/usr/share/man/man${man}/${file}-openmotif-${SLOT}.${man}
+			mv "${D}"/usr/share/man/man$man/${file}.${man} "${D}"/usr/share/man/man${man}/${file}-openmotif-2.3.${man}
 		done
 	done
 
@@ -108,9 +108,9 @@
 
 	# profile stuff
 	dodir /etc/env.d
-	echo "LDPATH=/usr/$(get_libdir)/openmotif-${SLOT}" > "${D}"/etc/env.d/15openmotif-${SLOT}
+	echo "LDPATH=/usr/$(get_libdir)/openmotif-2.3" > "${D}"/etc/env.d/15openmotif-2.3
 	dodir /usr/$(get_libdir)/motif
-	echo "PROFILE=openmotif-${SLOT}" > "${D}"/usr/$(get_libdir)/motif/openmotif-${SLOT}
+	echo "PROFILE=openmotif-2.3" > "${D}"/usr/$(get_libdir)/motif/openmotif-2.3
 }
 
 pkg_postinst() {



1.3                  x11-libs/openmotif/openmotif-2.3.0-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild?r1=1.2&r2=1.3

Index: openmotif-2.3.0-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openmotif-2.3.0-r1.ebuild	14 Feb 2008 11:44:29 -0000	1.2
+++ openmotif-2.3.0-r1.ebuild	14 Feb 2008 17:41:41 -0000	1.3
@@ -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-r1.ebuild,v 1.2 2008/02/14 11:44:29 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild,v 1.3 2008/02/14 17:41:41 ulm Exp $
 
 inherit flag-o-matic multilib autotools
 
@@ -62,7 +62,7 @@
 
 pkg_preinst() {
 	# clean up orphaned cruft left over by motif-config
-	local i
+	local i count=0
 	local stalesyms="usr/bin/mwm \
 				usr/bin/uil \
 				usr/bin/xmbind \
@@ -76,6 +76,23 @@
 			rm -f "${ROOT}"${i}
 		fi
 	done
+
+	for i in "${ROOT}"usr/$(get_libdir)/lib{Xm,Uil,Mrm}.*; do
+		if [[ -L "${i}" && $(readlink "${i}") =~ (openmo|less)tif- ]]; then
+			einfo "Cleaning up orphaned ${i} symlink ..."
+			rm -f "${i}"
+		fi
+	done
+
+	cd "${ROOT}"usr/share/man
+	find . -type l | while read i; do
+		if [[ $(readlink "${i}") =~ -(openmo|less)tif- ]]; then
+			((count++))
+			rm -f "${i}"
+		fi
+	done
+	[[ ${count} -ne 0 ]] && \
+		einfo "Cleaned up ${count} orphaned symlinks in ${ROOT}usr/share/man"
 }
 
 src_install() {



-- 
gentoo-commits@lists.gentoo.org mailing list



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-02-14 17:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-02-14 11:44 [gentoo-commits] gentoo-x86 commit in x11-libs/openmotif: ChangeLog openmotif-2.3.0.ebuild openmotif-2.3.0-r1.ebuild Ulrich Mueller (ulm)
  -- strict thread matches above, loose matches on Subject: below --
2008-02-14 17:41 Ulrich Mueller (ulm)
2008-02-14 10:09 Ulrich Mueller (ulm)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox