From 6bc8c7efc3be50cbf06d0a2119f6028c41c9ad41 Mon Sep 17 00:00:00 2001 From: Bernard Cafarelli Date: Fri, 10 Feb 2012 15:38:51 +0000 Subject: Update live ebuild from main tree 0.95.1 (Portage version: 2.2.0_alpha85/svn/Linux x86_64, signed Manifest commit with key C74525F2) svn path=/overlay/; revision=440 --- x11-wm/windowmaker-crm/ChangeLog | 6 ++- x11-wm/windowmaker-crm/Manifest | 16 +++++-- x11-wm/windowmaker-crm/metadata.xml | 3 +- x11-wm/windowmaker-crm/windowmaker-crm-9999.ebuild | 53 +++++++++++----------- 4 files changed, 45 insertions(+), 33 deletions(-) diff --git a/x11-wm/windowmaker-crm/ChangeLog b/x11-wm/windowmaker-crm/ChangeLog index 46c99a2..f56b995 100644 --- a/x11-wm/windowmaker-crm/ChangeLog +++ b/x11-wm/windowmaker-crm/ChangeLog @@ -1,7 +1,11 @@ # ChangeLog for x11-wm/windowmaker-crm -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 10 Feb 2012; Bernard Cafarelli + windowmaker-crm-9999.ebuild, metadata.xml: + Update live ebuild from main tree 0.95.1 + 21 Apr 2011; Bernard Cafarelli windowmaker-crm-9999.ebuild: Use FHS layout for WPrefs, to keep in sync with the new default gnustep diff --git a/x11-wm/windowmaker-crm/Manifest b/x11-wm/windowmaker-crm/Manifest index 61a9ab9..cf7ecf5 100644 --- a/x11-wm/windowmaker-crm/Manifest +++ b/x11-wm/windowmaker-crm/Manifest @@ -1,5 +1,15 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + 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 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 +EBUILD windowmaker-crm-9999.ebuild 2663 RMD160 d4959318023a7fe7454774673f648fe327a82dcc SHA1 9bee977639d84f7852b10738c18c8f236232819e SHA256 894a30be8ab8bc0af0eea493af2a4c34109b408dcb2bbc2a3a7cf0c3a0c0519f +MISC ChangeLog 653 RMD160 184f87bc0c88cdabae0b68b18300ab383efc21dd SHA1 ee95127055080c52727aff780f207e4b365168c6 SHA256 6e58302d9c937e6bebe53f72cfa2022550139d57de5d5acfa3e610dc2cd986ea +MISC metadata.xml 394 RMD160 b38936f0ba7b057fb41eeab348514bc1ee5a9b29 SHA1 c6207f10ee5f811733c721277dbe9fabe3d16ead SHA256 1b7d1d11e92f67acd47aa9243ae010ea48f55c631fa6b43b025b368b8c03a9ee +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (GNU/Linux) + +iF4EAREIAAYFAk81OgkACgkQFYEBGcdFJfKbkQD+J+T4xvjS9NrvUS7YV2z/aJlK +Rz5HG5fNjzSoYpKdR2cBAJKgg/mdijzVgiusqbk+zU8dDjvo4CvxKFBRZJ1AkuEk +=l4zZ +-----END PGP SIGNATURE----- diff --git a/x11-wm/windowmaker-crm/metadata.xml b/x11-wm/windowmaker-crm/metadata.xml index 3ecadd4..32a7d08 100644 --- a/x11-wm/windowmaker-crm/metadata.xml +++ b/x11-wm/windowmaker-crm/metadata.xml @@ -6,7 +6,6 @@ Enable XKB language status lock support. README says: "If you don't know what it is you probably don't need it." - Enable dynamic virtual desktop (conflicts with - software that works on the edges of the screen) + Enable XRandR window extension support diff --git a/x11-wm/windowmaker-crm/windowmaker-crm-9999.ebuild b/x11-wm/windowmaker-crm/windowmaker-crm-9999.ebuild index a6f6541..b77428a 100644 --- a/x11-wm/windowmaker-crm/windowmaker-crm-9999.ebuild +++ b/x11-wm/windowmaker-crm/windowmaker-crm-9999.ebuild @@ -1,30 +1,31 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=3 +EAPI=4 +inherit autotools git-2 -inherit autotools git - -DESCRIPTION="Fork from the last available CVS version of Window Maker" -HOMEPAGE="http://repo.or.cz/w/wmaker-crm.git" -SRC_URI="http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz" +DESCRIPTION="The fast and light GNUstep window manager" +HOMEPAGE="http://www.windowmaker.org/" +SRC_URI="http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz" EGIT_REPO_URI="git://repo.or.cz/wmaker-crm.git" +SLOT="0" LICENSE="GPL-2" SLOT="0" +IUSE="gif jpeg nls png tiff modelock xinerama +xrandr" KEYWORDS="" -IUSE="gif jpeg nls png tiff modelock +vdesktop xinerama" -DEPEND="x11-libs/libXv +DEPEND="media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXt - media-libs/fontconfig + x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) - png? ( >=media-libs/libpng-1.2.1 ) + png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) - tiff? ( >=media-libs/tiff-3.6.1-r2 ) - xinerama? ( x11-libs/libXinerama )" + tiff? ( media-libs/tiff:0 ) + xinerama? ( x11-libs/libXinerama ) + xrandr? ( x11-libs/libXrandr )" RDEPEND="${DEPEND} !x11-wm/windowmaker nls? ( >=sys-devel/gettext-0.10.39 )" @@ -33,10 +34,11 @@ src_unpack() { # wm-extras unpack ${A} - git_src_unpack + git-2_src_unpack } src_prepare() { + # Fix some paths for file in "${S}"/WindowMaker/*menu*; do if [[ -r $file ]] ; then sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die @@ -45,7 +47,7 @@ src_prepare() { fi; done; - eautoreconf || die "eautoreconf failed" + eautoreconf } src_configure() { @@ -56,7 +58,7 @@ src_configure() { myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)" # non required X capabilities - myconf="${myconf} $(use_enable modelock) $(use_enable xinerama)" + myconf="${myconf} $(use_enable modelock) $(use_enable xrandr) $(use_enable xinerama)" if use nls; then [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" @@ -64,9 +66,6 @@ src_configure() { myconf="${myconf} --disable-locale" fi - # enable new features, need to be done via defines - append-flags -DNEWAPPICON - # default settings with $myconf appended econf \ --sysconfdir="${EPREFIX}"/etc/X11 \ @@ -74,28 +73,28 @@ src_configure() { --enable-usermenu \ --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ --with-nlsdir="${EPREFIX}"/usr/share/locale \ - ${myconf} || die + ${myconf} cd ../WindowMaker-extra-0.1 - econf || die "windowmaker-extra: configure has failed" + econf } src_compile() { - emake || die "windowmaker: make has failed" + emake # WindowMaker Extra Package (themes and icons) cd ../WindowMaker-extra-0.1 - emake || die "windowmaker-extra: make has failed" + emake } src_install() { - emake DESTDIR="${D}" install || die "windowmaker: install has failed." + emake DESTDIR="${D}" install - dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \ + dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ README* NEWS TODO # WindowMaker Extra cd ../WindowMaker-extra-0.1 - emake DESTDIR="${D}" install || die "windowmaker-extra: install failed" + emake DESTDIR="${D}" install newdoc README README.extra @@ -105,7 +104,7 @@ src_install() { exeinto /etc/X11/Sessions/ doexe wmaker - insinto /etc/X11/dm/Sessions + insinto /usr/share/xsessions doins "${FILESDIR}"/wmaker.desktop make_desktop_entry /usr/bin/wmaker } -- cgit v1.2.3-65-gdbad