summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2007-08-01 23:28:37 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2007-08-01 23:28:37 +0000
commitcfbc696c4dfacdca6cf654616820d97c49e42611 (patch)
tree8121ca8459a9b3b67097a2fd27558716a3a08a0d /x11-apps
parentRemoved =sys-apps/portage-2.1.3 from the tree. (diff)
downloadhistorical-cfbc696c4dfacdca6cf654616820d97c49e42611.tar.gz
historical-cfbc696c4dfacdca6cf654616820d97c49e42611.tar.bz2
historical-cfbc696c4dfacdca6cf654616820d97c49e42611.zip
(#158056) Make sure /usr/libdir/X11/xsm isn't a symlink.
Package-Manager: portage-2.1.3_rc9
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/xsm/ChangeLog7
-rw-r--r--x11-apps/xsm/Manifest16
-rw-r--r--x11-apps/xsm/xsm-1.0.1.ebuild11
3 files changed, 22 insertions, 12 deletions
diff --git a/x11-apps/xsm/ChangeLog b/x11-apps/xsm/ChangeLog
index 6b98fccc1b16..819792e06d47 100644
--- a/x11-apps/xsm/ChangeLog
+++ b/x11-apps/xsm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-apps/xsm
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/ChangeLog,v 1.14 2006/10/10 21:59:57 dberkholz Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/ChangeLog,v 1.15 2007/08/01 23:28:37 dberkholz Exp $
+
+ 01 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>; xsm-1.0.1.ebuild:
+ (#158056) Make sure /usr/libdir/X11/xsm isn't a symlink.
10 Oct 2006; Donnie Berkholz <dberkholz@gentoo.org>; xsm-1.0.1.ebuild:
Make description a little better.
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
index e3e9f75a9d53..75bc78772948 100644
--- a/x11-apps/xsm/Manifest
+++ b/x11-apps/xsm/Manifest
@@ -1,12 +1,12 @@
DIST xsm-1.0.1.tar.bz2 116875 RMD160 9b70c7610a741d2026323cdc97c8eba63d9dc74c SHA1 7fca1397b86cc9e8763c73eef9a1c41340040a69 SHA256 2f2535b5394d59be0a4bb15c12ea1b19b873a0096446ecc4c71aa81f0d99b29a
-EBUILD xsm-1.0.1.ebuild 665 RMD160 438b2c49a862c5bf90a8eadd85aa294c5ebc196f SHA1 31794e3204f5a3239933f27f12c8ec972d02b9af SHA256 daaeb679d699a2dca0c04d5674c2fa4e39577a874cd7fb7d6df4d7273e87b2c2
-MD5 aec6ea7219142fb0de182722e23a7876 xsm-1.0.1.ebuild 665
-RMD160 438b2c49a862c5bf90a8eadd85aa294c5ebc196f xsm-1.0.1.ebuild 665
-SHA256 daaeb679d699a2dca0c04d5674c2fa4e39577a874cd7fb7d6df4d7273e87b2c2 xsm-1.0.1.ebuild 665
-MISC ChangeLog 1832 RMD160 138c5a6950e0aaebfafd88614fa865687ffbb0a6 SHA1 194828fced0f8ca236783294b989988875958201 SHA256 8e81008edba2f50f28529335d91f03dc8276cbbb318e7ff947711ee850e48797
-MD5 9840ea7bb6dacbc7a1cc0fd9ff0ca79e ChangeLog 1832
-RMD160 138c5a6950e0aaebfafd88614fa865687ffbb0a6 ChangeLog 1832
-SHA256 8e81008edba2f50f28529335d91f03dc8276cbbb318e7ff947711ee850e48797 ChangeLog 1832
+EBUILD xsm-1.0.1.ebuild 911 RMD160 e409bfca1c19c2a0e48c9b359fdb77719c1ea7ac SHA1 45cc5d8aa22612734a4a711ebdb509886e36110e SHA256 e2bd4c05499d6d992639601b77dd560f0e513ccec586f54e53adfa787dbd2bcb
+MD5 452f6d111b814eb70fd4868cd086c0ba xsm-1.0.1.ebuild 911
+RMD160 e409bfca1c19c2a0e48c9b359fdb77719c1ea7ac xsm-1.0.1.ebuild 911
+SHA256 e2bd4c05499d6d992639601b77dd560f0e513ccec586f54e53adfa787dbd2bcb xsm-1.0.1.ebuild 911
+MISC ChangeLog 1965 RMD160 c5a22dfb433ab8f9670d93b2dc33fca0b041c991 SHA1 e303c51e6e65870290534b689dc63f402b8dd435 SHA256 1bea990adbde0c85deb8071d2b29ead54ff7d43ffcfae1d7b448118867427419
+MD5 5639f9bd4747bd86fc9b41bd10fd4f31 ChangeLog 1965
+RMD160 c5a22dfb433ab8f9670d93b2dc33fca0b041c991 ChangeLog 1965
+SHA256 1bea990adbde0c85deb8071d2b29ead54ff7d43ffcfae1d7b448118867427419 ChangeLog 1965
MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
diff --git a/x11-apps/xsm/xsm-1.0.1.ebuild b/x11-apps/xsm/xsm-1.0.1.ebuild
index 21011257e4bc..a10c0fcbe8dc 100644
--- a/x11-apps/xsm/xsm-1.0.1.ebuild
+++ b/x11-apps/xsm/xsm-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/xsm-1.0.1.ebuild,v 1.5 2006/10/10 21:59:57 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xsm/xsm-1.0.1.ebuild,v 1.6 2007/08/01 23:28:37 dberkholz Exp $
# Must be before x-modular eclass is inherited
#SNAPSHOT="yes"
@@ -20,4 +20,11 @@ pkg_setup() {
if use xprint && ! built_with_use x11-libs/libXaw xprint; then
die "Build x11-libs/libXaw with USE=xprint."
fi
+
+ # (#158056) /usr/$(get_libdir)/X11/xsm could be a symlink
+ local XSMPATH="${ROOT}usr/$(get_libdir)/X11/xsm"
+ if [[ -L ${XSMPATH} ]]; then
+ einfo "Removing symlink ${XSMPATH}"
+ rm -f ${XSMPATH} || die "failed to remove symlink ${XSMPATH}"
+ fi
}