From: Bernard Cafarelli Date: Wed, 21 Jan 2015 09:59:36 +0000 (+0000) Subject: Fix libXpm dependency (conditional in latest package), bug #533912 by Toralf Förster... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b4b58e76dd8922d092fe364432ee3dc4ef2adfb9;p=gentoo.git Fix libXpm dependency (conditional in latest package), bug #533912 by Toralf Förster . Also remove some versions Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0xC74525F2 --- diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog index 21a8874f19c6..bb715369ce86 100644 --- a/x11-wm/windowmaker/ChangeLog +++ b/x11-wm/windowmaker/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for x11-wm/windowmaker -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.149 2014/09/03 21:30:00 voyageur Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.150 2015/01/21 09:59:33 voyageur Exp $ + + 21 Jan 2015; Bernard Cafarelli + windowmaker-0.92.0-r11.ebuild, -windowmaker-0.95.3-r1.ebuild, + -windowmaker-0.95.4.ebuild, -windowmaker-0.95.4-r1.ebuild, + -windowmaker-0.95.5.ebuild, windowmaker-0.95.5-r1.ebuild, + windowmaker-0.95.6.ebuild: + Fix libXpm dependency (conditional in latest package), bug #533912 by Toralf + Förster . Also remove some versions 03 Sep 2014; Bernard Cafarelli windowmaker-0.95.6.ebuild, metadata.xml: diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest index 97b9bf785170..9ede5d42ad02 100644 --- a/x11-wm/windowmaker/Manifest +++ b/x11-wm/windowmaker/Manifest @@ -5,25 +5,19 @@ AUX windowmaker-0.95.3-fix_underlinking.patch 355 SHA256 ae4bc0f40edb8fc38084051 AUX windowmaker-0.95.5-bsd_crash.patch 963 SHA256 189bde88d72d65b0412bf7f08d2bddc8f952d942d7a0cab49d3391292dcd47ba SHA512 66611ecb7b8aa43c8884734472bd41f2912a5a86c93ad908313171041a2665d08e9131270b21d3466dd3c844dab09faa099bf01e2fa2a4a81bb3910073490c3e WHIRLPOOL 78ec84ed9c61b6ece3db15bc0e5137c66d37335c9e64494bc1cd82f4a157c8e26e73796d0fb7c2706dc2cb3b9bd84b759d8570a1a3a17eb9d7d6ac9a623803ae AUX wmaker.desktop 221 SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84 SHA512 1c1b24001e47a2af8f18a5f90675d095ba7f929ad9273ca82f61fd13ad35ff22dc9b777eec24fc3fd984790a5d494949d1dd5e0ca39780920017ea7971a3289d WHIRLPOOL 68ea31480ba1796e4243184deff38270963841c2bdb54bc85a606ecad0cdccc6815b11fa67158cbcc527ae3a17488b97a209283289922323ed42ea37a062ac2b DIST WindowMaker-0.92.0.tar.gz 2758524 SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6 SHA512 3db6d7128d49ecd87d46893c63efcdda07f841bdfd5961462c0c9247d4f3937835f637dc7f4fa7169f6999595afca914c611f4249915700a461130c5a3c865d2 WHIRLPOOL 8d9395c79cdb23d4d6011dc5a1383852890f2d02fa0038a80cf81e2135b4a904065b4051fd1be07818136442f5ac792459f5cc81bc75ba090c1728aa4e4ef4cd -DIST WindowMaker-0.95.3.tar.gz 2780245 SHA256 b5eb88eccbf9a196a617594717797aa38f5c38d13d2ee40e914e153d09c9975a SHA512 7a70f6eb9de03c466d9de6a84febc59d46edee82c789287caa3a67012ab40c9b9a029ee46236f79dc80daeecab2313999a72f4d90caa77a464876116bd48ad16 WHIRLPOOL 056adcc7fd532aca611dd3699584aef793b5a86f66f051b571f4a0c247e33a37871e775389f7449d0357d3133a75ba3a7cd862a6cc2a243e447959b977d8a731 -DIST WindowMaker-0.95.4.tar.gz 2789390 SHA256 2bea97f00570f05ff115d147457c16abefe496a4fc882a027152ce592d768e45 SHA512 d170ee79f927c1eb70d6fe7e324bf3a5ab4eb206496b5d4182ba92fab5a3968ed00d465e69adad3b7d71e9d4d5ea333f78bee28a68510228baa8ce33de156dc3 WHIRLPOOL 8341be33680b69e984214efdfd3617dfb50fa3ea11d663ac91b3f3763b690de9f34986afa4862006d0fc1281ac52b7f9a2f2c37447085617e26ada0ba678ff75 DIST WindowMaker-0.95.5.tar.gz 2927995 SHA256 4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0 SHA512 0a6eb7c3ffee1d09dbc2408be4d2c04f6647cd1195366047083b5c5c89b61e92a5c7d5d134e43775fc371ea27ac8645ad0a7cbae86ebd53f2eae20066ac56703 WHIRLPOOL eb41cffab165af4efb66b28aacbc0e4695d57a426565554f20566b02bb0f428c31e23ec50af36759992a9a18f1598a727f98168d6bde7443f58821101d1653da DIST WindowMaker-0.95.6.tar.gz 3004856 SHA256 435b0b4a318a3a00e8267f02cdbd826ad547b1f54259d193ce43e9a77ce06dc4 SHA512 259db96b44058fde21b7efe65419b7f7ae149029dcfbf5cf480f920d68f906cd15345105ab67d8539be44d6f1b30e62accf68fc009d53af8c12e047c01154a11 WHIRLPOOL 6f27180cc4439b4b19c3f249fc9c5577463187c741c2e04112bb70feb8e052ad1093e0a5103f1772b59ee7b2549f7b126ac621165f94483e22fd756a969e0e3c DIST WindowMaker-extra-0.1.tar.gz 238018 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 WHIRLPOOL f2c61b318f64a2debb727ae79dfa1bb8101888bc9492633a96ace0e704c731c383e92882c871622987d5971b919359c066638fba05c5dade330fe3bee21bb034 DIST windowmaker-0.92.0-patchset-5.tar.bz2 226417 SHA256 3298be8a2f1eb8130c249df790ed2a35a230c337f2d12fd426e14df9652a9adc SHA512 9edc25386658e5ddeaee2e3c7f396adbe16e9fdccde906f7b69bca95b1e0b33a2b2481fa445f5cf5b8e6b2492ca1b8409615e7a66f7d039d449d099523c4c779 WHIRLPOOL 62b42d533f2c2c22259aa0004ab995472e455997ccb6074e3f5b599b22cdd1c640003b6903c104e8663e62be312254afbc4d4147366af72eb16227b36eacd77c -EBUILD windowmaker-0.92.0-r11.ebuild 6343 SHA256 09979ec2a7e3ecbbebd54be27ba6b9662abcb1ad8f44aaf0baf73aa68e415d9a SHA512 45af454a20c5f7cfd22b9a71e7c44dd080a7fe9d4a3697dfc988ebf3363a6ed8d7adf2d319e861bdb5bf1c351f83e4d668f8e802ea032b8a8422422dd68eee55 WHIRLPOOL ba513ee2b7e8a602ccc8a44f63a4ede9720d16bd5d54f4d94991b29d77e2aa3329a915f2c9360a1dc05ca5421c3df51731de4e7f7fdeec7522b541eb0df284b1 -EBUILD windowmaker-0.95.3-r1.ebuild 2982 SHA256 0776a28212eff71a353591e2fab0f392a1ad4459b430ef831b03c4f221365e85 SHA512 540523d33406d47c2ea9597a367de36ebe20c031058f6f6f3f9c36e30577513309cab8d497a40b02070ff9688fdbf59a89db98dbfea8269528b5365c2a351959 WHIRLPOOL e726b98478d645b14293b8891bd4404b8282ae328cd1177f4ce6d182a8053c736dbde660cb60bd818e48126aa12ad531672b8e14b8f0bfb624569c68e7ceab76 -EBUILD windowmaker-0.95.4-r1.ebuild 3003 SHA256 d7b38fbfd7a1786f84b6e1cc8811342035824ac52f2388f32e94cbf0e87044e2 SHA512 256b601419152b468d584e38860fe4c4ecd5586f6f5ea7c1905f258c4c15a3951ec677c4233a6fe268ec14662c08011d8da35c35cb98d24946ed46e7632ea2af WHIRLPOOL e728233f588cd6a029881b77d3bb505d5cc6288dfe9988be7b86a7b4f8d950f3f68160aeca688c2c5c0f8f01cc3d4a24a5ff41673fe8567790fc606344f5863b -EBUILD windowmaker-0.95.4.ebuild 2987 SHA256 f74e8ad2c77578ae54c2796e35009f04a728965b6af0b0f27147ced9588c3fff SHA512 e46deff68ab3a1b926f0ee2ccdff50fea93d840eca4901fac4e5ab5a688e7f44931376228d230bab70e427267f3e2dfeb2c9857107b5cb28491f1f49190ddb5b WHIRLPOOL c3f86b7ea3805df8d08b192141f85633c8ca899003c8b5153a5f0b6b0f588c7f5bbce5a6fefb0ba1ea8ef344ca59f8927eb95438cded869fd66a53e8ce503fb5 -EBUILD windowmaker-0.95.5-r1.ebuild 3035 SHA256 45360d307cdd2308b242f886ddaf291778b532947c3806d27c81e4cd1c812434 SHA512 459221b8dacfd9136d6b3ddf54accc0a15baddce679c2bb08d5cdededea9b01a2e95153b173a78d9620c5b2c1fe92d09dc3125064224bcafec8272d822d6273f WHIRLPOOL 9d1788472aacf7f9f8b385d3bee2850392d37ab72e958455cfd07605ef1c67bcd4950d7ed10d7e038a5b2e4fa4c8c7f92c3b4a20f486de5c9a4741f4036ddf09 -EBUILD windowmaker-0.95.5.ebuild 3000 SHA256 c650aaf158a890df4ff4f42f51bcb03e632183da2ec1db76778c645d5d1eb641 SHA512 114d42c81b7576eab8c3ee65ee1a3b4d5641c43be451aa1304e0a83e248c5048d031e8894c67b122d723d8bff0b0035a17e579bcedb43ce0150b5b2200de3a99 WHIRLPOOL 472f8c00945e8c9792cd6dbc1085a8af2630da4aa1d52ea4c6c72a241146180d6f499c7d587c594c47019e322b0ff4266584eaefd6720f48cb1f8844d2b1a3da -EBUILD windowmaker-0.95.6.ebuild 3145 SHA256 325a1f4e280e14fc92ebbf1dc42b9f6263c66ec00495160008e7e61dd688d2fc SHA512 efc71a0f247a16fe367f223704a802687ee55082c202a7cfa6fec01b9488ff38f0b382085fc08b84126fcace081624d1f7bb95b29d3cf513abbb360c13a54fa8 WHIRLPOOL 60088dca9c74cf41f68e6548934e950fe4bf612ce809b7716b791e586be241fdf9b334aeb595df565e5db272f016ec9f4618deb36328b1b8d5f0171d98515fa3 -MISC ChangeLog 30335 SHA256 e9e93c724df5df579941e2688569de116538f6c746bb941839a784cea3690155 SHA512 0d1a9334dce43db60103b4827db2b90ae27e7c903ae73e7d0fcb9aa0fd03c74562ef9914560eebd34e2da25e8abfad21e197a8de52d879a39c7b5070d717220c WHIRLPOOL 9bba2d322dd9c0b643c1fcf270f28e8006d43cb420d2b7dedfde848fbe9f64f12b6011f745e0004262a94aab85e2227fc787e593912cb0f589bbea9f495c0dbe +EBUILD windowmaker-0.92.0-r11.ebuild 6334 SHA256 0ceefd4d41b7b50ae6aed6e78b6b3eeb142f33d310d03017046f580711310b72 SHA512 ec73ab2a357ea8957e5692ff3a823ec3dbeec1492ea71229bbc0e6344b044e5957d241f735bdda79519a1c0b756f8ff642f53029922386efa6bfcfef2e84b6a2 WHIRLPOOL 392cd74ecb34fc3c424020b9900e8e56592cb39af969a8bc4c621150e44d98051d2df54880c00beb49bee8feb43ae50b7bf3878210a785809e0d0cdb5ac49026 +EBUILD windowmaker-0.95.5-r1.ebuild 3026 SHA256 59857274e47be506e5970c20ac91632bd422c970beb22749c24f686883c1b8a6 SHA512 cd3cdaf31a2bc6ebd1b31f5b2aebcfced0fc3cd1a84d4f8b3a7607e7b30c0e63d79141f5e77dbf8f31b8a13f2f2d379da0a3b6bc9c8c40c4715fd8aebae58071 WHIRLPOOL 141078c578746fbad61e9f40158d37cabd07610e5cb839230241609cd8b5bd976c19e6dcc25d48f8db6fc1bb742d48c8bd799ac944e8c01b47fc31dec227c129 +EBUILD windowmaker-0.95.6.ebuild 3141 SHA256 104914243ce17296a20fbcbd1ad7f8b8e043c643cf904aeaca1689d7b66f93b5 SHA512 6dd3e14ce8df38ac60a55e884eb8d5dce2fa96d89f60eb8ad330d39b542ce1155dc23bfb729244cb0a49153119c29e46d17b5ad0b12c937dccb6b0a6490403fe WHIRLPOOL dc533c0dfd29d28ca8d66a2d9e8291d592d8e04588850070c01f245d6696e8347c2bcf23b0255ac69faf6bb7d685bc79907989219b30f549879f2e657834c4df +MISC ChangeLog 30747 SHA256 aa8acc72e2d5259bf64dba51c9be91128c7585853588bce00e0d8fdb2c9ea542 SHA512 d8fc8375e2561d9dbe33927aaac46a165742c8d111e1ae2ac06c338a71e57467db9a5b2115deb4f1841f9eac8c106b3da90855aee2a0b086715496fcde68b8d3 WHIRLPOOL c31da5e74ae5c12589d928717bb9e062acda1704a34627dba458859ffd2922a14642a68f02c6738c8a249c150c6b6f4667e9459ae33cc7ef448c0e69f52f8408 MISC metadata.xml 620 SHA256 0ed7b6436038ef56a72ed6b7aaa6b90a89712e783673f28a725637fd257c1943 SHA512 fbb6a93b3ea2d0264ab6b423b90d26094c2e4b8afe97306c642e3ef7c54e58118bf417cd4e5c44425ce89fca73a9d2889986f779cbad8645a016abdaf60d2397 WHIRLPOOL c3bebfecf2ab99b90f2501185bab2641c44d55e59537eb887a23c8f19cc0779c5440c4e502dde27eba938da6078375093b1756bb4589d5355e27384e2bea1f2c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlQHiF8ACgkQFYEBGcdFJfL5uQD/auLJjR0VbXIonbbq6I1Pl37V -QtMGJ9xKBRtoRp2zGwABAJHEHkYlk9JFJ8le6jd1VskSJ7390XzfXaCtP4elmRvs -=iHyv +iF4EAREIAAYFAlS/eIYACgkQFYEBGcdFJfLddAEAnJfkG4SWakC1yLl7IPzLBwAa +RlCTo9NJujhqXrIi6D4A/24yZIs+EAfzUJZv2HhNa5UALDxKlQ1esF/wbG3DGdXc +=DPtI -----END PGP SIGNATURE----- diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild index 4e774df0716f..5f4afeb2f221 100644 --- a/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild +++ b/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild,v 1.9 2011/11/12 10:36:45 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild,v 1.10 2015/01/21 09:59:33 voyageur Exp $ EAPI=3 inherit autotools eutils flag-o-matic @@ -23,6 +23,7 @@ KEYWORDS="alpha amd64 hppa ~mips ppc ~ppc64 sparc x86 ~x86-fbsd ~x86-interix ~am DEPEND=" media-libs/fontconfig >=x11-libs/libXft-2.1.0 + x11-libs/libXpm x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) @@ -123,7 +124,6 @@ src_configure() { replace-flags "-O3" "-O2" # image format types - # xpm is provided by X itself myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)" # non required X capabilities diff --git a/x11-wm/windowmaker/windowmaker-0.95.3-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.3-r1.ebuild deleted file mode 100644 index 00393ef21deb..000000000000 --- a/x11-wm/windowmaker/windowmaker-0.95.3-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.3-r1.ebuild,v 1.2 2012/08/14 00:43:00 chithanh Exp $ - -EAPI=4 -inherit autotools eutils - -DESCRIPTION="The fast and light GNUstep window manager" -HOMEPAGE="http://www.windowmaker.org/" -SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz - http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -IUSE="gif jpeg nls png tiff modelock xinerama xrandr" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -DEPEND="media-libs/fontconfig - >=x11-libs/libXft-2.1.0 - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXv - gif? ( >=media-libs/giflib-4.1.0-r3 ) - png? ( media-libs/libpng:0 ) - jpeg? ( virtual/jpeg ) - tiff? ( media-libs/tiff:0 ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 )" - -S=${WORKDIR}/${P/windowm/WindowM} - -src_prepare() { - # Fix some paths - for file in WindowMaker/*menu* util/wmgenmenu.c; do - if [[ -r $file ]] ; then - 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; - done; - - epatch "${FILESDIR}"/${P}-fix_underlinking.patch - eautoreconf -} - -src_configure() { - local myconf - - # image format types - # xpm is provided by X itself - 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 xrandr) $(use_enable xinerama)" - - if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - else - myconf="${myconf} --disable-locale" - fi - - # default settings with $myconf appended - econf \ - --sysconfdir="${EPREFIX}"/etc/X11 \ - --with-x \ - --enable-usermenu \ - --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ - --with-nlsdir="${EPREFIX}"/usr/share/locale \ - ${myconf} - - cd ../WindowMaker-extra-0.1 - econf -} - -src_compile() { - emake - - # WindowMaker Extra Package (themes and icons) - cd ../WindowMaker-extra-0.1 - emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ - README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - emake DESTDIR="${D}" install - - newdoc README README.extra - - # create wmaker session shell script - echo "#!/usr/bin/env bash" > wmaker - echo "${EPREFIX}/usr/bin/wmaker" >> wmaker - exeinto /etc/X11/Sessions/ - doexe wmaker - - insinto /usr/share/xsessions - doins "${FILESDIR}"/wmaker.desktop - make_desktop_entry /usr/bin/wmaker -} diff --git a/x11-wm/windowmaker/windowmaker-0.95.4-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.4-r1.ebuild deleted file mode 100644 index dd2ab3100f9e..000000000000 --- a/x11-wm/windowmaker/windowmaker-0.95.4-r1.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.4-r1.ebuild,v 1.2 2013/07/27 20:22:05 aballier Exp $ - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="The fast and light GNUstep window manager" -HOMEPAGE="http://www.windowmaker.org/" -SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz - http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -IUSE="gif jpeg nls png tiff modelock xinerama xrandr" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -DEPEND="media-libs/fontconfig - >=x11-libs/libXft-2.1.0 - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXv - gif? ( >=media-libs/giflib-4.1.0-r3 ) - png? ( media-libs/libpng:0= ) - jpeg? ( virtual/jpeg ) - tiff? ( media-libs/tiff:0 ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 )" - -S=${WORKDIR}/${P/windowm/WindowM} - -src_prepare() { - # Fix some paths - for file in WindowMaker/*menu* util/wmgenmenu.c; do - if [[ -r $file ]] ; then - 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; - done; - - epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch - eautoreconf -} - -src_configure() { - local myconf - - # image format types - # xpm is provided by X itself - 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 xrandr) $(use_enable xinerama)" - - if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - else - myconf="${myconf} --disable-locale" - fi - - # default settings with $myconf appended - econf \ - --sysconfdir="${EPREFIX}"/etc/X11 \ - --with-x \ - --enable-usermenu \ - --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ - --with-nlsdir="${EPREFIX}"/usr/share/locale \ - ${myconf} - - cd ../WindowMaker-extra-0.1 - econf -} - -src_compile() { - emake - - # WindowMaker Extra Package (themes and icons) - cd ../WindowMaker-extra-0.1 - emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ - README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - emake DESTDIR="${D}" install - - newdoc README README.extra - - # create wmaker session shell script - echo "#!/usr/bin/env bash" > wmaker - echo "${EPREFIX}/usr/bin/wmaker" >> wmaker - exeinto /etc/X11/Sessions/ - doexe wmaker - - insinto /usr/share/xsessions - doins "${FILESDIR}"/wmaker.desktop - make_desktop_entry /usr/bin/wmaker -} diff --git a/x11-wm/windowmaker/windowmaker-0.95.4.ebuild b/x11-wm/windowmaker/windowmaker-0.95.4.ebuild deleted file mode 100644 index b12a343a8bb7..000000000000 --- a/x11-wm/windowmaker/windowmaker-0.95.4.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.4.ebuild,v 1.1 2013/01/10 10:41:46 voyageur Exp $ - -EAPI=4 -inherit autotools eutils - -DESCRIPTION="The fast and light GNUstep window manager" -HOMEPAGE="http://www.windowmaker.org/" -SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz - http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -IUSE="gif jpeg nls png tiff modelock xinerama xrandr" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -DEPEND="media-libs/fontconfig - >=x11-libs/libXft-2.1.0 - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXv - gif? ( >=media-libs/giflib-4.1.0-r3 ) - png? ( media-libs/libpng:0 ) - jpeg? ( virtual/jpeg ) - tiff? ( media-libs/tiff:0 ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 )" - -S=${WORKDIR}/${P/windowm/WindowM} - -src_prepare() { - # Fix some paths - for file in WindowMaker/*menu* util/wmgenmenu.c; do - if [[ -r $file ]] ; then - 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; - done; - - epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch - eautoreconf -} - -src_configure() { - local myconf - - # image format types - # xpm is provided by X itself - 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 xrandr) $(use_enable xinerama)" - - if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - else - myconf="${myconf} --disable-locale" - fi - - # default settings with $myconf appended - econf \ - --sysconfdir="${EPREFIX}"/etc/X11 \ - --with-x \ - --enable-usermenu \ - --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ - --with-nlsdir="${EPREFIX}"/usr/share/locale \ - ${myconf} - - cd ../WindowMaker-extra-0.1 - econf -} - -src_compile() { - emake - - # WindowMaker Extra Package (themes and icons) - cd ../WindowMaker-extra-0.1 - emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ - README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - emake DESTDIR="${D}" install - - newdoc README README.extra - - # create wmaker session shell script - echo "#!/usr/bin/env bash" > wmaker - echo "${EPREFIX}/usr/bin/wmaker" >> wmaker - exeinto /etc/X11/Sessions/ - doexe wmaker - - insinto /usr/share/xsessions - doins "${FILESDIR}"/wmaker.desktop - make_desktop_entry /usr/bin/wmaker -} diff --git a/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild index 3b1fdc60575f..0f20ba61d7fc 100644 --- a/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild +++ b/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild,v 1.7 2014/05/17 14:06:09 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.5-r1.ebuild,v 1.8 2015/01/21 09:59:33 voyageur Exp $ EAPI=5 inherit autotools eutils @@ -18,6 +18,7 @@ KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd DEPEND="media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu + x11-libs/libXpm x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) @@ -50,7 +51,6 @@ src_configure() { local myconf # image format types - # xpm is provided by X itself myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)" # non required X capabilities diff --git a/x11-wm/windowmaker/windowmaker-0.95.5.ebuild b/x11-wm/windowmaker/windowmaker-0.95.5.ebuild deleted file mode 100644 index 70fb619eead1..000000000000 --- a/x11-wm/windowmaker/windowmaker-0.95.5.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.5.ebuild,v 1.1 2013/09/13 23:43:48 voyageur Exp $ - -EAPI=5 -inherit autotools eutils - -DESCRIPTION="The fast and light GNUstep window manager" -HOMEPAGE="http://www.windowmaker.org/" -SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz - http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz" - -SLOT="0" -LICENSE="GPL-2" -IUSE="gif jpeg nls png tiff modelock xinerama xrandr" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -DEPEND="media-libs/fontconfig - >=x11-libs/libXft-2.1.0 - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXv - gif? ( >=media-libs/giflib-4.1.0-r3 ) - png? ( media-libs/libpng:0= ) - jpeg? ( virtual/jpeg ) - tiff? ( media-libs/tiff:0 ) - xinerama? ( x11-libs/libXinerama ) - xrandr? ( x11-libs/libXrandr )" -RDEPEND="${DEPEND} - nls? ( >=sys-devel/gettext-0.10.39 )" - -S=${WORKDIR}/${P/windowm/WindowM} - -src_prepare() { - # Fix some paths - for file in WindowMaker/*menu* util/wmgenmenu.c; do - if [[ -r $file ]] ; then - 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; - done; - - epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch - eautoreconf -} - -src_configure() { - local myconf - - # image format types - # xpm is provided by X itself - 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 xrandr) $(use_enable xinerama)" - - if use nls; then - [[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" - else - myconf="${myconf} --disable-locale" - fi - - # default settings with $myconf appended - econf \ - --sysconfdir="${EPREFIX}"/etc/X11 \ - --with-x \ - --enable-usermenu \ - --with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \ - --with-nlsdir="${EPREFIX}"/usr/share/locale \ - ${myconf} - - cd ../WindowMaker-extra-0.1 - econf -} - -src_compile() { - emake - - # WindowMaker Extra Package (themes and icons) - cd ../WindowMaker-extra-0.1 - emake -} - -src_install() { - emake DESTDIR="${D}" install - - dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \ - README* NEWS TODO - - # WindowMaker Extra - cd ../WindowMaker-extra-0.1 - emake DESTDIR="${D}" install - - newdoc README README.extra - - # create wmaker session shell script - echo "#!/usr/bin/env bash" > wmaker - echo "${EPREFIX}/usr/bin/wmaker" >> wmaker - exeinto /etc/X11/Sessions/ - doexe wmaker - - insinto /usr/share/xsessions - doins "${FILESDIR}"/wmaker.desktop - make_desktop_entry /usr/bin/wmaker -} diff --git a/x11-wm/windowmaker/windowmaker-0.95.6.ebuild b/x11-wm/windowmaker/windowmaker-0.95.6.ebuild index b4bf46ad693e..45e1dcc258b3 100644 --- a/x11-wm/windowmaker/windowmaker-0.95.6.ebuild +++ b/x11-wm/windowmaker/windowmaker-0.95.6.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.6.ebuild,v 1.2 2014/09/03 21:30:00 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.6.ebuild,v 1.3 2015/01/21 09:59:33 voyageur Exp $ EAPI=5 inherit autotools eutils @@ -12,12 +12,13 @@ SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz SLOT="0" LICENSE="GPL-2" -IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama xrandr" +IUSE="gif imagemagick jpeg modelock nls png tiff webp xinerama +xpm xrandr" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" DEPEND="media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu + x11-libs/libXpm x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) @@ -51,8 +52,7 @@ src_configure() { local myconf # image format types - # xpm is provided by X itself - myconf="--enable-xpm $(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp)" + myconf="$(use_enable imagemagick magick) $(use_enable jpeg) $(use_enable gif) $(use_enable png) $(use_enable tiff) $(use_enable webp) $(use_enable xpm)" # non required X capabilities myconf="${myconf} $(use_enable modelock) $(use_enable xrandr randr) $(use_enable xinerama)"