Remove intermediate version.

Package-Manager: portage-2.1.4.4

4 files changed, 20 insertions, 126 deletions

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index 93bce36f643f..aae3e7a8c20c 100644
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -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.166 2008/03/07 15:11:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.167 2008/03/07 15:16:13 ulm Exp $
+
+  07 Mar 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml,
+  -openmotif-2.3.0.ebuild:
+  Remove intermediate version. Add myself as maintainer.
 
   07 Mar 2008; Brent Baude <ranger@gentoo.org> openmotif-2.3.0-r1.ebuild:
   stable ppc64, bug 211696
diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index ac9d3061b661..839e864194fc 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 1338 RMD160 b1fc776bc37731778692374a49413f3171851559 SHA1 a7a3d0550950586c91d2618db51b4dca6d4c353d SHA256 9aadce32dde1f38308cfb8f4c68b09675fd8513974042230b41f1fae06aad01c
 AUX openmotif-2.3.0-sensitivity-invisible.patch 7202 RMD160 255895bc7fa43079259de0e0e01262e83dca79f1 SHA1 41732e6c09229dbf8b681b37770a9c46621de84c SHA256 394863dd8b3adb67df78593a78cd04ec6eb7ddda3b70d27fd63f550341de07b9
@@ -7,6 +10,12 @@ DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd
 DIST openmotif-2.3.0.tar.gz 5661471 RMD160 317c8d13d59c6fdd4a9f0e3b63000695f6677b6c SHA1 efb5f5fdc4cc43ef6065594f4ebe98953b7af15e SHA256 81d63e4145fab729621cba38bb0e88fccfbcbb5918473319e9b01a6fbe909544
 EBUILD openmotif-2.2.3-r9.ebuild 3087 RMD160 9abe07e3f2c6d29b284c0a8460c17feca5cbf459 SHA1 7974f28219210a7ca4de6f24f3c8f5db6f208d30 SHA256 4dccc8fb8e3032a2453ba4e8919d40d2fa820b926301e3914cc0a52e614b96ed
 EBUILD openmotif-2.3.0-r1.ebuild 3895 RMD160 5e9acc166566d5559e11e78160704dfee06a0c2e SHA1 b5e68e90e799fe0a4fb5b7ffd1007e182c36a678 SHA256 015ffb1fea5bbcff70b8328bb52d3d0831a836f3db31b01bde4245bfa4e20cd0
-EBUILD openmotif-2.3.0.ebuild 3215 RMD160 897d14313b0ad956bc1c549a962723ebe32649dd SHA1 9ff7aceee3e435010feb085215209fd1ee7b0e4e SHA256 8208aa62cb2bc44a4145c11db93dd7eb4f5af36d15c5539c4f36dc54e5907e5e
-MISC ChangeLog 25970 RMD160 e104053956af78281c18fa8ad0de4ee4cf12a7dd SHA1 c6d10614ed07bba573b8b8e85705d2e8a130f5d7 SHA256 6e3a1cf896dd573c0fdffa5c3ce8ba6fed7fe01ab4077eed981a5da6f3e27811
-MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
+MISC ChangeLog 26113 RMD160 f87cc813fb87a992d6c85427952eabd7270a6c12 SHA1 643f57b971455574144b50ab8a8a4039bd6e34a6 SHA256 1a3ec4a07a0a52495414ec27842b8f4692b93f9770d5d702f2256afaf79955f9
+MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.8 (GNU/Linux)
+
+iEYEARECAAYFAkfRXBsACgkQOeoy/oIi7uwSRwCfddciJQKc7Txf2/5qtJHB9Da9
+bAcAoLsbhnGRnY5Pu3eRH7JDipv5RpHv
+=EZRb
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/openmotif/metadata.xml b/x11-libs/openmotif/metadata.xml
index 20ce219711a2..17d1f63398d4 100644
--- a/x11-libs/openmotif/metadata.xml
+++ b/x11-libs/openmotif/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
+<maintainer>
+  <email>ulm@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-libs/openmotif/openmotif-2.3.0.ebuild b/x11-libs/openmotif/openmotif-2.3.0.ebuild
deleted file mode 100644
index a1a07cc762fd..000000000000
--- a/x11-libs/openmotif/openmotif-2.3.0.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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.18 2008/02/16 16:17:20 ulm Exp $
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="1.6"
-
-inherit eutils libtool 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 doc? ( OPL )"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="doc xft jpeg png examples"
-
-RDEPEND="
-	x11-libs/libXmu
-	x11-libs/libXaw
-	x11-libs/libXp
-	x11-proto/printproto
-	xft? ( x11-libs/libXft )
-	jpeg? ( media-libs/jpeg )
-	png? ( media-libs/libpng )
-	>=x11-libs/motif-config-0.10-r2"
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	x11-misc/xbitmaps"
-
-PROVIDE="virtual/motif"
-
-pkg_setup() {
-	# multilib includes don't work right in this package...
-	[ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}"
-}
-
-src_compile() {
-	# get around some LANG problems in make (#15119)
-	unset LANG
-
-	# bug #80421
-	filter-flags -ftracer
-
-	append-flags -fno-strict-aliasing
-
-	econf --with-x \
-		$(use_enable xft) \
-		$(use_enable jpeg) \
-		$(use_enable png) || die "configuration failed"
-
-	emake -j1 || die "make failed, if you have lesstif installed removed it, compile openmotif and recompile lesstif"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	# cleanups
-	rm -fR "${D}"/usr/$(get_libdir)/X11
-	rm -fR "${D}"/usr/$(get_libdir)/X11/bindings
-	rm -fR "${D}"/usr/include/X11/
-
-	list="/usr/share/man/man1/mwm.1 /usr/share/man/man4/mwmrc.4"
-	for f in $list; 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
-
-	einfo "Fixing binaries"
-	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-2.3/${file}
-	done
-
-	einfo "Fixing libraries"
-	mv "${D}"/usr/$(get_libdir)/* "${D}"/usr/$(get_libdir)/openmotif-2.3/
-
-	einfo "Fixing includes"
-	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"
-	for man in $mans; do
-		dodir /usr/share/man/man${man}
-		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-2.3.${man}
-		done
-	done
-
-	# install docs
-	dodoc README RELEASE RELNOTES BUGREPORT TODO
-
-	use doc && cp "${WORKDIR}"/*.pdf "${D}"/usr/share/doc/${PF}
-
-	if ( use examples )
-	then
-		dodir /usr/share/doc/${PF}/demos
-		mv "${D}"/usr/share/Xm "${D}"/usr/share/doc/${PF}/demos
-	else
-		rm -rf "${D}"/usr/share/Xm
-	fi
-
-	# profile stuff
-	dodir /etc/env.d
-	echo "LDPATH=/usr/$(get_libdir)/openmotif-2.3" > "${D}"/etc/env.d/15openmotif-2.3
-	dodir /usr/$(get_libdir)/motif
-	echo "PROFILE=openmotif-2.3" > "${D}"/usr/$(get_libdir)/motif/openmotif-2.3
-}
-
-pkg_postinst() {
-	/usr/bin/motif-config -s
-}
-
-pkg_postrm() {
-	/usr/bin/motif-config -s
-}