From d593c2ee92672433d8ca439d3e82dca7d2aad5c0 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Thu, 21 Apr 2011 14:39:41 +0000 Subject: Use FHS layout for windowmaker-crm WPrefs, to keep in sync with the new default gnustep layout svn path=/overlay/; revision=438 --- metadata/cache/x11-wm/windowmaker-crm-9999 | 10 +++++----- x11-wm/windowmaker-crm/ChangeLog | 5 +++++ x11-wm/windowmaker-crm/Manifest | 4 ++-- x11-wm/windowmaker-crm/windowmaker-crm-9999.ebuild | 23 +++------------------- 4 files changed, 15 insertions(+), 27 deletions(-) diff --git a/metadata/cache/x11-wm/windowmaker-crm-9999 b/metadata/cache/x11-wm/windowmaker-crm-9999 index b1cffbe..2c12d60 100644 --- a/metadata/cache/x11-wm/windowmaker-crm-9999 +++ b/metadata/cache/x11-wm/windowmaker-crm-9999 @@ -1,5 +1,5 @@ -x11-libs/libXv >=x11-libs/libXft-2.1.0 x11-libs/libXt media-libs/fontconfig gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( >=media-libs/libpng-1.2.1 ) jpeg? ( virtual/jpeg ) tiff? ( >=media-libs/tiff-3.6.1-r2 ) gnustep? ( >=gnustep-base/gnustep-make-2.0 ) xinerama? ( x11-libs/libXinerama ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 >=sys-devel/libtool-2.2.6b >=dev-vcs/git-1.6 -x11-libs/libXv >=x11-libs/libXft-2.1.0 x11-libs/libXt media-libs/fontconfig gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( >=media-libs/libpng-1.2.1 ) jpeg? ( virtual/jpeg ) tiff? ( >=media-libs/tiff-3.6.1-r2 ) gnustep? ( >=gnustep-base/gnustep-make-2.0 ) xinerama? ( x11-libs/libXinerama ) !x11-wm/windowmaker nls? ( >=sys-devel/gettext-0.10.39 ) +x11-libs/libXv >=x11-libs/libXft-2.1.0 x11-libs/libXt media-libs/fontconfig gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( >=media-libs/libpng-1.2.1 ) jpeg? ( virtual/jpeg ) tiff? ( >=media-libs/tiff-3.6.1-r2 ) xinerama? ( x11-libs/libXinerama ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 >=sys-devel/libtool-2.2.6b >=dev-vcs/git-1.6 +x11-libs/libXv >=x11-libs/libXft-2.1.0 x11-libs/libXt media-libs/fontconfig gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( >=media-libs/libpng-1.2.1 ) jpeg? ( virtual/jpeg ) tiff? ( >=media-libs/tiff-3.6.1-r2 ) xinerama? ( x11-libs/libXinerama ) !x11-wm/windowmaker nls? ( >=sys-devel/gettext-0.10.39 ) 0 http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz @@ -7,14 +7,14 @@ http://repo.or.cz/w/wmaker-crm.git GPL-2 Fork from the last available CVS version of Window Maker -autotools eutils flag-o-matic git gnustep-base libtool multilib portability toolchain-funcs -gif gnustep jpeg nls png tiff modelock +vdesktop xinerama debug doc +autotools eutils git libtool multilib portability toolchain-funcs +gif jpeg nls png tiff modelock +vdesktop xinerama 3 -compile configure install postinst prepare setup unpack +compile configure install prepare unpack diff --git a/x11-wm/windowmaker-crm/ChangeLog b/x11-wm/windowmaker-crm/ChangeLog index b512acb..46c99a2 100644 --- a/x11-wm/windowmaker-crm/ChangeLog +++ b/x11-wm/windowmaker-crm/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 21 Apr 2011; Bernard Cafarelli + windowmaker-crm-9999.ebuild: + Use FHS layout for WPrefs, to keep in sync with the new default gnustep + layout + *windowmaker-crm-9999 (01 Apr 2011) 01 Apr 2011; Bernard Cafarelli diff --git a/x11-wm/windowmaker-crm/Manifest b/x11-wm/windowmaker-crm/Manifest index 0ba49cb..61a9ab9 100644 --- a/x11-wm/windowmaker-crm/Manifest +++ b/x11-wm/windowmaker-crm/Manifest @@ -1,5 +1,5 @@ AUX wmaker.desktop 221 RMD160 501ba6451f7e756cc3d07682d728bcd6fe55366d SHA1 acd95a41645fbef358459f8f4753056cb321497e SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84 DIST WindowMaker-extra-0.1.tar.gz 238018 RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 SHA1 80f34cb3af705ec0f79d727b82cef28ee50fc4e7 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 -EBUILD windowmaker-crm-9999.ebuild 3447 RMD160 6f698c38171dbe7f30c06f68b2a7fb305be2a414 SHA1 8e6413b6e18dbdd711a1f0316d448035f9971977 SHA256 bafe5544407fe1a1278f4e9cc5e36caf05133e5d1084fdd0485eb31ef0d67064 -MISC ChangeLog 339 RMD160 7625bf76678e9946ab049246323df63da51b0650 SHA1 f8e5bdd91cd0b7db32d0eb60ed6863dbc3540fe4 SHA256 9518f6565a0543cb10f1b5a827a42b6378a568572316b79d1d3d75128a02eaa5 +EBUILD windowmaker-crm-9999.ebuild 2960 RMD160 f669c830168f4603864da326397f0e8a58045c1c SHA1 1d9d7a8db4ce916b340168631c8b9c6872e96826 SHA256 0616dc9f06d80585c3205493cffd0e3b120eaa7de7eacadf86b69d4b66c77f06 +MISC ChangeLog 509 RMD160 710aff6b0f74226a893d4c5fdffad3c3fef91aa4 SHA1 5aa625742f7be8ca72c19ad9a28d9877e7fecf24 SHA256 441b049051e9207604ae166f228c60bb832f9762027359d20d2ae4a0e9ec9d7d MISC metadata.xml 455 RMD160 41514c712d553ed4752ce045efca3d27dd036c19 SHA1 345b35512a60f3d19cf5fc4cebbfe30bd6006bf3 SHA256 7661636f854da151e83478668ff58943b0d80662f6abd2a209707d3d34b37c7c diff --git a/x11-wm/windowmaker-crm/windowmaker-crm-9999.ebuild b/x11-wm/windowmaker-crm/windowmaker-crm-9999.ebuild index 0ab9ba3..a6f6541 100644 --- a/x11-wm/windowmaker-crm/windowmaker-crm-9999.ebuild +++ b/x11-wm/windowmaker-crm/windowmaker-crm-9999.ebuild @@ -4,7 +4,7 @@ EAPI=3 -inherit autotools gnustep-base git +inherit autotools git DESCRIPTION="Fork from the last available CVS version of Window Maker" HOMEPAGE="http://repo.or.cz/w/wmaker-crm.git" @@ -14,7 +14,7 @@ EGIT_REPO_URI="git://repo.or.cz/wmaker-crm.git" LICENSE="GPL-2" SLOT="0" KEYWORDS="" -IUSE="gif gnustep jpeg nls png tiff modelock +vdesktop xinerama" +IUSE="gif jpeg nls png tiff modelock +vdesktop xinerama" DEPEND="x11-libs/libXv >=x11-libs/libXft-2.1.0 @@ -24,7 +24,6 @@ DEPEND="x11-libs/libXv png? ( >=media-libs/libpng-1.2.1 ) jpeg? ( virtual/jpeg ) tiff? ( >=media-libs/tiff-3.6.1-r2 ) - gnustep? ( >=gnustep-base/gnustep-make-2.0 ) xinerama? ( x11-libs/libXinerama )" RDEPEND="${DEPEND} !x11-wm/windowmaker @@ -38,18 +37,9 @@ src_unpack() { } src_prepare() { - # Fix some paths - if use gnustep; then - egnustep_env - fi for file in "${S}"/WindowMaker/*menu*; do if [[ -r $file ]] ; then - if use gnustep ; then - sed -i -e "s:/usr/local/GNUstep/Applications:${GNUSTEP_SYSTEM_APPS}:g" "$file" || die - else - sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die - fi - + sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die sed -i -e 's:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;' "$file" || die sed -i -e 's:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;' "$file" || die fi; @@ -68,13 +58,6 @@ src_configure() { # non required X capabilities myconf="${myconf} $(use_enable modelock) $(use_enable xinerama)" - if use gnustep ; then - egnustep_env - # Gentoo installs everything in System, make sure configure honors that - export GNUSTEP_LOCAL_ROOT=${GNUSTEP_SYSTEM_ROOT} - myconf="${myconf} --with-gnustepdir=${GNUSTEP_SYSTEM_ROOT}" - fi - if use nls; then [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" else -- cgit v1.2.3-65-gdbad