diff options
author | Ian Stakenvicius <axs@gentoo.org> | 2014-11-12 16:39:49 +0000 |
---|---|---|
committer | Ian Stakenvicius <axs@gentoo.org> | 2014-11-12 16:39:49 +0000 |
commit | 9c9cfdc0a88330c904de34e33e87b9bf850f50b2 (patch) | |
tree | 0476b37cabfbd7cbf4d7dd9a92a00400919c6081 /app-emulation | |
parent | Drop unconditional dep on dev-libs/apr. (diff) | |
download | historical-9c9cfdc0a88330c904de34e33e87b9bf850f50b2.tar.gz historical-9c9cfdc0a88330c904de34e33e87b9bf850f50b2.tar.bz2 historical-9c9cfdc0a88330c904de34e33e87b9bf850f50b2.zip |
fixed gx86-multilib deps
Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED
Diffstat (limited to 'app-emulation')
18 files changed, 969 insertions, 1143 deletions
diff --git a/app-emulation/crossover-bin/ChangeLog b/app-emulation/crossover-bin/ChangeLog index 450000c74519..14daa7b0f2c7 100644 --- a/app-emulation/crossover-bin/ChangeLog +++ b/app-emulation/crossover-bin/ChangeLog @@ -1,6 +1,34 @@ # ChangeLog for app-emulation/crossover-bin # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/ChangeLog,v 1.14 2014/08/23 21:13:56 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/ChangeLog,v 1.15 2014/11/12 16:39:44 axs Exp $ + +*crossover-bin-13.0.1-r1 (12 Nov 2014) +*crossover-bin-13.2.0-r1 (12 Nov 2014) +*crossover-bin-12.5.1-r1 (12 Nov 2014) +*crossover-bin-12.1.2-r2 (12 Nov 2014) +*crossover-bin-13.1.0-r1 (12 Nov 2014) +*crossover-bin-13.1.3-r1 (12 Nov 2014) +*crossover-bin-12.2.0-r2 (12 Nov 2014) +*crossover-bin-13.1.2-r1 (12 Nov 2014) +*crossover-bin-13.0.0-r1 (12 Nov 2014) +*crossover-bin-12.5.0-r1 (12 Nov 2014) +*crossover-bin-12.2.2-r1 (12 Nov 2014) +*crossover-bin-12.2.1-r2 (12 Nov 2014) + + 12 Nov 2014; Ian Stakenvicius (_AxS_) <axs@gentoo.org> + +crossover-bin-12.1.2-r2.ebuild, +crossover-bin-12.2.0-r2.ebuild, + +crossover-bin-12.2.1-r2.ebuild, +crossover-bin-12.2.2-r1.ebuild, + +crossover-bin-12.5.0-r1.ebuild, +crossover-bin-12.5.1-r1.ebuild, + +crossover-bin-13.0.0-r1.ebuild, +crossover-bin-13.0.1-r1.ebuild, + +crossover-bin-13.1.0-r1.ebuild, +crossover-bin-13.1.2-r1.ebuild, + +crossover-bin-13.1.3-r1.ebuild, +crossover-bin-13.2.0-r1.ebuild, + -crossover-bin-12.1.2-r1.ebuild, -crossover-bin-12.2.0-r1.ebuild, + -crossover-bin-12.2.1-r1.ebuild, -crossover-bin-12.2.2.ebuild, + -crossover-bin-12.5.0.ebuild, -crossover-bin-12.5.1.ebuild, + -crossover-bin-13.0.0.ebuild, -crossover-bin-13.0.1.ebuild, + -crossover-bin-13.1.0.ebuild, -crossover-bin-13.1.2.ebuild, + -crossover-bin-13.1.3.ebuild, -crossover-bin-13.2.0.ebuild: + fixed gx86-multilib deps *crossover-bin-13.0.1 (23 Aug 2014) *crossover-bin-13.1.3 (23 Aug 2014) diff --git a/app-emulation/crossover-bin/Manifest b/app-emulation/crossover-bin/Manifest index 0966354d0cff..fd00e8ecbe56 100644 --- a/app-emulation/crossover-bin/Manifest +++ b/app-emulation/crossover-bin/Manifest @@ -13,34 +13,24 @@ DIST install-crossover-13.1.0.bin 58678679 SHA256 76e4345c6b9c436b7f02ab39b15b5f DIST install-crossover-13.1.2.bin 58730543 SHA256 005a0ed9e102c54c3b204491406bfad889603c59ef5be1ec1b5a3f68a1f6bba2 SHA512 5944db06162a67f68fa4a1ab14f7fbc41f114c63adebecf4c0c50967245f81bb42e58dbe66d33fbfaaeae232aacb2b534fc4367d592eaa6f1cc75e32ec0d23b3 WHIRLPOOL e26a0f3a59d3d06b6001f2672d511d0917afa576b4cf9f781a3c7eaffb2e7fb479cdcaeae98fa0d38873bf749bbe33b6695f1dd3496f4087691332b569e484ef DIST install-crossover-13.1.3.bin 58768110 SHA256 3d16dbecec584a1d6155ddda6f62a5824980cddc25f5910c2c733de06a716b04 SHA512 091a70e777f8311f818d227f26850f256d6acc7f50c93855f72857f2e21298524262d490fcc8a97342faea1a261ab042b0064d112aacb6c30e9ab5301f89eabe WHIRLPOOL aaffeb604d929b3b4611707cb7878a961c8a2f17baafc4f58dc293d3b29e5485246847327dcf441353ff3feeed76fd7c2f34a516ebeafb2fedee3567d8cdb485 DIST install-crossover-13.2.0.bin 64625581 SHA256 ef29ca8ca275e4fb6b33337aadc2d3ee92b4dc7d582fab7d5cff5c775d23c75d SHA512 1f582eeca8db02c15d98d519b2d24f65b8dcddd90ff270915a4e6dbd24e135b074c5a20dd824c3d8c8f35cef79610c02423b5558db205a6e80630f69191e051b WHIRLPOOL f8ce0628d961a567291981a238f03da6f5f7554d4d971a8b27fc34b67969a7061032b84325df1a8e38313415dcda3dab98acd6833b396e4f46a65427c9dc8c3e -EBUILD crossover-bin-12.1.2-r1.ebuild 4340 SHA256 0284f4537f623669480ce9a4766906158f85e2c6fc538c23ce6eba7d2fc86407 SHA512 059ac7e1de8fff5df37d700883c4c5ea131d10f902ff97a518a16eb86bf6aa82623c47998cfaba8e531bcd720137b93a17b312239a53643309ce767464a24bb2 WHIRLPOOL 530b6090d6a680cbc2bfc3827156ee5ae4c4a4e6c259a68ee755074b8bc7e040fd71469b604d362b6e962476c703eaf545c9ac540c16c198bb6cc2b3644148d8 -EBUILD crossover-bin-12.2.0-r1.ebuild 4340 SHA256 44c3ba566a1448c01e5c1720fd9c09eef4574d28366ac40ad38e8904c59d6ad1 SHA512 7e1cd729b711b3c303ec0c1c4c0155848c73a4b10357c84edabf42ec858c0f659324762e46ae5082a95ed0760e5a6bf9bc2daf8bb3b08163a8bb7c1975ee6262 WHIRLPOOL 3842e7bc62fe323dea464329567c68dfd285a2e160dd552ddb5ba57f204127dd5cc58fa175021599ed28396031f3d555485c4204b30db17b5dafe337b5210da8 -EBUILD crossover-bin-12.2.1-r1.ebuild 4301 SHA256 3665571e2ad57bd98d86fd37efbfcd2f6b776a2251cbc441ff1142023407aa50 SHA512 d9eefe9c82f7396ee5e93d3fcc25e71862430096237a90997333198e2211d6657c633f3659b4d9e2b711385d1730e7b87a6fc156d33ed687c355395fc9e0570f WHIRLPOOL b5db12f9b2145b92c1ae317b641dc6d38ebd86683273ad333b76093138ab5c5d10b9578852e3e3990a3859001af1e7efad2180d46abbfc208590941b4c622096 -EBUILD crossover-bin-12.2.2.ebuild 4298 SHA256 8f898f540d9ef2796439c45269ce909a2a1549ebda45b8ccee92fd131afe4855 SHA512 e2fdca8b49e70f1453eaedceccb8b1d1d837932ada9191214c9fe5c3000d79b0e6e77cdc1991f6b585de974cf6ced331c48106164a648adc037518cd590230f8 WHIRLPOOL d64341aaec994f421a377a3e91d61d09aba94b9b93e2b151a810ba0ea8ba813ea8dd43f7f1974b5604406273b601aedcd9b278c7d4402b6932d88a134c970957 -EBUILD crossover-bin-12.5.0.ebuild 4298 SHA256 a5c009e499fd267106f84da9cfabf0b8cc81cbd755f89f4eb9a33ea6fee142cb SHA512 154f27485efb626dd9c4b53561dc0ef919da2a459831427182f5997c1607c22c3fc01333983da4248b143c3c1bdad03e6f867bdfbcd522f20a0ac53afa1e0920 WHIRLPOOL 0a594b41d99acd5fee5699f33dc2c2371a1c65d517924ded7e3f3e40e71766992a69bb6750ad3a1de336326dceadd7b999fd5db73a843efee6b48314ba6adf52 -EBUILD crossover-bin-12.5.1.ebuild 4296 SHA256 75cb49bf823ef5c395ee3bb22bd01021711c2fed418025951df31e7c27503589 SHA512 83deddf9c256aa6be1ab531599b1ab93c97099b010350fbef12634169b92e927bb0ff2ce7b10cd85b0f2a3ae1540a4aa676fe8c306f6762ff81222c9c38bdbf5 WHIRLPOOL 42a50b07e342316040bafff8051a5616d93a6e20f597bb635fe3057dd947d68b1866191c0172386b44926091f0349a9e0e36dda79ee78224ee698b308684c29a -EBUILD crossover-bin-13.0.0.ebuild 4296 SHA256 263d749ad92a086cdaa8609feedec63506e446e06db9f3c406ab3bd72d52166e SHA512 4068ae122933bfbc0f9cf3428d9e73c3107f7e29d0fbd7ca28d5aea1fb1c32bef53f6eb655916650786db5ad11345f34afe45b1d2995f87934430e334ded04a1 WHIRLPOOL c5fa1afb177d5ae8fc7e6f6fdedc38b766a35ac7df056aa082859019ca816f12d1489c66578f6caae558bd2e69806e5e7e631259459d406386b54ebaf2aaad1f -EBUILD crossover-bin-13.0.1.ebuild 4296 SHA256 4934c36cdfae76042a7b2c5877a331bb91ed6ada2ae6d199530e8c8fcd606f74 SHA512 de0e090deaffb53b25eca71834ffde9979b60c7cfe9206ba9d5d12b91ffd1d8c0c1e314a0744cf512c0d51e63f1ec6a4da62236d33dbb58bae0db21ebf061a60 WHIRLPOOL fb4294bf244cb418cdc6460df6465f50f379daf29717cec4afaf005e0a98302847867ad531be971fb3a03e5d5a57ced925a67ca192b045b6cfe13904005edc35 -EBUILD crossover-bin-13.1.0.ebuild 4296 SHA256 c9468a91e8daacdcc4fffbd75ab80bb37848f167d59fff44aa8412fc11272a8e SHA512 072a1bd090b1cec720c7b9a26af0dd7c25414612747bb2e9496812692e76f97046fa5a7ea1f46ab350f1bdfcf4dcfdb2a2121cd2fb008e363b386b32222091d7 WHIRLPOOL 0a1711f427168e6c45fa15e1e686af5dbce694e4c3569a779190393bda891daa3510f5be131935eed0d700815dff9447b46b3c451a5f4d244c65d70770041951 -EBUILD crossover-bin-13.1.2.ebuild 4296 SHA256 c29d9003d987e0ef44e6438637511bfdfd598c2633f2b31b0d073c7704847945 SHA512 db4808842a2e2d71714a3bef886063f533941500af6f31208227054066f3cf7333f9bd8ecb5a4f6e9ef7fb8a736023c7e7e4e751c8691068365e12b56a252c4a WHIRLPOOL b6cb5c2e8c3ed6d9bcebfb3e5d17b0a5da21c288bbc273fd498ac2668794cb78edb19b0245a0b6881761a96ea11557072b0e4b73b046f88ccf75cfcc45a5dae8 -EBUILD crossover-bin-13.1.3.ebuild 4296 SHA256 316023a680ac6892eb42467e8265d0d95606ea3fbfa091fecb656491b676d72d SHA512 9ba6a54a4c99fc7914771325d8778614c0df2f9d325f78c392b45c6ca0aace25255dcd5e632e8aae234e8afcf00bc2c9811d48d6f515e680156e5f72e2663b86 WHIRLPOOL fa856ed55fde4a8cc2feea9284c086e2cd6fc994cac602d55eebd2f44bfee0dde260e8c6b055847981e5befbb9ddbc0a70b07c07f9dc8552ce0e9ba21526f966 -EBUILD crossover-bin-13.2.0.ebuild 4296 SHA256 4ad8cb8c979afaeeaf71441ba2a3ef011adb0722c6273dfa292785a21ed11697 SHA512 dd0cadceb1ab2c65fe7c127991650ee50a04af26bbb387e50b63e1e239dc650b26d5b8a80772e901b4cc1dac6cef03538b94f06ee015c5b4bdd2574bb5032f50 WHIRLPOOL 2014fe0c37a66481e0f66563c760f43a91398c5a4fe1f265e3afe08c21e9c3ef498edb2ff83f3462af7e79c720aacce0bbfedcf211d511ff205f7ce6ab8f1a6f -MISC ChangeLog 3457 SHA256 cf50c2249cfaf6a54596b18efee237608624dbc221a5964faa2e595b99e92a8e SHA512 51d7b46354f4568f939c9e6bbe54e2ac04a8dbb04729e074718efbdc5160bc006cddad1d8968db9c344deed2dc8d69498fa0830bd45b7b8cf437e714acb805a5 WHIRLPOOL 6af1ec989a19cb915d5aaaa719b6c4f6dc38a5ddce9bf5281bfa4943fa2b3cf2a9bc587073c5507b1c6751833422f9b5c2cead57d6ace792a00a6dafe6384f44 +EBUILD crossover-bin-12.1.2-r2.ebuild 4413 SHA256 70b831762ca49f9af8ef32953e2e1e5b052e9b06dc11cf9a412b0817614d6392 SHA512 a42772b7848384959829d90b74e29bb5ac07fe48b82abcaca468a9fe69d9f87a7b68a61bd9d2441b21f290e774ff84bbfd5262ffb21789dabb70ba434b896911 WHIRLPOOL d640e94527589beb1df5b936ab5527b4034235a6a14161ff42472fc480d810623952de45949c986f295d551b71796e43822791617605cfd268696d72f19ac5ce +EBUILD crossover-bin-12.2.0-r2.ebuild 4413 SHA256 21aa48da8b756402f020871631a72727b599ecc5ca62a70850b20b504dfa4345 SHA512 bc199b17183d4d34bb69ad926e220064e3586da161628c3048ea2a9802de58d1c333cc73d74e16eb7e84cdf1a751d01042f95ed9364c0eb2f441229d9a9134db WHIRLPOOL 63e89bf4af18a700279912b73267d76f47d6ef64c23ede38d98f605229203c2eb19247ad23f3ceb5c9ab2cf4632bfe4579e6a40c8507e4cb2420c7a11e0c7491 +EBUILD crossover-bin-12.2.1-r2.ebuild 4374 SHA256 1719dfc996191d143cc4cf25a4be36045ad58c23a883cba251e5004fb453edcd SHA512 f60cf040442f2f8b5eac826268dfd1426b356ca2a75dc44ade62666a0758f358a35fce3818517514286bc2f841004f46d60160aa0d97515bb98633c508ce139f WHIRLPOOL e05911c861e1931e127da7d180404eda5471965afcbb5ca03f491504ab0e31744dc6285672dc5cd38c49b1b8dba2732af729252a946e864bc7e2844c1b347ce1 +EBUILD crossover-bin-12.2.2-r1.ebuild 4374 SHA256 76349efd265871d6c34c21619246928b71aff69cc43a883150af68760325a953 SHA512 dc50658cde773b53c17e7a6b2eaf4f8e5c3a96ca61fb163591761552e9faff7bc972e9aabeef30bd8f84e0fffcb2f3784c9e2602f918ee288a5339885c5d6529 WHIRLPOOL ef15cb10348b21914757ebabe93a0a591312d9e675f1adfdb15624d387b51f26395a95498ab71a09ca92266399a0861fd1b4ec0f34b5dc8616dc255bbd492ef1 +EBUILD crossover-bin-12.5.0-r1.ebuild 4374 SHA256 1b81baaa215ecbe27247732dc5533137145f9f459eda42651e9270e0b0c5ad23 SHA512 d71c7c9110be65e88edd4979c8bdda269f81eee629d68cff596eaae2e3e736810ddbd48f25ee237d708d0a8cf027db006bd3cc58e8f6ef15c7a15fbd105a028d WHIRLPOOL 14b739ebc39dcdcb388c16770dcc5160006a1b1c02a5bf3eabf308c66e22bf257da24033c88f9672f2d89d155887168b1ad5c2a218ba148c5666a617e6a4beaa +EBUILD crossover-bin-12.5.1-r1.ebuild 4375 SHA256 aa7ff4d4dba14fc38fdbc43b33d2bd60a8cd95a3fe5c1d71f34cf994c8ecd94e SHA512 abfa72df5023a560e2827fb0fa91ffc1fb7979a41b826b421c3dad197910d656a6d514a7cb3d1b812a50310d6ffef52a80ff18087ed111f27acc18e43fe0dd47 WHIRLPOOL 5ffc41fe800e442c2cfa98339d43300c3dd2f15badc422bafc81b5da27f73a35d06a680f475006d071e827a0100935ea00b2eed2ea921b02f40ac2a5cffa2eba +EBUILD crossover-bin-13.0.0-r1.ebuild 4375 SHA256 b7f432e8ea0834a12519fb8d04a1f5f32e4c093431e6db68a68db41bc6816b22 SHA512 1f43bf2c054096918e353b54504fab65f8a9f1a484a153e7cdb37cbd8aa9fe9d46018fb4cd1e07322a16e7d723110e4418c9a0b43e71aee5c1c0fbecede0b9b2 WHIRLPOOL 14523faf74d815e7b7298a6e162e661dabc46d84518972326590efd5131a5a6babf096d4cc48d8858d2c58e9c2cbd9abb0957fcbc6d47481f6af91f82ce239c4 +EBUILD crossover-bin-13.0.1-r1.ebuild 4375 SHA256 a6ef95592b78d754302449bf4205edd02c61df80607d0ac4d95573c6c4e54a72 SHA512 c6bd86fe1bc7db29902f1dccf670df5da2c3d48f7047ba39258b0b4211f31b4d33d0d748d1141a4008358d80a1e5b5e4db8c9f9e28285ebb814a364044ab4903 WHIRLPOOL 76968d3559f87306ad39b823b3585cb487681d68f346c8751e54a746b2da12283da27406286d4036822b462ec048d5beaaa792d20ad1d9233cc437ed511a2bde +EBUILD crossover-bin-13.1.0-r1.ebuild 4375 SHA256 fad6dff0da99cba6955051e6c86c4cb49387493842d82675ff8a39ae5967964e SHA512 f64c0c380d3953fcb1dfa4aa74f50212266a6a58dce181d66437bcdd022a50dca2724bc54abd7c045b3a39908ae3c5a2520999ef12076cf06dd4ad6931b8400c WHIRLPOOL acd146d8c3b4a537a88f83b7ace6f45c8b5a1ae6b55181a811c528dc642ff534f8b236d3ae26f0f75708a16dcfa976e7b23c39fca30e33f2a272175a3df619c7 +EBUILD crossover-bin-13.1.2-r1.ebuild 4375 SHA256 ea4380c829836d04f1f14c92ca081080147830481d81047a865a37c0db872f1e SHA512 4e3e2737ed0cc7e9a0095a194b97767aee3258fd93b6118eee1fa4d988ed1cb7649e639e9a56866f7c12745f6bc80266afdad2eecbc55444bc172f955189ffa4 WHIRLPOOL ef01646b8cb9dd4d15b407e98c59e79ad94fe834f3985885305f3dee7a7219c8eac51d9eb85ee6dd6754da1837571a752a10d2fe8484081727349fac5b4fc39a +EBUILD crossover-bin-13.1.3-r1.ebuild 4375 SHA256 48df92a72042c7f75402a2a4b4a583ff616dc253d23ffa500d3e6370757137df SHA512 e8fe881ac3c7a1fc7f1a303a1c84a5d3290f37a8d6dcafe09ad35ae122cc510537705fd24ba3681d7fa3762fe42254e27422c6faf6481a82a474dc8eaa86d8a7 WHIRLPOOL 9ad878815dfa02c75d252c240b427be1274c748879f2b09806764decaea1931531b9a29b989f7b123a5acdf0dd50c97729b1a1034dff5ab4e6865f176b24f896 +EBUILD crossover-bin-13.2.0-r1.ebuild 4375 SHA256 9e53217912787b667fe21558c1e102575cb110cc7f9b2cea1930c14fe54e2430 SHA512 be2bb0ab3c4a2a833ca810d22862975ac0a8645a330c21111076804179a3c09c27aa3f8201509a7877cb77cd0ed473e50169edf2cc4a0921dff1072cc65d242f WHIRLPOOL aa832de2c132c72f6eebb68102b238d1c675246567daed66db27e071c8d86c06e7dfddc3e7200b24c20cb7aaebf3815d27175b99493b77a805a92d965bf18d20 +MISC ChangeLog 4799 SHA256 4cff82e2b112b8ac76eb0ed08e7e446d6e28b95aefa38f076e2c26bf5f5a415b SHA512 d7ada2bd571d3c2cf88072fca3f44b2a3d621c9e89d6d80c125ad8934ed9d7523cb3fe04986dd83a8044622a0f00fcd71dea45480a4081039c0b9ef195a8d80b WHIRLPOOL f11016664fbb238df4a638e3de170af077a88973d962457a3bf6bff76bc6ed7be52aae561c6a296d8bc276431509dc923dafecbc3b941a96e1e2f8b42f17803c MISC metadata.xml 299 SHA256 1418809370ffded84700af60fec9e68cee312b0ce73f9668bc1763e00ff864cd SHA512 d95909115fce9cf70adb5cc7dd62c25ef58b6231a58959a61e08e848c2b994bdd51cf34d68484dce56d69b5f036b97e5f9f38ea34f123730372d37a099310c0d WHIRLPOOL 495e4b3f33c8fed584f84164ab271e44e1ff43ef5fab737c23de2156fd56bc4a51e6aa95cf8325cdb98c17e40d9fc1d56eb5d91aca2c2090be7119f017fdf693 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJT+QQRAAoJECDuEZm+6ExkOM4P/0MLj+1pYsj+z+4sh3LAfc3O -cpbQWluLqSh3L0ZKB7kjK7+2tRsPDfpK9Lte5lhLMyh94Bfu0pxkNMe6fRkq2bl6 -KlIfGtt7jXnZ1LevjAA7LbobYa6JY9PPKnem0xn4L2DRCZazuS0BOYj9IKiBi/8m -p+xSj3N/yfUlZj+LwGkKnZ5MKM1uLCr7tiGMUfZeM1CkYX9gfPszg5uE+sCjpuJA -bh3l6htUd3qsLUnzU3JENPZ8/xTkPEhjx2hcAYdJySRI6gS5mGfvllz5o0a6eyV7 -6EpSgI/ifj5FtSLvqRHCXmzIDzQwdyJckDXBQSdd4Oy6pFDj0lUCVG28Zdt7TSeb -PNwXEAHGk5y9fkH7eqzd1+SchDc9K2LErAtD+JHYfE7p4DAzvHdoIEoX7FOi17CY -DgJ+rDYwNeUuW/4bVt3RA2TH7idGaDPN/tUmrh53jLSkvJxUe90Xs9M/Zz2kd/E7 -0aPtJaehYXo1x3/63sEhMjBupNext9uGnJdkoheYAZgeR4vqYDcBCCu3TBwtM6/3 -CMDyp57NGYlOl9mfxSyuspoYBZu8NqsY3LKB+OXAlYLDlpu6DVingn8rCG71Q0zp -eHAaC8vUsDpye2iAEMvP2Qa875MjFdrkbya4wKMcdIZf+JZywP6RPXgiQVR9OB/i -OpO8q/P85LO5EE4CwMsg -=5JBG +iF4EAREIAAYFAlRjjVYACgkQ2ugaI38ACPDUOgEAq+ZvFDdQxZ/LNGDmV+1nh+LA +tWYU+wcoZHRT6sFwSp0A/RO5GTiLf1O81jpbkNQvakp3R27VmOxXYJkIelUSqS9o +=xzR4 -----END PGP SIGNATURE----- diff --git a/app-emulation/crossover-bin/crossover-bin-12.1.2-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-12.1.2-r2.ebuild index 69213fa215c3..9345a0c432fe 100644 --- a/app-emulation/crossover-bin/crossover-bin-12.1.2-r1.ebuild +++ b/app-emulation/crossover-bin/crossover-bin-12.1.2-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.1.2-r1.ebuild,v 1.4 2014/08/06 06:44:37 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.1.2-r2.ebuild,v 1.1 2014/11/12 16:39:44 axs Exp $ -EAPI="5" +EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) PYTHON_REQ_USE="threads" @@ -30,66 +30,51 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.* " S="${WORKDIR}" -MLIB_DEPS="amd64? ( - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-soundlibs - || ( - ( - >=media-libs/freetype-2.5.0.1[abi_x86_32] - >=x11-libs/libICE-1.0.8-r1[abi_x86_32] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXau-1.0.7-r1[abi_x86_32] - >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] - >=x11-libs/libxcb-1.9.1[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) -)" - -X86_DEPS="x86? ( +REGULAR_DEPS=" capi? ( net-dialup/capi4k-utils ) - cups? ( net-print/cups ) - gsm? ( media-sound/gsm ) - jpeg? ( virtual/jpeg ) + cups? ( net-print/cups[abi_x86_32(-)] ) + gsm? ( media-sound/gsm[abi_x86_32(-)] ) + jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:0 ) - ldap? ( net-nds/openldap ) - gphoto2? ( media-libs/libgphoto2 ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - openal? ( media-libs/openal ) + ldap? ( net-nds/openldap[abi_x86_32(-)] ) + gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) + mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) + nls? ( sys-devel/gettext[abi_x86_32(-)] ) + openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( - virtual/glu - virtual/opengl + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] ) - png? ( media-libs/libpng:0 ) - scanner? ( media-gfx/sane-backends ) - ssl? ( dev-libs/openssl:0 ) - v4l? ( media-libs/libv4l ) - media-libs/alsa-lib - >=media-libs/freetype-2.0.0 - media-libs/mesa - sys-apps/util-linux - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libxcb - )" + png? ( media-libs/libpng:0[abi_x86_32(-)] ) + scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) + ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/freetype-2.0.0[abi_x86_32(-)] + media-libs/mesa[abi_x86_32(-)] + sys-apps/util-linux[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrandr[abi_x86_32(-)] + x11-libs/libXxf86vm[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] +" + +EMUL_DEPS=" + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) + opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) + scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) + v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) +" DEPEND="dev-lang/perl app-arch/unzip @@ -102,8 +87,7 @@ RDEPEND="${DEPEND} dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin - ${MLIB_DEPS} - ${X86_DEPS} + || ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) ) " REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/app-emulation/crossover-bin/crossover-bin-12.2.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-12.2.0-r2.ebuild index 1c1740ed4b0c..df4db84279ed 100644 --- a/app-emulation/crossover-bin/crossover-bin-12.2.0-r1.ebuild +++ b/app-emulation/crossover-bin/crossover-bin-12.2.0-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.2.0-r1.ebuild,v 1.4 2014/08/06 06:44:37 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.2.0-r2.ebuild,v 1.1 2014/11/12 16:39:44 axs Exp $ -EAPI="5" +EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) PYTHON_REQ_USE="threads" @@ -30,66 +30,51 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.* " S="${WORKDIR}" -MLIB_DEPS="amd64? ( - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-soundlibs - || ( - ( - >=media-libs/freetype-2.5.0.1[abi_x86_32] - >=x11-libs/libICE-1.0.8-r1[abi_x86_32] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXau-1.0.7-r1[abi_x86_32] - >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] - >=x11-libs/libxcb-1.9.1[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) -)" - -X86_DEPS="x86? ( +REGULAR_DEPS=" capi? ( net-dialup/capi4k-utils ) - cups? ( net-print/cups ) - gsm? ( media-sound/gsm ) - jpeg? ( virtual/jpeg ) + cups? ( net-print/cups[abi_x86_32(-)] ) + gsm? ( media-sound/gsm[abi_x86_32(-)] ) + jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:0 ) - ldap? ( net-nds/openldap ) - gphoto2? ( media-libs/libgphoto2 ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - openal? ( media-libs/openal ) + ldap? ( net-nds/openldap[abi_x86_32(-)] ) + gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) + mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) + nls? ( sys-devel/gettext[abi_x86_32(-)] ) + openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( - virtual/glu - virtual/opengl + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] ) - png? ( media-libs/libpng:0 ) - scanner? ( media-gfx/sane-backends ) - ssl? ( dev-libs/openssl:0 ) - v4l? ( media-libs/libv4l ) - media-libs/alsa-lib - >=media-libs/freetype-2.0.0 - media-libs/mesa - sys-apps/util-linux - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libxcb - )" + png? ( media-libs/libpng:0[abi_x86_32(-)] ) + scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) + ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/freetype-2.0.0[abi_x86_32(-)] + media-libs/mesa[abi_x86_32(-)] + sys-apps/util-linux[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrandr[abi_x86_32(-)] + x11-libs/libXxf86vm[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] +" + +EMUL_DEPS=" + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) + opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) + scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) + v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) +" DEPEND="dev-lang/perl app-arch/unzip @@ -102,8 +87,7 @@ RDEPEND="${DEPEND} dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin - ${MLIB_DEPS} - ${X86_DEPS} + || ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) ) " REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/app-emulation/crossover-bin/crossover-bin-12.2.1-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-12.2.1-r2.ebuild index 35300c624050..c3f9132062b3 100644 --- a/app-emulation/crossover-bin/crossover-bin-12.2.1-r1.ebuild +++ b/app-emulation/crossover-bin/crossover-bin-12.2.1-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.2.1-r1.ebuild,v 1.4 2014/08/06 06:44:37 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.2.1-r2.ebuild,v 1.1 2014/11/12 16:39:44 axs Exp $ -EAPI="5" +EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) PYTHON_REQ_USE="threads" @@ -30,66 +30,51 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.* " S="${WORKDIR}" -MLIB_DEPS="amd64? ( - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-soundlibs - || ( - ( - >=media-libs/freetype-2.5.0.1[abi_x86_32] - >=x11-libs/libICE-1.0.8-r1[abi_x86_32] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXau-1.0.7-r1[abi_x86_32] - >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] - >=x11-libs/libxcb-1.9.1[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) -)" - -X86_DEPS="x86? ( +REGULAR_DEPS=" capi? ( net-dialup/capi4k-utils ) - cups? ( net-print/cups ) - gsm? ( media-sound/gsm ) - jpeg? ( virtual/jpeg ) + cups? ( net-print/cups[abi_x86_32(-)] ) + gsm? ( media-sound/gsm[abi_x86_32(-)] ) + jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:0 ) - ldap? ( net-nds/openldap ) - gphoto2? ( media-libs/libgphoto2 ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - openal? ( media-libs/openal ) + ldap? ( net-nds/openldap[abi_x86_32(-)] ) + gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) + mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) + nls? ( sys-devel/gettext[abi_x86_32(-)] ) + openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( - virtual/glu - virtual/opengl + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] ) - png? ( media-libs/libpng:0 ) - scanner? ( media-gfx/sane-backends ) - ssl? ( dev-libs/openssl:0 ) - v4l? ( media-libs/libv4l ) - media-libs/alsa-lib - >=media-libs/freetype-2.0.0 - media-libs/mesa - sys-apps/util-linux - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libxcb - )" + png? ( media-libs/libpng:0[abi_x86_32(-)] ) + scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) + ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/freetype-2.0.0[abi_x86_32(-)] + media-libs/mesa[abi_x86_32(-)] + sys-apps/util-linux[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrandr[abi_x86_32(-)] + x11-libs/libXxf86vm[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] +" + +EMUL_DEPS=" + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) + opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) + scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) + v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) +" DEPEND="dev-lang/perl app-arch/unzip @@ -102,8 +87,7 @@ RDEPEND="${DEPEND} dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin - ${MLIB_DEPS} - ${X86_DEPS} + || ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) ) " pkg_nofetch() { diff --git a/app-emulation/crossover-bin/crossover-bin-12.2.2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.2.2-r1.ebuild index fb7f29e27fd5..5e2270bd3661 100644 --- a/app-emulation/crossover-bin/crossover-bin-12.2.2.ebuild +++ b/app-emulation/crossover-bin/crossover-bin-12.2.2-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.2.2.ebuild,v 1.3 2014/08/06 06:44:37 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.2.2-r1.ebuild,v 1.1 2014/11/12 16:39:44 axs Exp $ -EAPI="5" +EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) PYTHON_REQ_USE="threads" @@ -30,66 +30,51 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.* " S="${WORKDIR}" -MLIB_DEPS="amd64? ( - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-soundlibs - || ( - ( - >=media-libs/freetype-2.5.0.1[abi_x86_32] - >=x11-libs/libICE-1.0.8-r1[abi_x86_32] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXau-1.0.7-r1[abi_x86_32] - >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] - >=x11-libs/libxcb-1.9.1[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) -)" - -X86_DEPS="x86? ( +REGULAR_DEPS=" capi? ( net-dialup/capi4k-utils ) - cups? ( net-print/cups ) - gsm? ( media-sound/gsm ) - jpeg? ( virtual/jpeg ) + cups? ( net-print/cups[abi_x86_32(-)] ) + gsm? ( media-sound/gsm[abi_x86_32(-)] ) + jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:0 ) - ldap? ( net-nds/openldap ) - gphoto2? ( media-libs/libgphoto2 ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - openal? ( media-libs/openal ) + ldap? ( net-nds/openldap[abi_x86_32(-)] ) + gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) + mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) + nls? ( sys-devel/gettext[abi_x86_32(-)] ) + openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( - virtual/glu - virtual/opengl + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] ) - png? ( media-libs/libpng:0 ) - scanner? ( media-gfx/sane-backends ) - ssl? ( dev-libs/openssl:0 ) - v4l? ( media-libs/libv4l ) - media-libs/alsa-lib - >=media-libs/freetype-2.0.0 - media-libs/mesa - sys-apps/util-linux - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libxcb - )" + png? ( media-libs/libpng:0[abi_x86_32(-)] ) + scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) + ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/freetype-2.0.0[abi_x86_32(-)] + media-libs/mesa[abi_x86_32(-)] + sys-apps/util-linux[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrandr[abi_x86_32(-)] + x11-libs/libXxf86vm[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] +" + +EMUL_DEPS=" + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) + opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) + scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) + v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) +" DEPEND="dev-lang/perl app-arch/unzip @@ -102,8 +87,7 @@ RDEPEND="${DEPEND} dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin - ${MLIB_DEPS} - ${X86_DEPS} + || ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) ) " pkg_nofetch() { diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.0-r1.ebuild new file mode 100644 index 000000000000..651b44a00205 --- /dev/null +++ b/app-emulation/crossover-bin/crossover-bin-12.5.0-r1.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.5.0-r1.ebuild,v 1.1 2014/11/12 16:39:44 axs Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE="threads" + +inherit python-single-r1 unpacker + +DESCRIPTION="Commercial version of app-emulation/wine with paid support" +HOMEPAGE="http://www.codeweavers.com/products/crossover/" +SRC_URI="install-crossover-${PV}.bin" + +LICENSE="CROSSOVER-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l" +RESTRICT="fetch test" +QA_FLAGS_IGNORED="opt/cxoffice/.*" +QA_PRESTRIPPED="opt/cxoffice/lib/.* + opt/cxoffice/bin/cxburner + opt/cxoffice/bin/cxntlm_auth + opt/cxoffice/bin/wineserver + opt/cxoffice/bin/unrar + opt/cxoffice/bin/wine-preloader + opt/cxoffice/bin/cxdiag + opt/cxoffice/bin/cxgettext + opt/cxoffice/bin/wineloader + " +S="${WORKDIR}" + +REGULAR_DEPS=" + capi? ( net-dialup/capi4k-utils ) + cups? ( net-print/cups[abi_x86_32(-)] ) + gsm? ( media-sound/gsm[abi_x86_32(-)] ) + jpeg? ( virtual/jpeg[abi_x86_32(-)] ) + lcms? ( media-libs/lcms:0 ) + ldap? ( net-nds/openldap[abi_x86_32(-)] ) + gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) + mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) + nls? ( sys-devel/gettext[abi_x86_32(-)] ) + openal? ( media-libs/openal[abi_x86_32(-)] ) + opengl? ( + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] + ) + png? ( media-libs/libpng:0[abi_x86_32(-)] ) + scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) + ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/freetype-2.0.0[abi_x86_32(-)] + media-libs/mesa[abi_x86_32(-)] + sys-apps/util-linux[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrandr[abi_x86_32(-)] + x11-libs/libXxf86vm[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] +" + +EMUL_DEPS=" + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) + opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) + scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) + v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) +" + +DEPEND="dev-lang/perl + app-arch/unzip + ${PYTHON_DEPS}" + +RDEPEND="${DEPEND} + !prefix? ( sys-libs/glibc ) + >=dev-python/pygtk-2.10[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-util/desktop-file-utils + !app-emulation/crossover-office-pro-bin + !app-emulation/crossover-office-bin + || ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) ) + " + +pkg_nofetch() { + einfo "Please visit ${HOMEPAGE}" + einfo "and place ${A} in ${DISTDIR}" +} + +src_unpack() { + # self unpacking zip archive; unzip warns about the exe stuff + unpack_zip ${A} +} + +src_prepare() { + python_fix_shebang . + sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \ + || die "Could not patch ${WORKDIR}/bin/locate_gui.sh" + + # Remove unnecessary files + rm -r license.txt guis/ || die "Could not remove files" + use doc || rm -r doc/ || die "Could not remove files" +} + +src_install() { + # Install crossover symlink, bug #476314 + dosym /opt/cxoffice/bin/crossover /opt/bin/crossover + + # Install documentation + dodoc README changelog.txt + rm README changelog.txt || die "Could not remove README and changelog.txt" + + # Install files + dodir /opt/cxoffice + cp -r ./* "${ED}opt/cxoffice" \ + || die "Could not install into ${ED}opt/cxoffice" + + # Install configuration file + insinto /opt/cxoffice/etc + doins share/crossover/data/cxoffice.conf + + # Install requisite directories for menus + dodir "/usr/share/applications" + dodir "/etc/xdg/menus/applications-merged" + + # Install menus + XDG_CONFIG_DIRS="${ED}etc/xdg" \ + XDG_DATA_DIRS="${ED}usr/share" \ + "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \ + || die "Could not install menus" + + # Fix menus + sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \ + || die "Could not fix menus" +} diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.0.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.0.ebuild deleted file mode 100644 index 2649d3e33a8a..000000000000 --- a/app-emulation/crossover-bin/crossover-bin-12.5.0.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.5.0.ebuild,v 1.3 2014/08/06 06:44:37 patrick Exp $ - -EAPI="5" -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE="threads" - -inherit python-single-r1 unpacker - -DESCRIPTION="Commercial version of app-emulation/wine with paid support" -HOMEPAGE="http://www.codeweavers.com/products/crossover/" -SRC_URI="install-crossover-${PV}.bin" - -LICENSE="CROSSOVER-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l" -RESTRICT="fetch test" -QA_FLAGS_IGNORED="opt/cxoffice/.*" -QA_PRESTRIPPED="opt/cxoffice/lib/.* - opt/cxoffice/bin/cxburner - opt/cxoffice/bin/cxntlm_auth - opt/cxoffice/bin/wineserver - opt/cxoffice/bin/unrar - opt/cxoffice/bin/wine-preloader - opt/cxoffice/bin/cxdiag - opt/cxoffice/bin/cxgettext - opt/cxoffice/bin/wineloader - " -S="${WORKDIR}" - -MLIB_DEPS="amd64? ( - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-soundlibs - || ( - ( - >=media-libs/freetype-2.5.0.1[abi_x86_32] - >=x11-libs/libICE-1.0.8-r1[abi_x86_32] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXau-1.0.7-r1[abi_x86_32] - >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] - >=x11-libs/libxcb-1.9.1[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) -)" - -X86_DEPS="x86? ( - capi? ( net-dialup/capi4k-utils ) - cups? ( net-print/cups ) - gsm? ( media-sound/gsm ) - jpeg? ( virtual/jpeg ) - lcms? ( media-libs/lcms:0 ) - ldap? ( net-nds/openldap ) - gphoto2? ( media-libs/libgphoto2 ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - openal? ( media-libs/openal ) - opengl? ( - virtual/glu - virtual/opengl - ) - png? ( media-libs/libpng:0 ) - scanner? ( media-gfx/sane-backends ) - ssl? ( dev-libs/openssl:0 ) - v4l? ( media-libs/libv4l ) - media-libs/alsa-lib - >=media-libs/freetype-2.0.0 - media-libs/mesa - sys-apps/util-linux - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libxcb - )" - -DEPEND="dev-lang/perl - app-arch/unzip - ${PYTHON_DEPS}" - -RDEPEND="${DEPEND} - !prefix? ( sys-libs/glibc ) - >=dev-python/pygtk-2.10[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-util/desktop-file-utils - !app-emulation/crossover-office-pro-bin - !app-emulation/crossover-office-bin - ${MLIB_DEPS} - ${X86_DEPS} - " - -pkg_nofetch() { - einfo "Please visit ${HOMEPAGE}" - einfo "and place ${A} in ${DISTDIR}" -} - -src_unpack() { - # self unpacking zip archive; unzip warns about the exe stuff - unpack_zip ${A} -} - -src_prepare() { - python_fix_shebang . - sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \ - || die "Could not patch ${WORKDIR}/bin/locate_gui.sh" - - # Remove unnecessary files - rm -r license.txt guis/ || die "Could not remove files" - use doc || rm -r doc/ || die "Could not remove files" -} - -src_install() { - # Install crossover symlink, bug #476314 - dosym /opt/cxoffice/bin/crossover /opt/bin/crossover - - # Install documentation - dodoc README changelog.txt - rm README changelog.txt || die "Could not remove README and changelog.txt" - - # Install files - dodir /opt/cxoffice - cp -r ./* "${ED}opt/cxoffice" \ - || die "Could not install into ${ED}opt/cxoffice" - - # Install configuration file - insinto /opt/cxoffice/etc - doins share/crossover/data/cxoffice.conf - - # Install requisite directories for menus - dodir "/usr/share/applications" - dodir "/etc/xdg/menus/applications-merged" - - # Install menus - XDG_CONFIG_DIRS="${ED}etc/xdg" \ - XDG_DATA_DIRS="${ED}usr/share" \ - "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \ - || die "Could not install menus" - - # Fix menus - sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \ - || die "Could not fix menus" -} diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.1.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.1-r1.ebuild index d99e912e81fc..da07ac9d4491 100644 --- a/app-emulation/crossover-bin/crossover-bin-13.0.1.ebuild +++ b/app-emulation/crossover-bin/crossover-bin-12.5.1-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.0.1.ebuild,v 1.1 2014/08/23 21:13:56 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.5.1-r1.ebuild,v 1.1 2014/11/12 16:39:44 axs Exp $ -EAPI="5" +EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) PYTHON_REQ_USE="threads" @@ -30,66 +30,51 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.* " S="${WORKDIR}" -MLIB_DEPS="amd64? ( - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-soundlibs - || ( - ( - >=media-libs/freetype-2.5.0.1[abi_x86_32] - >=x11-libs/libICE-1.0.8-r1[abi_x86_32] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXau-1.0.7-r1[abi_x86_32] - >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] - >=x11-libs/libxcb-1.9.1[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) -)" - -X86_DEPS="x86? ( +REGULAR_DEPS=" capi? ( net-dialup/capi4k-utils ) - cups? ( net-print/cups ) - gsm? ( media-sound/gsm ) - jpeg? ( virtual/jpeg ) + cups? ( net-print/cups[abi_x86_32(-)] ) + gsm? ( media-sound/gsm[abi_x86_32(-)] ) + jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:0 ) - ldap? ( net-nds/openldap ) - gphoto2? ( media-libs/libgphoto2 ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - openal? ( media-libs/openal ) + ldap? ( net-nds/openldap[abi_x86_32(-)] ) + gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) + mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) + nls? ( sys-devel/gettext[abi_x86_32(-)] ) + openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( - virtual/glu - virtual/opengl + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] ) - png? ( media-libs/libpng:0 ) - scanner? ( media-gfx/sane-backends ) - ssl? ( dev-libs/openssl:0 ) - v4l? ( media-libs/libv4l ) - media-libs/alsa-lib - >=media-libs/freetype-2.0.0 - media-libs/mesa - sys-apps/util-linux - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libxcb - )" + png? ( media-libs/libpng:0[abi_x86_32(-)] ) + scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) + ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/freetype-2.0.0[abi_x86_32(-)] + media-libs/mesa[abi_x86_32(-)] + sys-apps/util-linux[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrandr[abi_x86_32(-)] + x11-libs/libXxf86vm[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] +" + +EMUL_DEPS=" + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) + opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) + scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) + v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) +" DEPEND="dev-lang/perl app-arch/unzip @@ -102,8 +87,7 @@ RDEPEND="${DEPEND} dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin - ${MLIB_DEPS} - ${X86_DEPS} + || ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) ) " pkg_nofetch() { diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.0-r1.ebuild index 933b33a2f4cb..a7c4e39117d8 100644 --- a/app-emulation/crossover-bin/crossover-bin-13.1.0.ebuild +++ b/app-emulation/crossover-bin/crossover-bin-13.0.0-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.1.0.ebuild,v 1.1 2014/08/23 21:13:56 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.0.0-r1.ebuild,v 1.1 2014/11/12 16:39:44 axs Exp $ -EAPI="5" +EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) PYTHON_REQ_USE="threads" @@ -30,66 +30,51 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.* " S="${WORKDIR}" -MLIB_DEPS="amd64? ( - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-soundlibs - || ( - ( - >=media-libs/freetype-2.5.0.1[abi_x86_32] - >=x11-libs/libICE-1.0.8-r1[abi_x86_32] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXau-1.0.7-r1[abi_x86_32] - >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] - >=x11-libs/libxcb-1.9.1[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) -)" - -X86_DEPS="x86? ( +REGULAR_DEPS=" capi? ( net-dialup/capi4k-utils ) - cups? ( net-print/cups ) - gsm? ( media-sound/gsm ) - jpeg? ( virtual/jpeg ) + cups? ( net-print/cups[abi_x86_32(-)] ) + gsm? ( media-sound/gsm[abi_x86_32(-)] ) + jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:0 ) - ldap? ( net-nds/openldap ) - gphoto2? ( media-libs/libgphoto2 ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - openal? ( media-libs/openal ) + ldap? ( net-nds/openldap[abi_x86_32(-)] ) + gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) + mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) + nls? ( sys-devel/gettext[abi_x86_32(-)] ) + openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( - virtual/glu - virtual/opengl + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] ) - png? ( media-libs/libpng:0 ) - scanner? ( media-gfx/sane-backends ) - ssl? ( dev-libs/openssl:0 ) - v4l? ( media-libs/libv4l ) - media-libs/alsa-lib - >=media-libs/freetype-2.0.0 - media-libs/mesa - sys-apps/util-linux - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libxcb - )" + png? ( media-libs/libpng:0[abi_x86_32(-)] ) + scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) + ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/freetype-2.0.0[abi_x86_32(-)] + media-libs/mesa[abi_x86_32(-)] + sys-apps/util-linux[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrandr[abi_x86_32(-)] + x11-libs/libXxf86vm[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] +" + +EMUL_DEPS=" + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) + opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) + scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) + v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) +" DEPEND="dev-lang/perl app-arch/unzip @@ -102,8 +87,7 @@ RDEPEND="${DEPEND} dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin - ${MLIB_DEPS} - ${X86_DEPS} + || ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) ) " pkg_nofetch() { diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.1.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.1-r1.ebuild index a29b6884dadb..61485e893ace 100644 --- a/app-emulation/crossover-bin/crossover-bin-12.5.1.ebuild +++ b/app-emulation/crossover-bin/crossover-bin-13.0.1-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-12.5.1.ebuild,v 1.1 2014/08/23 21:13:56 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.0.1-r1.ebuild,v 1.1 2014/11/12 16:39:44 axs Exp $ -EAPI="5" +EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) PYTHON_REQ_USE="threads" @@ -30,66 +30,51 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.* " S="${WORKDIR}" -MLIB_DEPS="amd64? ( - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-soundlibs - || ( - ( - >=media-libs/freetype-2.5.0.1[abi_x86_32] - >=x11-libs/libICE-1.0.8-r1[abi_x86_32] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXau-1.0.7-r1[abi_x86_32] - >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] - >=x11-libs/libxcb-1.9.1[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) -)" - -X86_DEPS="x86? ( +REGULAR_DEPS=" capi? ( net-dialup/capi4k-utils ) - cups? ( net-print/cups ) - gsm? ( media-sound/gsm ) - jpeg? ( virtual/jpeg ) + cups? ( net-print/cups[abi_x86_32(-)] ) + gsm? ( media-sound/gsm[abi_x86_32(-)] ) + jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:0 ) - ldap? ( net-nds/openldap ) - gphoto2? ( media-libs/libgphoto2 ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - openal? ( media-libs/openal ) + ldap? ( net-nds/openldap[abi_x86_32(-)] ) + gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) + mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) + nls? ( sys-devel/gettext[abi_x86_32(-)] ) + openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( - virtual/glu - virtual/opengl + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] ) - png? ( media-libs/libpng:0 ) - scanner? ( media-gfx/sane-backends ) - ssl? ( dev-libs/openssl:0 ) - v4l? ( media-libs/libv4l ) - media-libs/alsa-lib - >=media-libs/freetype-2.0.0 - media-libs/mesa - sys-apps/util-linux - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libxcb - )" + png? ( media-libs/libpng:0[abi_x86_32(-)] ) + scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) + ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/freetype-2.0.0[abi_x86_32(-)] + media-libs/mesa[abi_x86_32(-)] + sys-apps/util-linux[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrandr[abi_x86_32(-)] + x11-libs/libXxf86vm[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] +" + +EMUL_DEPS=" + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) + opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) + scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) + v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) +" DEPEND="dev-lang/perl app-arch/unzip @@ -102,8 +87,7 @@ RDEPEND="${DEPEND} dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin - ${MLIB_DEPS} - ${X86_DEPS} + || ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) ) " pkg_nofetch() { diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.0-r1.ebuild index 1945772f3407..618809fa6672 100644 --- a/app-emulation/crossover-bin/crossover-bin-13.0.0.ebuild +++ b/app-emulation/crossover-bin/crossover-bin-13.1.0-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.0.0.ebuild,v 1.1 2014/08/23 21:13:56 ryao Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.1.0-r1.ebuild,v 1.1 2014/11/12 16:39:44 axs Exp $ -EAPI="5" +EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) PYTHON_REQ_USE="threads" @@ -30,66 +30,51 @@ QA_PRESTRIPPED="opt/cxoffice/lib/.* " S="${WORKDIR}" -MLIB_DEPS="amd64? ( - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-soundlibs - || ( - ( - >=media-libs/freetype-2.5.0.1[abi_x86_32] - >=x11-libs/libICE-1.0.8-r1[abi_x86_32] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXau-1.0.7-r1[abi_x86_32] - >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] - >=x11-libs/libxcb-1.9.1[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) -)" - -X86_DEPS="x86? ( +REGULAR_DEPS=" capi? ( net-dialup/capi4k-utils ) - cups? ( net-print/cups ) - gsm? ( media-sound/gsm ) - jpeg? ( virtual/jpeg ) + cups? ( net-print/cups[abi_x86_32(-)] ) + gsm? ( media-sound/gsm[abi_x86_32(-)] ) + jpeg? ( virtual/jpeg[abi_x86_32(-)] ) lcms? ( media-libs/lcms:0 ) - ldap? ( net-nds/openldap ) - gphoto2? ( media-libs/libgphoto2 ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - openal? ( media-libs/openal ) + ldap? ( net-nds/openldap[abi_x86_32(-)] ) + gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) + mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) + nls? ( sys-devel/gettext[abi_x86_32(-)] ) + openal? ( media-libs/openal[abi_x86_32(-)] ) opengl? ( - virtual/glu - virtual/opengl + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] ) - png? ( media-libs/libpng:0 ) - scanner? ( media-gfx/sane-backends ) - ssl? ( dev-libs/openssl:0 ) - v4l? ( media-libs/libv4l ) - media-libs/alsa-lib - >=media-libs/freetype-2.0.0 - media-libs/mesa - sys-apps/util-linux - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libxcb - )" + png? ( media-libs/libpng:0[abi_x86_32(-)] ) + scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) + ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/freetype-2.0.0[abi_x86_32(-)] + media-libs/mesa[abi_x86_32(-)] + sys-apps/util-linux[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrandr[abi_x86_32(-)] + x11-libs/libXxf86vm[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] +" + +EMUL_DEPS=" + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) + opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) + scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) + v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) +" DEPEND="dev-lang/perl app-arch/unzip @@ -102,8 +87,7 @@ RDEPEND="${DEPEND} dev-util/desktop-file-utils !app-emulation/crossover-office-pro-bin !app-emulation/crossover-office-bin - ${MLIB_DEPS} - ${X86_DEPS} + || ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) ) " pkg_nofetch() { diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.2-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.2-r1.ebuild new file mode 100644 index 000000000000..ecab93bcdcfa --- /dev/null +++ b/app-emulation/crossover-bin/crossover-bin-13.1.2-r1.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.1.2-r1.ebuild,v 1.1 2014/11/12 16:39:44 axs Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE="threads" + +inherit python-single-r1 unpacker + +DESCRIPTION="Commercial version of app-emulation/wine with paid support." +HOMEPAGE="http://www.codeweavers.com/products/crossover/" +SRC_URI="install-crossover-${PV}.bin" + +LICENSE="CROSSOVER-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l" +RESTRICT="fetch test" +QA_FLAGS_IGNORED="opt/cxoffice/.*" +QA_PRESTRIPPED="opt/cxoffice/lib/.* + opt/cxoffice/bin/cxburner + opt/cxoffice/bin/cxntlm_auth + opt/cxoffice/bin/wineserver + opt/cxoffice/bin/unrar + opt/cxoffice/bin/wine-preloader + opt/cxoffice/bin/cxdiag + opt/cxoffice/bin/cxgettext + opt/cxoffice/bin/wineloader + " +S="${WORKDIR}" + +REGULAR_DEPS=" + capi? ( net-dialup/capi4k-utils ) + cups? ( net-print/cups[abi_x86_32(-)] ) + gsm? ( media-sound/gsm[abi_x86_32(-)] ) + jpeg? ( virtual/jpeg[abi_x86_32(-)] ) + lcms? ( media-libs/lcms:0 ) + ldap? ( net-nds/openldap[abi_x86_32(-)] ) + gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) + mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) + nls? ( sys-devel/gettext[abi_x86_32(-)] ) + openal? ( media-libs/openal[abi_x86_32(-)] ) + opengl? ( + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] + ) + png? ( media-libs/libpng:0[abi_x86_32(-)] ) + scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) + ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/freetype-2.0.0[abi_x86_32(-)] + media-libs/mesa[abi_x86_32(-)] + sys-apps/util-linux[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrandr[abi_x86_32(-)] + x11-libs/libXxf86vm[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] +" + +EMUL_DEPS=" + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) + opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) + scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) + v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) +" + +DEPEND="dev-lang/perl + app-arch/unzip + ${PYTHON_DEPS}" + +RDEPEND="${DEPEND} + !prefix? ( sys-libs/glibc ) + >=dev-python/pygtk-2.10[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-util/desktop-file-utils + !app-emulation/crossover-office-pro-bin + !app-emulation/crossover-office-bin + || ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) ) + " + +pkg_nofetch() { + einfo "Please visit ${HOMEPAGE}" + einfo "and place ${A} in ${DISTDIR}" +} + +src_unpack() { + # self unpacking zip archive; unzip warns about the exe stuff + unpack_zip ${A} +} + +src_prepare() { + python_fix_shebang . + sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \ + || die "Could not patch ${WORKDIR}/bin/locate_gui.sh" + + # Remove unnecessary files + rm -r license.txt guis/ || die "Could not remove files" + use doc || rm -r doc/ || die "Could not remove files" +} + +src_install() { + # Install crossover symlink, bug #476314 + dosym /opt/cxoffice/bin/crossover /opt/bin/crossover + + # Install documentation + dodoc README changelog.txt + rm README changelog.txt || die "Could not remove README and changelog.txt" + + # Install files + dodir /opt/cxoffice + cp -r ./* "${ED}opt/cxoffice" \ + || die "Could not install into ${ED}opt/cxoffice" + + # Install configuration file + insinto /opt/cxoffice/etc + doins share/crossover/data/cxoffice.conf + + # Install requisite directories for menus + dodir "/usr/share/applications" + dodir "/etc/xdg/menus/applications-merged" + + # Install menus + XDG_CONFIG_DIRS="${ED}etc/xdg" \ + XDG_DATA_DIRS="${ED}usr/share" \ + "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \ + || die "Could not install menus" + + # Fix menus + sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \ + || die "Could not fix menus" +} diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.2.ebuild deleted file mode 100644 index 75174c76f0c3..000000000000 --- a/app-emulation/crossover-bin/crossover-bin-13.1.2.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.1.2.ebuild,v 1.1 2014/08/23 21:13:56 ryao Exp $ - -EAPI="5" -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE="threads" - -inherit python-single-r1 unpacker - -DESCRIPTION="Commercial version of app-emulation/wine with paid support." -HOMEPAGE="http://www.codeweavers.com/products/crossover/" -SRC_URI="install-crossover-${PV}.bin" - -LICENSE="CROSSOVER-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l" -RESTRICT="fetch test" -QA_FLAGS_IGNORED="opt/cxoffice/.*" -QA_PRESTRIPPED="opt/cxoffice/lib/.* - opt/cxoffice/bin/cxburner - opt/cxoffice/bin/cxntlm_auth - opt/cxoffice/bin/wineserver - opt/cxoffice/bin/unrar - opt/cxoffice/bin/wine-preloader - opt/cxoffice/bin/cxdiag - opt/cxoffice/bin/cxgettext - opt/cxoffice/bin/wineloader - " -S="${WORKDIR}" - -MLIB_DEPS="amd64? ( - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-soundlibs - || ( - ( - >=media-libs/freetype-2.5.0.1[abi_x86_32] - >=x11-libs/libICE-1.0.8-r1[abi_x86_32] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXau-1.0.7-r1[abi_x86_32] - >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] - >=x11-libs/libxcb-1.9.1[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) -)" - -X86_DEPS="x86? ( - capi? ( net-dialup/capi4k-utils ) - cups? ( net-print/cups ) - gsm? ( media-sound/gsm ) - jpeg? ( virtual/jpeg ) - lcms? ( media-libs/lcms:0 ) - ldap? ( net-nds/openldap ) - gphoto2? ( media-libs/libgphoto2 ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - openal? ( media-libs/openal ) - opengl? ( - virtual/glu - virtual/opengl - ) - png? ( media-libs/libpng:0 ) - scanner? ( media-gfx/sane-backends ) - ssl? ( dev-libs/openssl:0 ) - v4l? ( media-libs/libv4l ) - media-libs/alsa-lib - >=media-libs/freetype-2.0.0 - media-libs/mesa - sys-apps/util-linux - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libxcb - )" - -DEPEND="dev-lang/perl - app-arch/unzip - ${PYTHON_DEPS}" - -RDEPEND="${DEPEND} - !prefix? ( sys-libs/glibc ) - >=dev-python/pygtk-2.10[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-util/desktop-file-utils - !app-emulation/crossover-office-pro-bin - !app-emulation/crossover-office-bin - ${MLIB_DEPS} - ${X86_DEPS} - " - -pkg_nofetch() { - einfo "Please visit ${HOMEPAGE}" - einfo "and place ${A} in ${DISTDIR}" -} - -src_unpack() { - # self unpacking zip archive; unzip warns about the exe stuff - unpack_zip ${A} -} - -src_prepare() { - python_fix_shebang . - sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \ - || die "Could not patch ${WORKDIR}/bin/locate_gui.sh" - - # Remove unnecessary files - rm -r license.txt guis/ || die "Could not remove files" - use doc || rm -r doc/ || die "Could not remove files" -} - -src_install() { - # Install crossover symlink, bug #476314 - dosym /opt/cxoffice/bin/crossover /opt/bin/crossover - - # Install documentation - dodoc README changelog.txt - rm README changelog.txt || die "Could not remove README and changelog.txt" - - # Install files - dodir /opt/cxoffice - cp -r ./* "${ED}opt/cxoffice" \ - || die "Could not install into ${ED}opt/cxoffice" - - # Install configuration file - insinto /opt/cxoffice/etc - doins share/crossover/data/cxoffice.conf - - # Install requisite directories for menus - dodir "/usr/share/applications" - dodir "/etc/xdg/menus/applications-merged" - - # Install menus - XDG_CONFIG_DIRS="${ED}etc/xdg" \ - XDG_DATA_DIRS="${ED}usr/share" \ - "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \ - || die "Could not install menus" - - # Fix menus - sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \ - || die "Could not fix menus" -} diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.3-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.3-r1.ebuild new file mode 100644 index 000000000000..270611ff9048 --- /dev/null +++ b/app-emulation/crossover-bin/crossover-bin-13.1.3-r1.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.1.3-r1.ebuild,v 1.1 2014/11/12 16:39:44 axs Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE="threads" + +inherit python-single-r1 unpacker + +DESCRIPTION="Commercial version of app-emulation/wine with paid support." +HOMEPAGE="http://www.codeweavers.com/products/crossover/" +SRC_URI="install-crossover-${PV}.bin" + +LICENSE="CROSSOVER-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l" +RESTRICT="fetch test" +QA_FLAGS_IGNORED="opt/cxoffice/.*" +QA_PRESTRIPPED="opt/cxoffice/lib/.* + opt/cxoffice/bin/cxburner + opt/cxoffice/bin/cxntlm_auth + opt/cxoffice/bin/wineserver + opt/cxoffice/bin/unrar + opt/cxoffice/bin/wine-preloader + opt/cxoffice/bin/cxdiag + opt/cxoffice/bin/cxgettext + opt/cxoffice/bin/wineloader + " +S="${WORKDIR}" + +REGULAR_DEPS=" + capi? ( net-dialup/capi4k-utils ) + cups? ( net-print/cups[abi_x86_32(-)] ) + gsm? ( media-sound/gsm[abi_x86_32(-)] ) + jpeg? ( virtual/jpeg[abi_x86_32(-)] ) + lcms? ( media-libs/lcms:0 ) + ldap? ( net-nds/openldap[abi_x86_32(-)] ) + gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) + mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) + nls? ( sys-devel/gettext[abi_x86_32(-)] ) + openal? ( media-libs/openal[abi_x86_32(-)] ) + opengl? ( + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] + ) + png? ( media-libs/libpng:0[abi_x86_32(-)] ) + scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) + ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/freetype-2.0.0[abi_x86_32(-)] + media-libs/mesa[abi_x86_32(-)] + sys-apps/util-linux[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrandr[abi_x86_32(-)] + x11-libs/libXxf86vm[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] +" + +EMUL_DEPS=" + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) + opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) + scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) + v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) +" + +DEPEND="dev-lang/perl + app-arch/unzip + ${PYTHON_DEPS}" + +RDEPEND="${DEPEND} + !prefix? ( sys-libs/glibc ) + >=dev-python/pygtk-2.10[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-util/desktop-file-utils + !app-emulation/crossover-office-pro-bin + !app-emulation/crossover-office-bin + || ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) ) + " + +pkg_nofetch() { + einfo "Please visit ${HOMEPAGE}" + einfo "and place ${A} in ${DISTDIR}" +} + +src_unpack() { + # self unpacking zip archive; unzip warns about the exe stuff + unpack_zip ${A} +} + +src_prepare() { + python_fix_shebang . + sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \ + || die "Could not patch ${WORKDIR}/bin/locate_gui.sh" + + # Remove unnecessary files + rm -r license.txt guis/ || die "Could not remove files" + use doc || rm -r doc/ || die "Could not remove files" +} + +src_install() { + # Install crossover symlink, bug #476314 + dosym /opt/cxoffice/bin/crossover /opt/bin/crossover + + # Install documentation + dodoc README changelog.txt + rm README changelog.txt || die "Could not remove README and changelog.txt" + + # Install files + dodir /opt/cxoffice + cp -r ./* "${ED}opt/cxoffice" \ + || die "Could not install into ${ED}opt/cxoffice" + + # Install configuration file + insinto /opt/cxoffice/etc + doins share/crossover/data/cxoffice.conf + + # Install requisite directories for menus + dodir "/usr/share/applications" + dodir "/etc/xdg/menus/applications-merged" + + # Install menus + XDG_CONFIG_DIRS="${ED}etc/xdg" \ + XDG_DATA_DIRS="${ED}usr/share" \ + "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \ + || die "Could not install menus" + + # Fix menus + sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \ + || die "Could not fix menus" +} diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.3.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.3.ebuild deleted file mode 100644 index 3298c0f22fc3..000000000000 --- a/app-emulation/crossover-bin/crossover-bin-13.1.3.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.1.3.ebuild,v 1.1 2014/08/23 21:13:56 ryao Exp $ - -EAPI="5" -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE="threads" - -inherit python-single-r1 unpacker - -DESCRIPTION="Commercial version of app-emulation/wine with paid support." -HOMEPAGE="http://www.codeweavers.com/products/crossover/" -SRC_URI="install-crossover-${PV}.bin" - -LICENSE="CROSSOVER-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l" -RESTRICT="fetch test" -QA_FLAGS_IGNORED="opt/cxoffice/.*" -QA_PRESTRIPPED="opt/cxoffice/lib/.* - opt/cxoffice/bin/cxburner - opt/cxoffice/bin/cxntlm_auth - opt/cxoffice/bin/wineserver - opt/cxoffice/bin/unrar - opt/cxoffice/bin/wine-preloader - opt/cxoffice/bin/cxdiag - opt/cxoffice/bin/cxgettext - opt/cxoffice/bin/wineloader - " -S="${WORKDIR}" - -MLIB_DEPS="amd64? ( - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-soundlibs - || ( - ( - >=media-libs/freetype-2.5.0.1[abi_x86_32] - >=x11-libs/libICE-1.0.8-r1[abi_x86_32] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXau-1.0.7-r1[abi_x86_32] - >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] - >=x11-libs/libxcb-1.9.1[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) -)" - -X86_DEPS="x86? ( - capi? ( net-dialup/capi4k-utils ) - cups? ( net-print/cups ) - gsm? ( media-sound/gsm ) - jpeg? ( virtual/jpeg ) - lcms? ( media-libs/lcms:0 ) - ldap? ( net-nds/openldap ) - gphoto2? ( media-libs/libgphoto2 ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - openal? ( media-libs/openal ) - opengl? ( - virtual/glu - virtual/opengl - ) - png? ( media-libs/libpng:0 ) - scanner? ( media-gfx/sane-backends ) - ssl? ( dev-libs/openssl:0 ) - v4l? ( media-libs/libv4l ) - media-libs/alsa-lib - >=media-libs/freetype-2.0.0 - media-libs/mesa - sys-apps/util-linux - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libxcb - )" - -DEPEND="dev-lang/perl - app-arch/unzip - ${PYTHON_DEPS}" - -RDEPEND="${DEPEND} - !prefix? ( sys-libs/glibc ) - >=dev-python/pygtk-2.10[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-util/desktop-file-utils - !app-emulation/crossover-office-pro-bin - !app-emulation/crossover-office-bin - ${MLIB_DEPS} - ${X86_DEPS} - " - -pkg_nofetch() { - einfo "Please visit ${HOMEPAGE}" - einfo "and place ${A} in ${DISTDIR}" -} - -src_unpack() { - # self unpacking zip archive; unzip warns about the exe stuff - unpack_zip ${A} -} - -src_prepare() { - python_fix_shebang . - sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \ - || die "Could not patch ${WORKDIR}/bin/locate_gui.sh" - - # Remove unnecessary files - rm -r license.txt guis/ || die "Could not remove files" - use doc || rm -r doc/ || die "Could not remove files" -} - -src_install() { - # Install crossover symlink, bug #476314 - dosym /opt/cxoffice/bin/crossover /opt/bin/crossover - - # Install documentation - dodoc README changelog.txt - rm README changelog.txt || die "Could not remove README and changelog.txt" - - # Install files - dodir /opt/cxoffice - cp -r ./* "${ED}opt/cxoffice" \ - || die "Could not install into ${ED}opt/cxoffice" - - # Install configuration file - insinto /opt/cxoffice/etc - doins share/crossover/data/cxoffice.conf - - # Install requisite directories for menus - dodir "/usr/share/applications" - dodir "/etc/xdg/menus/applications-merged" - - # Install menus - XDG_CONFIG_DIRS="${ED}etc/xdg" \ - XDG_DATA_DIRS="${ED}usr/share" \ - "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \ - || die "Could not install menus" - - # Fix menus - sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \ - || die "Could not fix menus" -} diff --git a/app-emulation/crossover-bin/crossover-bin-13.2.0-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-13.2.0-r1.ebuild new file mode 100644 index 000000000000..08cfdf74604e --- /dev/null +++ b/app-emulation/crossover-bin/crossover-bin-13.2.0-r1.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.2.0-r1.ebuild,v 1.1 2014/11/12 16:39:44 axs Exp $ + +EAPI=5 +PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_REQ_USE="threads" + +inherit python-single-r1 unpacker + +DESCRIPTION="Commercial version of app-emulation/wine with paid support." +HOMEPAGE="http://www.codeweavers.com/products/crossover/" +SRC_URI="install-crossover-${PV}.bin" + +LICENSE="CROSSOVER-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l" +RESTRICT="fetch test" +QA_FLAGS_IGNORED="opt/cxoffice/.*" +QA_PRESTRIPPED="opt/cxoffice/lib/.* + opt/cxoffice/bin/cxburner + opt/cxoffice/bin/cxntlm_auth + opt/cxoffice/bin/wineserver + opt/cxoffice/bin/unrar + opt/cxoffice/bin/wine-preloader + opt/cxoffice/bin/cxdiag + opt/cxoffice/bin/cxgettext + opt/cxoffice/bin/wineloader + " +S="${WORKDIR}" + +REGULAR_DEPS=" + capi? ( net-dialup/capi4k-utils ) + cups? ( net-print/cups[abi_x86_32(-)] ) + gsm? ( media-sound/gsm[abi_x86_32(-)] ) + jpeg? ( virtual/jpeg[abi_x86_32(-)] ) + lcms? ( media-libs/lcms:0 ) + ldap? ( net-nds/openldap[abi_x86_32(-)] ) + gphoto2? ( media-libs/libgphoto2[abi_x86_32(-)] ) + mp3? ( >=media-sound/mpg123-1.5.0[abi_x86_32(-)] ) + nls? ( sys-devel/gettext[abi_x86_32(-)] ) + openal? ( media-libs/openal[abi_x86_32(-)] ) + opengl? ( + virtual/glu[abi_x86_32(-)] + virtual/opengl[abi_x86_32(-)] + ) + png? ( media-libs/libpng:0[abi_x86_32(-)] ) + scanner? ( media-gfx/sane-backends[abi_x86_32(-)] ) + ssl? ( dev-libs/openssl:0[abi_x86_32(-)] ) + v4l? ( media-libs/libv4l[abi_x86_32(-)] ) + media-libs/alsa-lib[abi_x86_32(-)] + >=media-libs/freetype-2.0.0[abi_x86_32(-)] + media-libs/mesa[abi_x86_32(-)] + sys-apps/util-linux[abi_x86_32(-)] + sys-libs/zlib[abi_x86_32(-)] + x11-libs/libICE[abi_x86_32(-)] + x11-libs/libSM[abi_x86_32(-)] + x11-libs/libX11[abi_x86_32(-)] + x11-libs/libXau[abi_x86_32(-)] + x11-libs/libXdmcp[abi_x86_32(-)] + x11-libs/libXext[abi_x86_32(-)] + x11-libs/libXi[abi_x86_32(-)] + x11-libs/libXrandr[abi_x86_32(-)] + x11-libs/libXxf86vm[abi_x86_32(-)] + x11-libs/libxcb[abi_x86_32(-)] +" + +EMUL_DEPS=" + app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] + app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] + openal? ( app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) + opengl? ( app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) + scanner? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) + v4l? ( app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] ) +" + +DEPEND="dev-lang/perl + app-arch/unzip + ${PYTHON_DEPS}" + +RDEPEND="${DEPEND} + !prefix? ( sys-libs/glibc ) + >=dev-python/pygtk-2.10[${PYTHON_USEDEP}] + dev-python/dbus-python[${PYTHON_USEDEP}] + dev-util/desktop-file-utils + !app-emulation/crossover-office-pro-bin + !app-emulation/crossover-office-bin + || ( ( ${REGULAR_DEPS} ) ( ${EMUL_DEPS} ) ) + " + +pkg_nofetch() { + einfo "Please visit ${HOMEPAGE}" + einfo "and place ${A} in ${DISTDIR}" +} + +src_unpack() { + # self unpacking zip archive; unzip warns about the exe stuff + unpack_zip ${A} +} + +src_prepare() { + python_fix_shebang . + sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \ + || die "Could not patch ${WORKDIR}/bin/locate_gui.sh" + + # Remove unnecessary files + rm -r license.txt guis/ || die "Could not remove files" + use doc || rm -r doc/ || die "Could not remove files" +} + +src_install() { + # Install crossover symlink, bug #476314 + dosym /opt/cxoffice/bin/crossover /opt/bin/crossover + + # Install documentation + dodoc README changelog.txt + rm README changelog.txt || die "Could not remove README and changelog.txt" + + # Install files + dodir /opt/cxoffice + cp -r ./* "${ED}opt/cxoffice" \ + || die "Could not install into ${ED}opt/cxoffice" + + # Install configuration file + insinto /opt/cxoffice/etc + doins share/crossover/data/cxoffice.conf + + # Install requisite directories for menus + dodir "/usr/share/applications" + dodir "/etc/xdg/menus/applications-merged" + + # Install menus + XDG_CONFIG_DIRS="${ED}etc/xdg" \ + XDG_DATA_DIRS="${ED}usr/share" \ + "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \ + || die "Could not install menus" + + # Fix menus + sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \ + || die "Could not fix menus" +} diff --git a/app-emulation/crossover-bin/crossover-bin-13.2.0.ebuild b/app-emulation/crossover-bin/crossover-bin-13.2.0.ebuild deleted file mode 100644 index 8cba280c1818..000000000000 --- a/app-emulation/crossover-bin/crossover-bin-13.2.0.ebuild +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/crossover-bin/crossover-bin-13.2.0.ebuild,v 1.1 2014/08/23 21:13:56 ryao Exp $ - -EAPI="5" -PYTHON_COMPAT=( python{2_6,2_7} ) -PYTHON_REQ_USE="threads" - -inherit python-single-r1 unpacker - -DESCRIPTION="Commercial version of app-emulation/wine with paid support." -HOMEPAGE="http://www.codeweavers.com/products/crossover/" -SRC_URI="install-crossover-${PV}.bin" - -LICENSE="CROSSOVER-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="+capi +cups doc +gphoto2 +gsm +jpeg +lcms +ldap +mp3 +nls +openal +opengl +png +scanner +ssl +v4l" -RESTRICT="fetch test" -QA_FLAGS_IGNORED="opt/cxoffice/.*" -QA_PRESTRIPPED="opt/cxoffice/lib/.* - opt/cxoffice/bin/cxburner - opt/cxoffice/bin/cxntlm_auth - opt/cxoffice/bin/wineserver - opt/cxoffice/bin/unrar - opt/cxoffice/bin/wine-preloader - opt/cxoffice/bin/cxdiag - opt/cxoffice/bin/cxgettext - opt/cxoffice/bin/wineloader - " -S="${WORKDIR}" - -MLIB_DEPS="amd64? ( - openal? ( app-emulation/emul-linux-x86-sdl ) - opengl? ( app-emulation/emul-linux-x86-opengl ) - scanner? ( app-emulation/emul-linux-x86-medialibs ) - v4l? ( app-emulation/emul-linux-x86-medialibs ) - app-emulation/emul-linux-x86-baselibs - app-emulation/emul-linux-x86-soundlibs - || ( - ( - >=media-libs/freetype-2.5.0.1[abi_x86_32] - >=x11-libs/libICE-1.0.8-r1[abi_x86_32] - >=x11-libs/libSM-1.2.1-r1[abi_x86_32] - >=x11-libs/libX11-1.6.2[abi_x86_32] - >=x11-libs/libXau-1.0.7-r1[abi_x86_32] - >=x11-libs/libXdmcp-1.1.1-r1[abi_x86_32] - >=x11-libs/libXext-1.3.2[abi_x86_32] - >=x11-libs/libXi-1.7.2[abi_x86_32] - >=x11-libs/libXrandr-1.4.2[abi_x86_32] - >=x11-libs/libXxf86vm-1.1.3[abi_x86_32] - >=x11-libs/libxcb-1.9.1[abi_x86_32] - ) - app-emulation/emul-linux-x86-xlibs - ) -)" - -X86_DEPS="x86? ( - capi? ( net-dialup/capi4k-utils ) - cups? ( net-print/cups ) - gsm? ( media-sound/gsm ) - jpeg? ( virtual/jpeg ) - lcms? ( media-libs/lcms:0 ) - ldap? ( net-nds/openldap ) - gphoto2? ( media-libs/libgphoto2 ) - mp3? ( >=media-sound/mpg123-1.5.0 ) - nls? ( sys-devel/gettext ) - openal? ( media-libs/openal ) - opengl? ( - virtual/glu - virtual/opengl - ) - png? ( media-libs/libpng:0 ) - scanner? ( media-gfx/sane-backends ) - ssl? ( dev-libs/openssl:0 ) - v4l? ( media-libs/libv4l ) - media-libs/alsa-lib - >=media-libs/freetype-2.0.0 - media-libs/mesa - sys-apps/util-linux - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXi - x11-libs/libXrandr - x11-libs/libXxf86vm - x11-libs/libxcb - )" - -DEPEND="dev-lang/perl - app-arch/unzip - ${PYTHON_DEPS}" - -RDEPEND="${DEPEND} - !prefix? ( sys-libs/glibc ) - >=dev-python/pygtk-2.10[${PYTHON_USEDEP}] - dev-python/dbus-python[${PYTHON_USEDEP}] - dev-util/desktop-file-utils - !app-emulation/crossover-office-pro-bin - !app-emulation/crossover-office-bin - ${MLIB_DEPS} - ${X86_DEPS} - " - -pkg_nofetch() { - einfo "Please visit ${HOMEPAGE}" - einfo "and place ${A} in ${DISTDIR}" -} - -src_unpack() { - # self unpacking zip archive; unzip warns about the exe stuff - unpack_zip ${A} -} - -src_prepare() { - python_fix_shebang . - sed -e 's:/usr/local/etc/xdg /etc/xdg::' -i "${WORKDIR}/bin/locate_gui.sh" \ - || die "Could not patch ${WORKDIR}/bin/locate_gui.sh" - - # Remove unnecessary files - rm -r license.txt guis/ || die "Could not remove files" - use doc || rm -r doc/ || die "Could not remove files" -} - -src_install() { - # Install crossover symlink, bug #476314 - dosym /opt/cxoffice/bin/crossover /opt/bin/crossover - - # Install documentation - dodoc README changelog.txt - rm README changelog.txt || die "Could not remove README and changelog.txt" - - # Install files - dodir /opt/cxoffice - cp -r ./* "${ED}opt/cxoffice" \ - || die "Could not install into ${ED}opt/cxoffice" - - # Install configuration file - insinto /opt/cxoffice/etc - doins share/crossover/data/cxoffice.conf - - # Install requisite directories for menus - dodir "/usr/share/applications" - dodir "/etc/xdg/menus/applications-merged" - - # Install menus - XDG_CONFIG_DIRS="${ED}etc/xdg" \ - XDG_DATA_DIRS="${ED}usr/share" \ - "${ED}opt/cxoffice/bin/cxmenu" --crossover --install \ - || die "Could not install menus" - - # Fix menus - sed -e "s:${ED}:/:" -i "${ED}usr/share/applications/"* \ - || die "Could not fix menus" -} |