summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2012-02-19 19:05:21 +0000
committerFabian Groffen <grobian@gentoo.org>2012-02-19 19:05:21 +0000
commit38f5d7b18f8c3bbaafe985bd5f986e891f4eacca (patch)
tree443dfa5c5bde81d465231debf5efbb83d087e90b /x11-wm
parentVersion bump (diff)
downloadhistorical-38f5d7b18f8c3bbaafe985bd5f986e891f4eacca.tar.gz
historical-38f5d7b18f8c3bbaafe985bd5f986e891f4eacca.tar.bz2
historical-38f5d7b18f8c3bbaafe985bd5f986e891f4eacca.zip
Fix for Prefix, based on patch by Merlijn Wajer, bug #404327
Package-Manager: portage-2.2.01.20239-prefix/cvs/Darwin i386
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/dwm/ChangeLog5
-rw-r--r--x11-wm/dwm/Manifest18
-rw-r--r--x11-wm/dwm/dwm-6.0.ebuild9
3 files changed, 16 insertions, 16 deletions
diff --git a/x11-wm/dwm/ChangeLog b/x11-wm/dwm/ChangeLog
index 2c57c62022c1..0b5e86ce8665 100644
--- a/x11-wm/dwm/ChangeLog
+++ b/x11-wm/dwm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-wm/dwm
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/ChangeLog,v 1.81 2012/02/16 13:23:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/ChangeLog,v 1.82 2012/02/19 19:05:21 grobian Exp $
+
+ 19 Feb 2012; Fabian Groffen <grobian@gentoo.org> dwm-6.0.ebuild:
+ Fix for Prefix, based on patch by Merlijn Wajer, bug #404327
16 Feb 2012; Agostino Sarubbo <ago@gentoo.org> dwm-6.0.ebuild:
Stable for amd64, wrt bug #403907
diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 04545573ae1a..53e482664427 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -1,5 +1,5 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
AUX dwm-session 312 RMD160 6d3792a0f5374ba6bd8aeb84aa31a86b598e2416 SHA1 a87590c2cbb5a857e8875c88fa4d2e8090cf31d1 SHA256 bc0e60687f719f2613492f15180c3327b7b9560f53f09a52f0e763548f2221ac
AUX dwm-session2 170 RMD160 4f131eba402a1d0f4f759546bba7f62aa96283e1 SHA1 88f458b328decbc947584b48481f7955ffd8c0d2 SHA256 b25088c71daa7ec759bf1ae758b8ef528dcced6cfb642ccdcb69ffa8644dc5ab
@@ -13,17 +13,13 @@ EBUILD dwm-5.6.1.ebuild 2143 RMD160 cf56602d45e95ed33f3a500f46aaa644930d5150 SHA
EBUILD dwm-5.7.2.ebuild 2231 RMD160 04bf33b356398cb0aa22444d1d79dc51f11bdfcd SHA1 16e160df62fc8c82ec82638174734fc62ddec6d1 SHA256 eab438cf37d2be96a3b8f268914c8f58dfa9455ba19dd3dff2733fc3aacadc07
EBUILD dwm-5.8.2.ebuild 2222 RMD160 67b03624b243a8710f2669f2f1df34fc434bb4b5 SHA1 37c87114cbfb373ffb5e55e37f1c2bee0c0c80d9 SHA256 3a66af22905e0c2a9413b117b39de53559c6fd29399f5c70b338dc29781aab9d
EBUILD dwm-5.9.ebuild 2114 RMD160 0a8d96904b0bea363e4b70ae9e2a3630911cce46 SHA1 25ad477db5eb4129dc2ee3b4f0f98f943858fdfd SHA256 46654d99a487f1e82edc88a0cb23363e49f1aed200e70286358838b25ea7074f
-EBUILD dwm-6.0.ebuild 1956 RMD160 96601f50e10b66370335183850a00c40f9b8ca7b SHA1 facf1e5cfca941c7f809769f8e1b5fbf020785b0 SHA256 75ec33e3d2349b8400ffc3e0bfa7d03456fdc9b277417c5429e84b857018f066
-MISC ChangeLog 8928 RMD160 57ce2e4c72d869759ddf154dcae1c869a4082b72 SHA1 baa361be0ad904deca314c54bb68b5629854f410 SHA256 0e2a066619799a45a240efe268f988b5296af44baa74b498b4f55e9ad84c99f6
+EBUILD dwm-6.0.ebuild 2038 RMD160 735c8f68e186c902d70a83be5aa231b31da21d1f SHA1 085f06bd8564df38f1c6a837896828d03fe183a1 SHA256 2f587d1157425d28133fdf542ff22ed6a169ca664534ec8b856a7fa7e9785abd
+MISC ChangeLog 9063 RMD160 115971ed57a064551eb9414f197a2ab93148fa71 SHA1 a6703941473b04dd2cd6d50f3625309a7ec2ac2f SHA256 12c7ba6d40dac7bdfd44397b7af310d1750a03ff6cd8592a8b453b241f53c053
MISC metadata.xml 464 RMD160 6a015eb09888ce94ac15fa060db3245003086bd3 SHA1 ce1903fc125b85fb2d17a1586dad6e2a634908d2 SHA256 2fc98596b93f4b722956c930fc9bc1dc52cd51c316e6c4ff21fd8e5086d2f0d4
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
-iQEcBAEBCgAGBQJPPQNDAAoJEOTDgjZ80txdsW4H/0g664+ZM5ZRMDPwxSOLITNl
-esAeKIQqcYxbP/R9oGZlE+jX1GDGGZQmFNkrxccoC/zED2CLUUd5D7TFhWt96Z6t
-7HSAZSnKMrw733hW5sIGmR5Ezu2ZbHwCSyWeWJkRLRfkdguP3Xk2ksayvKESMUAr
-ZvH+nyNhkhIJhFI6/i9RpfOsyn+jEbsv3lg0a56hStpNcvy3akjzDhj9hu+8l+vK
-W91Gc+hz64AQaVOTddAa5nHz+L+8jMtOZ2SHRliDy4ab2FLt7E3adT15LEc8kc20
-4YbYB20WeC9ylut0YkPHPFMhtxQs5McZqlO974t+mhsJwQ7faZCUYIEfnoOB0r0=
-=OfMn
+iEYEARECAAYFAk9BSAsACgkQX3X2B8XHTonJegCgoGeMtA0lSjN0d0HQ4J2v4nWu
+2jcAn1FweoFvFYA5zhTK37/cES9nps0C
+=Ewpz
-----END PGP SIGNATURE-----
diff --git a/x11-wm/dwm/dwm-6.0.ebuild b/x11-wm/dwm/dwm-6.0.ebuild
index 252783b91b10..c5e29f601ba3 100644
--- a/x11-wm/dwm/dwm-6.0.ebuild
+++ b/x11-wm/dwm/dwm-6.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/dwm-6.0.ebuild,v 1.6 2012/02/16 13:23:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/dwm-6.0.ebuild,v 1.7 2012/02/19 19:05:21 grobian Exp $
EAPI="4"
@@ -28,8 +28,9 @@ src_prepare() {
-e "/^LDFLAGS/{s|=|+=|g;s|-s ||g}" \
-e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \
-e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
- -e "s@/usr/X11R6/include@/usr/include/X11@" \
- -e "s@/usr/X11R6/lib@/usr/lib@" \
+ -e "s@/usr/X11R6/include@${EPREFIX}/usr/include/X11@" \
+ -e "s@/usr/X11R6/lib@${EPREFIX}/usr/lib@" \
+ -e "s@-I/usr/include@@" -e "s@-L/usr/lib@@" \
config.mk || die "sed failed"
restore_config config.h
@@ -44,7 +45,7 @@ src_compile() {
}
src_install() {
- emake DESTDIR="${D}" PREFIX="/usr" install
+ emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
exeinto /etc/X11/Sessions
newexe "${FILESDIR}"/dwm-session2 dwm