summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Wendel <lanius@gentoo.org>2005-03-25 07:29:22 +0000
committerHeinrich Wendel <lanius@gentoo.org>2005-03-25 07:29:22 +0000
commit63d2084e00bd32be55242810bf15c995d2ee8712 (patch)
tree40890f1e908c9a50a4d01f841c282bc469781a6d /x11-libs
parentfix upgrading from unslottet version (diff)
downloadgentoo-2-63d2084e00bd32be55242810bf15c995d2ee8712.tar.gz
gentoo-2-63d2084e00bd32be55242810bf15c995d2ee8712.tar.bz2
gentoo-2-63d2084e00bd32be55242810bf15c995d2ee8712.zip
fix
(Portage version: 2.0.51.19)
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/lesstif/Manifest12
-rw-r--r--x11-libs/lesstif/lesstif-0.93.94-r3.ebuild6
-rw-r--r--x11-libs/lesstif/lesstif-0.94.0-r6.ebuild6
-rwxr-xr-xx11-libs/motif-config/files/motif-config-0.86
-rw-r--r--x11-libs/openmotif/openmotif-2.1.30-r12.ebuild6
-rw-r--r--x11-libs/openmotif/openmotif-2.2.3-r6.ebuild6
6 files changed, 19 insertions, 23 deletions
diff --git a/x11-libs/lesstif/Manifest b/x11-libs/lesstif/Manifest
index fcefc4536e2f..de5e225148e3 100644
--- a/x11-libs/lesstif/Manifest
+++ b/x11-libs/lesstif/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 cf8bf77e99838b1efb7d1fd409bb45f6 lesstif-0.94.0-r6.ebuild 2450
MD5 2d7f23b4289eedf9f1317a336fc8b1cb lesstif-0.93.94-r3.ebuild 2590
+MD5 cf8bf77e99838b1efb7d1fd409bb45f6 lesstif-0.94.0-r7.ebuild 2450
MD5 9b4f3806aa89a43b17fa8aac8775e889 lesstif-0.94.0-r2.ebuild 2111
MD5 afcf8776ce72bbee8d4b4d59c21f9be9 ChangeLog 8109
MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
@@ -12,10 +10,4 @@ MD5 10373c1e87b0208cd26888011a4d92de files/CAN-2005-0605.patch 1194
MD5 45fa63580e7de408204bea30102331f8 files/digest-lesstif-0.93.94-r3 144
MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r2 68
MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r6 68
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCQ7lPevY57Fted3ERAnqwAKCrbpw+DUcCj4cvVetDmelMNEIxogCgxXp0
-eHy12VbHHgfzCwEWmQm0M5w=
-=W8k/
------END PGP SIGNATURE-----
+MD5 50f3abd88dd0c45de68a1cec931c4909 files/digest-lesstif-0.94.0-r7 68
diff --git a/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild b/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild
index 58781e952b01..3bddb16de8d0 100644
--- a/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild
+++ b/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild,v 1.3 2005/03/25 07:09:52 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.93.94-r3.ebuild,v 1.4 2005/03/25 07:27:14 lanius Exp $
# disable sandbox, needed for motif-config
SANDBOX_DISABLED="1"
@@ -99,7 +99,7 @@ src_install() {
# Profile stuff
pkg_setup() {
- if has_version =x11-libs/lesstif-0.93.94*; then touch $T/upgrade; fi
+ if has_version =x11-libs/lesstif-0.93.94*; then touch /tmp/lesstif-1.2; fi
}
pkg_postinst() {
@@ -107,5 +107,5 @@ pkg_postinst() {
}
pkg_prerm() {
- [ -f $T/upgrade ] || motif-config --uninstall lesstif-1.2
+ [ -f /tmp/lesstif-1.2 ] && rm -f /tmp/lesstif-1.2 || motif-config --uninstall lesstif-1.2
}
diff --git a/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild b/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild
index 3dbe68657038..506b0c70efae 100644
--- a/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild
+++ b/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild,v 1.3 2005/03/25 07:09:52 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/lesstif/lesstif-0.94.0-r6.ebuild,v 1.4 2005/03/25 07:27:14 lanius Exp $
# disable sandbox, needed for motif-config
SANDBOX_DISABLED="1"
@@ -95,7 +95,7 @@ src_install() {
# Profile stuff
pkg_setup() {
- if has_version ">=x11-libs/lesstif-0.94.0"; then touch $T/upgrade; fi
+ if has_version ">=x11-libs/lesstif-0.94.0"; then touch /tmp/lesstif-2.1; fi
}
pkg_postinst() {
@@ -103,5 +103,5 @@ pkg_postinst() {
}
pkg_prerm() {
- [ -f $T/upgrade ] || motif-config --uninstall lesstif-2.1
+ [ -f /tmp/lesstif-2.1 ] && rm -f /tmp/lesstif-2.1 || motif-config --uninstall lesstif-2.1
}
diff --git a/x11-libs/motif-config/files/motif-config-0.8 b/x11-libs/motif-config/files/motif-config-0.8
index ddb2199277d5..79f46593d172 100755
--- a/x11-libs/motif-config/files/motif-config-0.8
+++ b/x11-libs/motif-config/files/motif-config-0.8
@@ -68,6 +68,10 @@ _check_root() {
_activate_profile() {
_check_root
+ if [ -z "${1}" ]; then
+ return 0
+ fi
+
new=${1}
# libs
for file in `ls /usr/@@LIBDIR@@/${new}/ | grep lib`; do
@@ -357,7 +361,7 @@ for x in "$@"; do
;;
-v|--version)
- echo "motif-config-0.7"
+ echo "motif-config-0.8"
exit 0
;;
diff --git a/x11-libs/openmotif/openmotif-2.1.30-r12.ebuild b/x11-libs/openmotif/openmotif-2.1.30-r12.ebuild
index 8e5172c0da57..cb27f62e9ef7 100644
--- a/x11-libs/openmotif/openmotif-2.1.30-r12.ebuild
+++ b/x11-libs/openmotif/openmotif-2.1.30-r12.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r12.ebuild,v 1.3 2005/03/25 07:09:27 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.1.30-r12.ebuild,v 1.4 2005/03/25 07:27:22 lanius Exp $
# disable sandbox, needed for motif-config
SANDBOX_DISABLED="1"
@@ -168,7 +168,7 @@ src_install() {
# Profile stuff
pkg_setup() {
- if has_version =x11-libs/openmotif-2.1*; then touch $T/upgrade; fi
+ if has_version =x11-libs/openmotif-2.1*; then touch /tmp/openmotif-2.1; fi
}
pkg_postinst() {
@@ -176,5 +176,5 @@ pkg_postinst() {
}
pkg_prerm() {
- [ -f $T/upgrade ] || motif-config --uninstall openmotif-2.1
+ [ -f /tmp/openmotif-2.1 ] && rm -f /tmp/openmotif-2.1 || motif-config --uninstall openmotif-2.1
}
diff --git a/x11-libs/openmotif/openmotif-2.2.3-r6.ebuild b/x11-libs/openmotif/openmotif-2.2.3-r6.ebuild
index efe85690cf13..afef214a6c7a 100644
--- a/x11-libs/openmotif/openmotif-2.2.3-r6.ebuild
+++ b/x11-libs/openmotif/openmotif-2.2.3-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r6.ebuild,v 1.3 2005/03/25 07:09:27 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.2.3-r6.ebuild,v 1.4 2005/03/25 07:27:22 lanius Exp $
# disable sandbox, needed for motif-config
SANDBOX_DISABLED="1"
@@ -35,7 +35,7 @@ pkg_setup() {
[ -n "${ABI}" ] && append-flags "-I/usr/include/gentoo-multilib/${ABI}"
# profile stuff
- if has_version =x11-libs/openmotif-2.2*; then touch $T/upgrade; fi
+ if has_version =x11-libs/openmotif-2.2*; then touch /tmp/openmotif-2.2; fi
}
src_unpack() {
@@ -146,5 +146,5 @@ pkg_postinst() {
}
pkg_prerm() {
- [ -f $T/upgrade ] || motif-config --uninstall openmotif-2.2
+ [ -f /tmp/openmotif-2.2 ] && rm -f /tmp/openmotif-2.2 || motif-config --uninstall openmotif-2.2
}