Sync with portage [Sun Mar 8 17:36:21 MSK 2015].

mhiretskiy
root 9 years ago
parent 1ce5cce6ca
commit b0b935f4fa

@ -1,4 +1,3 @@
DIST diradm-2.9.3.tar.bz2 105362 SHA256 4bd8261c11916caab989b596c78f648510225de4d52af3c9a425ef92bf6a096d SHA512 369d6d912f3b1f7c06427ab570325c8783d80c74fd7097c3f22cf5f14259c5c95558f30a9f479624213b8f9b920b2275b3ed1010e743aad8671e504d94ebbf70 WHIRLPOOL 54836bd9ff7d325768cd3efed1cf7b1dc261af27f2eb542e9bdc1d8c2526ce7ac6fee195647bc8e0ecdf4e69f1d3ac49f54e41520dba5ce7a94f2ead39f5bd6b
DIST diradm-2.9.5.tar.bz2 113429 SHA256 8d189981d0fbd63bd55114f7b1c34f97f39a832fa5093f63be3c403ba4da87e4 SHA512 95342ece8ee79bf846ead7a0b5af0954ebded47663c0325476599252269e1f7dbc72437b69a777d2e02382d9c824838592eee1d916da6199f8982b4df7833158 WHIRLPOOL 91f33d6007a119269ac6ba5c7881a2cdc3fc77076824b7c23c7eab2c4403c605a2d1455b0f705a7db6d9b8a2277470ab73c9af10b57a94b7b0bede939298000b
DIST diradm-2.9.6.tar.bz2 113599 SHA256 8c316d05a8d5faf73fc9608bb3bfd1c610148c0132f7db80f92423c40ce08256 SHA512 4a6a976cedda306e4eec2478e1fd61a00f67c93b23ca86c701cd10bc32d73ce52a3d0ade97f04f0f2d0cd0dba292e3110ccad35d68a6b34ef9b651412b1a5768 WHIRLPOOL e7d55bbb30e0379d24b5172bc9f156b6d9e8ce4cd42e62116be763b01e00db29b0efd39d6e6192dcf8039ef6acb3fc7e3e713a05128ffc1d819ec21a79a3af94
DIST diradm-2.9.7.1.tar.bz2 126172 SHA256 0a10f8b8b872a1f985c1f73da0109e8ba5ebde09ccb4760b56e67d4a1b88f2bf SHA512 5052f7b7072cd61eb9c70d23057f6c0d2fa68a151792d7260ca52716c9588c06234d335af84b967df23da4b4a8650502cab3b18900dc15e71f71b0888224993f WHIRLPOOL 31c2b6eaa913aa0a273652958233e0ace3b309063448add6b446a41e48903b984810f0ce668b27efbbca8c558a20a379692a3d7d3997d8481d0dbfe19827adee

@ -1,71 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/diradm/diradm-2.9.3.ebuild,v 1.9 2014/08/10 01:37:40 patrick Exp $
EAPI="2"
inherit eutils
DESCRIPTION="diradm is a nearly complete nss/shadow suite for managing POSIX users/groups/data in LDAP"
#HOMEPAGE="http://research.iat.sfu.ca/custom-software/diradm/"
#SRC_URI="${HOMEPAGE}/${P}.tar.bz2"
HOMEPAGE="http://orbis-terrarum.net/~robbat2/"
SRC_URI="http://orbis-terrarum.net/~robbat2/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc ppc64 x86"
IUSE="samba irixpasswd automount test"
RDEPEND="net-nds/openldap
sys-apps/gawk
sys-apps/coreutils
sys-apps/grep
dev-lang/perl
app-shells/bash
sys-apps/sed
virtual/perl-MIME-Base64
samba? (
dev-perl/Crypt-SmbHash
>=net-fs/samba-3.0.6
)"
DEPEND="
${RDEPEND}
test? (
dev-perl/Crypt-SmbHash
>=net-fs/samba-3.0.6
dev-util/dejagnu
net-nds/openldap[-minimal]
)"
pkg_setup() {
use test && elog "Warning, for test usage, diradm is built with all optional features!"
}
src_configure() {
local myconf
if use test; then
myconf="--enable-samba --enable-automount --enable-irixpasswd"
else
myconf="`use_enable samba` `use_enable automount` `use_enable irixpasswd`"
fi
econf ${myconf} || die "econf failed"
}
src_install() {
emake install DESTDIR="${D}" || die "emake install failed"
dodoc CHANGES* README AUTHORS ChangeLog NEWS README.prefork THANKS TODO KNOWN-BUGS
if use irixpasswd; then
insinto /etc/openldap/schema
doins irixpassword.schema
fi
}
pkg_postinst() {
elog "The new diradm pulls many settings from your LDAP configuration."
elog "But don't forget to customize /etc/diradm.conf for other settings."
elog "Please see the README to instructions if you problems."
}
src_test() {
emake -j1 check
}

@ -0,0 +1,35 @@
Use off_t instead of loff_t. Both pread() and pwrite() take
off_t not loff_t types. This breaks the build on musl. See
https://bugs.gentoo.org/show_bug.cgi?id=541694
diff -Naur longrun.orig/longrun.c longrun/longrun.c
--- longrun.orig/longrun.c 2015-03-07 19:05:19.166652462 +0000
+++ longrun/longrun.c 2015-03-07 19:06:05.419651899 +0000
@@ -181,7 +181,7 @@
}
/* note: if an output is NULL, then don't set it */
-void read_msr(loff_t address, int *lower, int *upper)
+void read_msr(off_t address, int *lower, int *upper)
{
uint32_t data[2];
@@ -193,7 +193,7 @@
if (upper) *upper = data[1];
}
-void write_msr(loff_t address, int lower, int upper)
+void write_msr(off_t address, int lower, int upper)
{
uint32_t data[2];
@@ -206,7 +206,7 @@
}
/* note: if an output is NULL, then don't set it */
-void read_cpuid(loff_t address, int *eax, int *ebx, int *ecx, int *edx)
+void read_cpuid(off_t address, int *eax, int *ebx, int *ecx, int *edx)
{
uint32_t data[4];

@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/longrun/longrun-0.9-r4.ebuild,v 1.2 2009/11/20 14:44:33 maekke Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/longrun/longrun-0.9-r4.ebuild,v 1.3 2015/03/07 19:43:33 blueness Exp $
inherit eutils linux-info toolchain-funcs
@ -41,6 +41,7 @@ src_unpack() {
cd "${S}"
epatch "${DISTDIR}/${DEBIAN_PATCH}"
epatch "${FILESDIR}/${PV}-makefile_cflags.patch"
epatch "${FILESDIR}/${PV}-replace-loff_t.patch"
}
src_compile() {

@ -16,10 +16,13 @@ DIST wine-1.7.19.tar.bz2 21633142 SHA256 c5ea9b00c9029ecf47a25881b284d8ea02079df
DIST wine-1.7.20.tar.bz2 21635815 SHA256 9c431b0b96222d0c27a2c2326ed88298ac0dae50ea783ef764c48c4373bf5f15 SHA512 ffc168ff4342fb5d8fb4a4a242c37f91613e983d644bd6b6d8798110b12339806d58d3abca8856855c286e40b9e4344a17fc834731dd03a42ea0743d1f24bd44 WHIRLPOOL 5ad69f9355897b4ce72c18c239dca2909d0c6094ff2c763731834d5b313fe04806648966e9d60408a14c0cf0dcb981587ffc0edaec8af07fe0a138364062fa53
DIST wine-1.7.21.tar.bz2 21635330 SHA256 a14723104135c21414c61e146144a2c527430057255f8c35a3a7d354e68b9401 SHA512 73db3256d04c681ea7a4524767f9f93c24a4cc96aa901c6fdfd700c7e8968cdb127a110df56f10423cac90aadc783ceafcd0dc571e36ea096c1de03c619164d8 WHIRLPOOL 32bcf10f8665dab43339e79240b534f3fa29087787acd752553b4b717f6c26f8e98d36185f61e928e2c5ef9a3663b9eac7ec42cd9898800ba12efab74c78634c
DIST wine-1.7.22.tar.bz2 21661089 SHA256 60374c94c64110d58939e716c3ef4916059c691a2953d8340a9a140a208a7c63 SHA512 f4646f85f3e5ff25d299e544f8736390bafab63dbe44c38dfbd78bea3a047fd269dcad67e0beca088aab77464c3aadb5040af9606f57c91cc4e4b0f8e916dd55 WHIRLPOOL c214c9e8a9592b7d17a8942ef14f46fd936674dfcd95838b396176e02b74cbe1e3d295a8183ba76c53987c9f1d55d6b5f3de46df8fb9f6a9547dc934a9b048a9
DIST wine-1.7.28-gstreamer-v4.patch.bz2 5447 SHA256 64dad250bde6b10d77e688b316217b1b508f3dfb8195a33f6420dc1dfb18ac8a SHA512 65e84d79da9898c3c0508c392182f148384abf8f007c0662c6468414eebb69dec918c6099a3fbff7ffa2dd4a942a1aa1d91dffba494ac37a6f572a7f0162ea0c WHIRLPOOL 0cc7cf63c0f9ed718e2219da01cc05fca0814b0ca98c916141ccb254da91f32ea03ec47c6e106d558d6ca10b3346a9cbd9a1c74ef66cb9983dddd1e50506c940
DIST wine-1.7.28.tar.bz2 21811422 SHA256 67c3f157b9e720971d1f7dc582e9f0b16879ef660b5ba284a77f8bdfc6fc2313 SHA512 dffbfeb53d9503ec882941c9d01c4b795c6da6046a2eab5d1ccb4db68a07952cfdbb14600869981b050f45247548d459bd054a390af6baecb232dc0c075ec7ab WHIRLPOOL a55e2acc86435f7254220f05871487e7272318a79dbea00fbfe36faebb5ca70281561ece1c8b79db2e59aea070d2f2d7146d94490925f65c641c52d45c82cf2a
DIST wine-1.7.29.tar.bz2 21823063 SHA256 ae48190d35533197811eeabed989ed9fd3201c44af917107f35ec0bf75b8de62 SHA512 ced6ced1bfdf1b847242399bf54a4a63d0f8a16f3dc1a11c6f2af1baf12d2daa679a5377fe284724b8487cb0573383694c68e363ff2b98230f79c873c4dbbba9 WHIRLPOOL 3db7234f4ba12ea483c0bb8336dcb8becf7bd73298b63700aa7fec61a4723b5bbb7b03b32bd0c8ab1c66b45f6e60bf4dbd30e0da325cf75dc698ca6b69df2993
DIST wine-1.7.3.tar.bz2 21489049 SHA256 c66c93c2ffec8d1d9922fbaa226b169d62deb77fcbfd0fbd7379b77dbd97d47f SHA512 41109866b259a5f939c9ca4c26ed0a5ca74fa9cafa2f348b83510dd386459c87ac044a6f954f2f83ce00961d866a6e636ed96aa9e94584b7a79486d434b406cc WHIRLPOOL 90e6aed8930e3496701292415ce87f29a87870a1d00ad26d4f3c4adf33cd296093d0ef3d363bf5cead1ebd5ab4e86907ccb015c10d85f6f90d5f48cd81681b0f
DIST wine-1.7.33.tar.bz2 21908969 SHA256 e3519d6fa2c0bb91e58da38f14f02607cf366a0154ff1effe528966106d49275 SHA512 a9bb47383b88e9c60edef7883c3ce25f5ad0895b67cdb4393c1c3f9b9ab7245e8d8318df193722a7b8c87ff57cd554df53a24c988566d1dce808b939ed731451 WHIRLPOOL 3747cc9df638e7cba5aaff8cb6bfa26e5588ba87e5bdc9d5e3202f30973bc2c06b0d65027f113066dce82d851c1591ce86421ce6e7d90944f5206d341f7ed51d
DIST wine-1.7.34-gstreamer-v5.patch.bz2 5703 SHA256 c3bb6f669f46d9f2d7ba494a2264cee457349f559d4b0758db80e39eb22f2aee SHA512 e780394e8739a58593d264322c462bfe9040c1cabce93b84d24f09040026368efb4ac34a6a302beb6048d14b4ac835b87a0c515b52c1a0c143aa4e15691eb01b WHIRLPOOL 1befbb0fbd026d6e833c5d72341064dd6e12157e1b7df58e349b9985648bfbc63f70e9cab45b61155515ac65057968e30ba313e71e183b8027153c9392d89192
DIST wine-1.7.38.tar.bz2 22027786 SHA256 981ee93e7db6b2b8d1ee16999cdff915a9411b1566539edc56137f9cd4d36bc0 SHA512 36793b8b2fd678b9542ff2c32582234a175e9795682b93c0df881dc1adac65dff8d33509511fe7400d8b099880df8d6f13ecc18e0c8b72827d9ac009770ddc81 WHIRLPOOL 646a36cd4f50c3c81fafc95e11e5c8df68e7c14e7b582b6cd7f5f99d3f37afebd9655e8b0c28bb7995c957d87f96913ac13c2fc425075406e32cbf9a23440add
DIST wine-1.7.4.tar.bz2 21500746 SHA256 517b3465dbf5b516d3fe886c0f9d4f310dc1d4a38ca4e5580c5d66bab3fb6969 SHA512 4267eb43311fe53537a1864a70e88e4bf444b8979dc858725a1170ed06af4e727604a22bafb3deb448eeb62c170ce67ce8eb8082bce040f5488b1a4c4bc6bb95 WHIRLPOOL 7bb14e0dfd4f9a7411e1d5484dba62f8584a0e03997cc3c6192893dccbc7de316eb79a1e5b0ccf96d20e74cf512ebc79e760076ff4882625bc81b410ad8be0bf
DIST wine-1.7.8.tar.bz2 21463503 SHA256 30e17f5f863a09416f3d229666566b318dbb40f683d4ca6630012c60bb511804 SHA512 1fdaddb7909f818050854bf351d20f445cf6a5906b1bcc789c96ee8d5058c90815a91bbbc6444f3e4527748764f03ab5297585c174b433093a3354a827402fea WHIRLPOOL 3b5b18384ff04b80b936160c2c6e03676d69663c023f484981305c9272d0601b74cda5c5f7d56008b3900d702b1a4fe1929f16b1fba304a6480b076ffede663a
DIST wine-1.7.9.tar.bz2 21323337 SHA256 79f99ecc24696915439c474c4953bb77652ab53f16b41daa4da270fe43279c5a SHA512 29f8aa715ebe47c8a06bd5f6a80cac3fb75b2ca7aa81648cc8aed5461cfd825e4da68b6209ca672dce42b968521cfd9bffffaadd2d85b904b55d99687a1c83d0 WHIRLPOOL 333fee72b2a0e9d6ab8a003712c38166bd27aaff384a2b940c089ecc846f7669c59efbeb5cdc2fc87a46d63b0d29d0335873bb7c22f05913bad430b81990241a
@ -29,11 +32,14 @@ DIST wine-compholio-daily-1.7.18-1.tar.gz 874844 SHA256 3b42267d2e8b06895cbd16b1
DIST wine-compholio-daily-1.7.20.tar.gz 887611 SHA256 d61244de8ed14bba4fff12b2c9fa8e16bef485efc60567019a18674444c691d9 SHA512 7eb763e908bf960060f7932273c330ac263290fbce0803ae1b4fbe000ec60cf7b3221749c4b5af7f7001963446c5b24484ec192bf13b28cdbf7953727b6e6132 WHIRLPOOL 49885b58eafebb756d15599dc3bfbd766b2557f157c27f735c5d73147ef74fcdef0ecbd8b724bf3e6a6a68eb36126af486e204ffb1afa1b31feacf6e1a9952cc
DIST wine-compholio-daily-1.7.21.tar.gz 883833 SHA256 eda345e48ca4b1ff8c191703b3d853fab39527543e96e41bbe0f253b21b9ab68 SHA512 96dea0b5e8d448ef6e54497c222c4c5b5ab3ed727dececfaf1af11f9695749fe53cf52c9f5ecdc9b454ed0fc01a30d0ebae3847bd99e527b99c63fa4942380e8 WHIRLPOOL 3a837e6f0e399db889c8428e01fd52d78dae002f212c570ca1dfa6841dd33a89214913977a2f280fd6363c8a21d27973e20c43f481bfbc02cd7882a9d2d79bc7
DIST wine-gentoo-2013.06.24.tar.bz2 85442 SHA256 bfbf6b25e98f717320de2ede467e3628fbc749d936b8449f8477c9dc6f41e04b SHA512 b6819889314f6a6ea16c1332f4b177c43623116763969c31b23b61754cd304dd085f5d3eafbe847159331eb97dddd9b4c10699430129ea4a71da418c1fe175f0 WHIRLPOOL 227e0ac6569736d4ad5813cef49f775dae956f4fc9255de95753d5d3cba1bf6cf3db31d23d3702bb54d2e60c5a6f779b602f0efb2096e4c827c924565b273d00
DIST wine-gentoo-2015.03.07.tar.bz2 85419 SHA256 f13f93dc49bbc33a294c4d511b6e01aec2d38bff77a1e44d07668291add1ab04 SHA512 bae1d2d5575d340d01f44008104f0e5ec0c4a4982995dec37d501594cd21d07a2b4ad4465c4273646d5bf6521996b4b82471097864be75342abe3e7d478a56bd WHIRLPOOL 0f254dd692e87a1f71dd19f6c1c8c59b8a91b994e75912a2e6e3ba5e875b85119fe497a331a95c2ce33bbf5f064143d23ee00275da92c494227de0807c9abb06
DIST wine-mono-0.0.8.msi 46967296 SHA256 3dfc23bbc29015e4e538dab8b83cb825d3248a0e5cf3b3318503ee7331115402 SHA512 d3009f2301b0a006136e880025a736f24612faa7a954956896124ec7282d35b678f02658e8be12b1c02ee217e594a2c728a9258c36ccb346b186a4781951adbd WHIRLPOOL 1d4b2e88ebab1f603326a238cc908982c7e135a33340087e8645572838d2b6034764e9fe787bb890792dea4c0531d26f9a6a811a7c200edb99ab82f975179389
DIST wine-mono-4.5.2.msi 52502528 SHA256 d9124edb41ba4418af10eba519dafb25ab4338c567d25ce0eb4ce1e1b4d7eaad SHA512 73c907f63b73836d5afd0753197358aaea43a74a47800f929ef0627112298256f1fa46d1b9ff297b117468d953cdeab21fb5962db13c5debbcb71004462df609 WHIRLPOOL 18d3544c6753c5a01917bfc1b694f31ce45213108527f13317ec0bb8b2d2339ce41800534967e067cd15cd186ef9e186a5d3252275e443dfa1a6ae3641d4d17c
DIST wine-mono-4.5.4.msi 53706752 SHA256 20bced7fee01f25279edf07670c5033d25c2c9834a839e7a20410ce1c611d6f2 SHA512 307fab2ac50c4eaa5c3fb8446ceb2df0d95c0a9d7c1e6289ef1ec5cc660fa8fcb26025c9723ce2bc01afcaf7e9c4dd9939d1beba877f4f95f6f80d92d8187221 WHIRLPOOL ccd1fed03158dd309d2a1f88558e5ad0e2e43de5ba61ab82702132bd0cdf75db75dcc1a61b5cb2775fdf0ad51464f34d2b3629538b1737cbedb410b859ef092a
DIST wine-mono-4.5.6.msi 53705216 SHA256 ac681f737f83742d786706529eb85f4bc8d6bdddd8dcdfa9e2e336b71973bc25 SHA512 4d8df04c1d0da09d1abe423dd271e5dd14a193d607fb54e214d2e340827f7c33829342d1580b6907d7cf466e70993d743c6e1ca9a026d4b6225dd7c1fc8b1386 WHIRLPOOL 9a68e502da0be6768e92d88f2ccace607300f3a331e0f9e1b6d60e9c6c2d4eb635b902f03e13aad73461dd5f0c2691c7b41958356ebb7f445e8def4282c675d3
DIST wine-staging-1.7.29.tar.gz 8423703 SHA256 27fab2e3a16f1af4580328ec399bd383915cd8827855f7e77d69d8ddddee2ade SHA512 a923c8b46c50f013f2b5f87dc554a9cfeb77b60a8ee7822775f38922a2ef90b30967e2489c77a8f5cecc1771a5b19e81e43e17ca74ff904485e7ea13c115d1d2 WHIRLPOOL 32a0f1c7c7ce71354e2aae5c870caaf2b210f5bc2cfc4ac2ab0a1e14bc2ee913fad5c487cd3cca9cc5fe58482b7b3110bf59c8576b690c68ff5e31fb567b2d59
DIST wine-staging-1.7.33.tar.gz 8759402 SHA256 30b7ecee549514ecd186689ae8eac15ed37507755025c8272d31e8fd4808b3f2 SHA512 b3b939c8d5af419a9305a16de93486f75197d28bc39be4ca0abdea3e194745bfb401ecf6e092f93c59f68255aa7f051ee847ad3c8521ce87ecbf91abccc900f6 WHIRLPOOL 657bc4d642e1c799c6e0b39ef627c8f6852ab8d511e86f96c54065d87fb144d25a97b1a2572e87a029084d568fda7bbdab7c2ba5255dc07f02691f46e9796960
DIST wine-staging-1.7.38.tar.gz 9047747 SHA256 b77fc0913c972c0cb2b3fcc3d7627a838ba05cb876396cab526f518564f2f936 SHA512 125937505308a974840d810beb9df10d57cf488b173836c5debf71a96cc11cd3dfee666960768db361edd3b280858f2e6db5eaa8d81f4b487b7c53a0f8fef13c WHIRLPOOL c5cb14dd7527752a0496e343d7b12a53c9df629c027d746e33ac3c25ad20bfebd22c40ceb31bd5e70d3ea2a9188efe076eceab30c3c3f2d519fb31164f189f5a
DIST wine_gecko-1.0.0-x86.cab 8119486 SHA256 7ddf697677506fb164c52771864e32dd69a359ed855b2efbc51340de2376c99c SHA512 0b8f778698f04ed2c01c25a866e54752ff67ad42099179c3c4d161b7f2cba92f262ee6ad909b382e57038428eacddf519b77934c079451eb0cbab6a030eee307 WHIRLPOOL d77903a7fecbc3ecc2d0ddb58fbc98fb401a796fc4d21b216de12702aef38a120c2e7d6f8279308a1d96b66b230973f076f267f246b3b1c02b40e40a518a57e7
DIST wine_gecko-1.3-x86.msi 13609984 SHA256 4b7559e889eff5ed924d25ce49297aff55f43c4b9d34dafa970261d88c40b5ae SHA512 4d45ec762eba1fc2cc8ac1f6672e88ef392395ecd97a48038845c2dd7b40a49df7460cd88aff432b75bfe75231108710901a4759d2ab3998ed7052130d6bc46b WHIRLPOOL d9afae5ab439612e509fbe2b8a405a0252f872e826b0b6cb2c739c1cea0eb4c3a35e5152ac1ad583d17c21fec5c013a43f13779e92929b93e51ee819b70e73d7
DIST wine_gecko-1.3-x86_64.msi 13835776 SHA256 07e9885d15ad22629c3854d6bd77094c3f4db1028ebda408ec87b101fa135d75 SHA512 26e596e498368f8307435a85e440205c1105e10538f8e6ddbb24fd022eed495e4f2d7f09b6b06d26b5a3cf1eb8d629f9baf342fcd239b3aeb16f08324e376e01 WHIRLPOOL 9f3502cf8514873ad3fb49aff0c63eda2b8fa3659d4dbecdb3366d4949cc0b256fcfa0e4269f011887e856113a3bf74dfc365348b9ab1a2c78eac98ab990d3ee
@ -45,6 +51,8 @@ DIST wine_gecko-2.24-x86.msi 22373888 SHA256 6e38acae87ea66e2c1e8f2f0afe88f89eed
DIST wine_gecko-2.24-x86_64.msi 23608320 SHA256 47557da68bcb2aedaebb93af73275aac96ba23e896bd98f25f2acbfd216d9cc8 SHA512 45ce0dcf42c3e2fe2198092812242e3467b19db4a4946e0b1a2d6327fd48aa936fb85cc1930bace6eaba0c61bff3a6536767ba0a91a0f085f307d1bddd171f0c WHIRLPOOL b6ba7c784d3a79d7afc11f0e12f0372b52b9f194eedfd083abed36a461e7301d2dd936be3be12619364f6ac5aae9cfbfb7fc47141bff92b62826f209365210ec
DIST wine_gecko-2.34-x86.msi 28269568 SHA256 956c26bf302b1864f4d7cb6caee4fc83d4c1281157731761af6395b876e29ca7 SHA512 abc5a4ef496ee407579cd2f284cbcb03306a08cbf3cc4952f3339286aefb36737d2d641d8e72b10a02a4d71478964e676812452c12ff7cb6aaeaf5210408c358 WHIRLPOOL ef72209b4c63fc81f787644046c5fd168b8a5a4e7e5c8652eb7a78ce3b433d888512bdd5aab6ea07248c9c148175006666cd7a800bcfb2b3a73de3f50d1fab76
DIST wine_gecko-2.34-x86_64.msi 29802496 SHA256 0f2c1b24c4cd1b3fa3fb3fe31dcd9ee162446b1f3370c0a18c8cb03a0c1a1070 SHA512 6bc69e1c8612533b3f37c16782833bca0e3aaa8ae872fe9f347ee081575c55c03866d6c71a5fb767bf4c3b012ae72f7d9c384d6d25c2584bf349126521e8f463 WHIRLPOOL a03df2c16088cf573c9273a59ba6998455917a49e0bf84028136d0ecff65a91f20edbecec55455b742682dcee5f5e618b8f2e8c15c71625642cd8b67a7774bd0
DIST wine_gecko-2.36-x86.msi 29718016 SHA256 afa457ce8f9885225b6e549dd6f154713ce15bf063c23e38c1327d2f869e128a SHA512 6099240fb76368ed9bb6b775d5972b6124972ace92ccfe1051caeb8884d9e12d40c35220419f0d02443584bf2d82799dfca8206410d171470ce15903703924f0 WHIRLPOOL 4b8fc20a8b228268f3407ca425427a2d91f81ff9e6f0860d4f3eb156c97e3ec1ea83ca3510ee10bfb37598f91c3323a46ba75eace3334632b26cbd45959dc908
DIST wine_gecko-2.36-x86_64.msi 31222784 SHA256 701b84004bf584a2dae7c1296121172c933321cb795c3817b64435fd3364ed44 SHA512 814b13268beeac4d0ace4ab62dbc29ccd92fc13a135499b8ea5a14355992d576268e1e401b28906e8379a826159c5bb051ad274a1e64dd0d5424d495f8e10e10 WHIRLPOOL dbd0e275bdca2ff7a1930daa62d23fd438a90f71b0fed1096b34b8d00a3f51cb91468ce61acaa9361a57deb9f3cfe70a21d16fc23de95cb4e0f7f957d4727010
DIST winepulse-0.35-configure.ac.patch 2826 SHA256 837bffaaddb6b7b0a474c7262a57f12e250e135cf6228dde1a22849f66de1250 SHA512 cb7a86c75cfca401e12ab117407cbae95c7aecffed37d1843e5b58bfdeb54212cb7c4b783280cc94afa0f1c9e58ebb61e28627ed3b690e099cd539d052cbd3bc WHIRLPOOL eb03bfc3e01798c3203814f9b7cf73bf1839ae3563d464f569166285c035b9e2f5f2d74b1238dc141ae1ec67a9e6be4f87d558014f490f43fa990ad19dea5121
DIST winepulse-0.36.patch 101815 SHA256 7508b171bfecb461ecb464426cb4bcd9c3ff77645b787fcbf61e27dd34fe1b05 SHA512 9b9ca1284c6f8f1108a0456989dd0e7a3a35a3075dd5e6601e84d91e65a60a263992736a16c432a7ca75f40e9dc904cdb546b51acd1508b78cbaff060a461d6f WHIRLPOOL d00f9ebd163b632c9cdf3d6581cc9c010b7c0db4c96666591dc4fc1aa48bac030def35964a4dca9c9405ab32b51eaecf2f392b0f57771bc2dd04f5bc2603e789
DIST winepulse-0.38-winecfg.patch 13088 SHA256 051ef1cb5598c319152ad28b85733927a711b45e0bfa92f0b0b2331588f5894e SHA512 714358ec1c1251fde97430e6a3342a8a455f5bf56f1f57f895c6ebaf73e4c396f15f7b12d0f8e02822526e1b4d19a6f161b53ad7c7dd6db1cf8516c95352404f WHIRLPOOL 9e34956d2da028fed29112791bd8497fcdf8b7de8f5f04903b411f091bbe57a8b8ea647a829ab04fcf08ebc5e59d96029e855fbd20a99ae222aad9b322925ab0

@ -1,629 +0,0 @@
From 9e081cd4a04e3326d4927aa082695f15432590e2 Mon Sep 17 00:00:00 2001
From: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu, 14 Aug 2014 11:49:20 +0200
Subject: [PATCH] TESTING -- override pthreads to fix gstreamer v4
I believe the code is ready and will work properly now in all cases.
but please test before cherry picking this patch, and report
success or failure to me please.
Changes since v1:
- Call pthread_yield to make sure that we link against libpthread.
This fixes the build on saucy.
Changes since v2:
- Set thread_data->detached before creating the thread to prevent
a race condition.
Changes since v3:
- Set thread_data->detached CORRECTLY. Fix a small race between
thread creation and pthread_detach.
---
dlls/ntdll/ntdll_misc.h | 3 +
dlls/ntdll/thread.c | 307 +++++++++++++++++++++++++++++++++++++--
dlls/winegstreamer/glibthread.c | 13 ++
libs/wine/loader.c | 7 +
libs/wine/wine.map | 6 +
loader/Makefile.in | 2 +-
loader/main.c | 41 +++++
7 files changed, 362 insertions(+), 17 deletions(-)
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 4370084..1af819b 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -28,6 +28,7 @@
#include "winnt.h"
#include "winternl.h"
#include "wine/server.h"
+#include "wine/list.h"
#define MAX_NT_PATH_LENGTH 277
@@ -235,6 +236,8 @@ struct ntdll_thread_data
WINE_VM86_TEB_INFO vm86; /* 1fc vm86 private data */
void *exit_frame; /* 204 exit frame pointer */
#endif
+ struct list entry;
+ BOOL detached;
};
static inline struct ntdll_thread_data *ntdll_get_thread_data(void)
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index c8461b0..8d5470e 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -33,6 +33,7 @@
#ifdef HAVE_SYS_SYSCALL_H
#include <sys/syscall.h>
#endif
+#include <errno.h>
#define NONAMELESSUNION
#include "ntstatus.h"
@@ -58,6 +59,7 @@ struct startup_info
TEB *teb;
PRTL_THREAD_START_ROUTINE entry_point;
void *entry_arg;
+ BOOL native_thread;
};
static PEB *peb;
@@ -202,6 +204,78 @@ static ULONG get_dyld_image_info_addr(void)
}
#endif /* __APPLE__ */
+#ifdef __linux__
+extern typeof(pthread_create) *__glob_pthread_create, *call_pthread_create;
+extern typeof(pthread_join) *__glob_pthread_join, *call_pthread_join;
+extern typeof(pthread_detach) *__glob_pthread_detach, *call_pthread_detach;
+
+static typeof(pthread_create) __hook_pthread_create;
+static typeof(pthread_join) __hook_pthread_join;
+static typeof(pthread_detach) __hook_pthread_detach;
+
+static pthread_mutex_t thread_lock;
+
+static void thread_wrap_init(void)
+{
+ pthread_mutexattr_t attr;
+ pthread_mutexattr_init(&attr);
+ pthread_mutexattr_setrobust(&attr, PTHREAD_MUTEX_ROBUST);
+ pthread_mutex_init(&thread_lock, &attr);
+ pthread_mutexattr_destroy(&attr);
+
+ call_pthread_create = __hook_pthread_create;
+ call_pthread_join = __hook_pthread_join;
+ call_pthread_detach = __hook_pthread_detach;
+}
+
+static TEB *dead_teb;
+static struct list active_list = LIST_INIT(active_list);
+
+static void take_thread_lock(void)
+{
+ int ret = pthread_mutex_lock(&thread_lock);
+ if (ret == EOWNERDEAD)
+ pthread_mutex_consistent(&thread_lock);
+}
+
+static void detach_thread_unlock(TEB *own_teb)
+{
+ struct ntdll_thread_data *thread_data;
+ TEB *teb = dead_teb;
+
+ dead_teb = own_teb;
+
+ pthread_mutex_unlock(&thread_lock);
+ if (!teb)
+ return;
+
+ thread_data = (struct ntdll_thread_data *)teb->SpareBytes1;
+ __glob_pthread_join(thread_data->pthread_id, NULL);
+ signal_free_thread(teb);
+}
+
+static void reap_thread(TEB *teb)
+{
+ struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SpareBytes1;
+ take_thread_lock();
+ if (thread_data->detached)
+ detach_thread_unlock(teb);
+ else {
+ /*
+ * Do not unlock, wait until the thread is thoroughly dead.
+ * This prevents a race condition where detach is called
+ * after the thread has not finished dying yet.
+ */
+ }
+}
+
+#else
+#define __glob_pthread_create pthread_create
+#define __glob_pthread_join pthread_join
+#define __glob_pthread_detach pthread_detach
+#define thread_wrap_init()
+#endif
+
/***********************************************************************
* thread_init
*
@@ -220,6 +294,7 @@ HANDLE thread_init(void)
struct ntdll_thread_data *thread_data;
static struct debug_info debug_info; /* debug info for initial thread */
+ thread_wrap_init();
virtual_init();
/* reserve space for shared user data */
@@ -349,14 +424,12 @@ void terminate_thread( int status )
pthread_exit( UIntToPtr(status) );
}
-
-/***********************************************************************
- * exit_thread
- */
-void exit_thread( int status )
+static void exit_thread_common( int status )
{
+#ifndef __linux__
static void *prev_teb;
TEB *teb;
+#endif
if (status) /* send the exit code to the server (0 is already the default) */
{
@@ -380,24 +453,177 @@ void exit_thread( int status )
pthread_sigmask( SIG_BLOCK, &server_block_set, NULL );
+#ifndef __linux__
if ((teb = interlocked_xchg_ptr( &prev_teb, NtCurrentTeb() )))
{
struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)teb->SpareBytes1;
if (thread_data->pthread_id)
{
- pthread_join( thread_data->pthread_id, NULL );
+ __glob_pthread_join( thread_data->pthread_id, NULL );
signal_free_thread( teb );
}
}
+#else
+ reap_thread(NtCurrentTeb());
+#endif
close( ntdll_get_thread_data()->wait_fd[0] );
close( ntdll_get_thread_data()->wait_fd[1] );
close( ntdll_get_thread_data()->reply_fd );
close( ntdll_get_thread_data()->request_fd );
+}
+
+void exit_thread( int status )
+{
+ exit_thread_common(status);
pthread_exit( UIntToPtr(status) );
}
+#ifdef __linux__
+
+struct unix_arg {
+ void *(*start)(void *);
+ void *arg;
+};
+
+/* dummy used for comparison */
+static DWORD native_unix_start;
+
+static void call_native_cleanup(void *arg)
+{
+ exit_thread_common(0);
+}
+
+static int
+__hook_pthread_create(pthread_t *thread, const pthread_attr_t *attr,
+ void *(*start_routine) (void *), void *parm)
+{
+ NTSTATUS ret;
+ pthread_t tid;
+ size_t stack = 8 * 1024 * 1024;
+ struct unix_arg arg;
+ arg.start = start_routine;
+ arg.arg = parm;
+
+ if (!thread)
+ thread = &tid;
+
+ TRACE("Overriding thread creation!\n");
+ if (attr) {
+ static int once;
+ if (!once++)
+ FIXME("most thread attributes ignored!\n");
+ else
+ WARN("most thread attributes ignored!\n");
+
+ pthread_attr_getstacksize(attr, &stack);
+ }
+
+ ret = RtlCreateUserThread( NtCurrentProcess(), NULL, FALSE, NULL, stack, 0, (void*)&native_unix_start, &arg, NULL, (void*)thread );
+ if (ret != STATUS_SUCCESS)
+ FIXME("ret: %08x\n", ret);
+ switch (ret) {
+ case STATUS_SUCCESS:
+ TRACE("created thread %lx for %p/%p\n", *thread, start_routine, parm);
+ return 0;
+ case STATUS_NO_MEMORY:
+ return ENOMEM;
+ case STATUS_TOO_MANY_OPENED_FILES:
+ return EMFILE;
+ default:
+ ERR("Unhandled ntstatus %08x\n", ret);
+ return ENOMEM;
+ }
+}
+
+static int __hook_pthread_detach(pthread_t thread)
+{
+ struct ntdll_thread_data *thread_data;
+ TEB *teb = NULL;
+
+ if (pthread_equal(thread, pthread_self())) {
+ TRACE("Detached self: %lx\n", pthread_self());
+ ntdll_get_thread_data()->detached = 1;
+ return 0;
+ }
+
+ take_thread_lock();
+ LIST_FOR_EACH_ENTRY(thread_data, &active_list, typeof(*thread_data), entry) {
+ if (pthread_equal(thread_data->pthread_id, thread)) {
+ teb = CONTAINING_RECORD(thread_data, typeof(*teb), SpareBytes1);
+
+ list_remove(&thread_data->entry);
+ if (!pthread_tryjoin_np(thread, NULL)) {
+ detach_thread_unlock(NULL);
+ TRACE("Thread %lx was dead, cleaning up\n", thread);
+ signal_free_thread(teb);
+ return 0;
+ }
+ thread_data->detached = 1;
+ break;
+ }
+ }
+ detach_thread_unlock(NULL);
+ if (!teb)
+ TRACE("Could not find thread %lx to detach\n", thread);
+ else
+ TRACE("Changed thread %lx to detached\n", thread);
+ return teb ? 0 : ESRCH;
+}
+
+static int __hook_pthread_join(pthread_t thread, void **retval)
+{
+ struct ntdll_thread_data *thread_data, *t2;
+ int ret = ESRCH;
+
+ if (pthread_equal(thread, pthread_self()))
+ return EDEADLK;
+
+ take_thread_lock();
+ LIST_FOR_EACH_ENTRY(thread_data, &active_list, typeof(*thread_data), entry) {
+ TEB *teb = CONTAINING_RECORD(thread_data, typeof(*teb), SpareBytes1);
+
+ if (pthread_equal(thread, thread_data->pthread_id)) {
+
+ ret = pthread_tryjoin_np(thread, retval);
+ if (!ret) {
+ TRACE("Thread %lx was dead fastpath, cleaning up\n", thread);
+ goto free;
+ }
+ detach_thread_unlock(NULL);
+
+ ret = __glob_pthread_join(thread, retval);
+ if (ret) {
+ TRACE("Thread %lx join failed with %i, ignoring\n", thread, ret);
+ return ret;
+ }
+
+ take_thread_lock();
+ /* Check if someone else freed the thread yet */
+ LIST_FOR_EACH_ENTRY(t2, &active_list, typeof(*thread_data), entry)
+ if (t2 == thread_data) {
+ TRACE("Cleaning up after successful join\n");
+ goto free;
+ }
+ TRACE("No clean up after successful join, multiple pthread_join's?\n");
+ break;
+
+free:
+ list_remove(&thread_data->entry);
+ detach_thread_unlock(NULL);
+ signal_free_thread(teb);
+ return 0;
+ }
+ }
+
+ detach_thread_unlock(NULL);
+ if (ret)
+ TRACE("failed with %i\n", ret);
+ return ret;
+}
+
+#endif
/***********************************************************************
* start_thread
@@ -426,9 +652,19 @@ static void start_thread( struct startup_info *info )
if (TRACE_ON(relay))
DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg );
- call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg );
-}
+#ifdef __linux__
+ if (info->native_thread) {
+ void *(*start)(void*) = (void*)func;
+ FIXME("Started native thread %08x\n", GetCurrentThreadId());
+ pthread_cleanup_push(call_native_cleanup, NULL);
+ pthread_exit(start(arg));
+ pthread_cleanup_pop(1);
+ return;
+ }
+#endif
+ call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg );
+}
/***********************************************************************
* RtlCreateUserThread (NTDLL.@)
@@ -440,14 +676,13 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR *
HANDLE *handle_ptr, CLIENT_ID *id )
{
sigset_t sigset;
- pthread_t pthread_id;
pthread_attr_t attr;
struct ntdll_thread_data *thread_data;
struct startup_info *info = NULL;
HANDLE handle = 0, actctx = 0;
TEB *teb = NULL;
DWORD tid = 0;
- int request_pipe[2];
+ int request_pipe[2], ret;
NTSTATUS status;
if (process != NtCurrentProcess())
@@ -472,10 +707,14 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR *
if (handle_ptr) *handle_ptr = wine_server_ptr_handle( result.create_thread.handle );
else NtClose( wine_server_ptr_handle( result.create_thread.handle ));
}
+ TRACE("CreateThread for other process returns %08x\n", result.create_thread.status);
return result.create_thread.status;
}
- if (server_pipe( request_pipe ) == -1) return STATUS_TOO_MANY_OPENED_FILES;
+ if (server_pipe( request_pipe ) == -1) {
+ TRACE("CreateThread cannot create request pipe: %m\n");
+ return STATUS_TOO_MANY_OPENED_FILES;
+ }
wine_server_send_fd( request_pipe[0] );
SERVER_START_REQ( new_thread )
@@ -496,12 +735,16 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR *
if (status)
{
close( request_pipe[1] );
+ TRACE("CreateThread server request failed with %08x\n", status);
return status;
}
pthread_sigmask( SIG_BLOCK, &server_block_set, &sigset );
- if ((status = signal_alloc_thread( &teb ))) goto error;
+ if ((status = signal_alloc_thread( &teb ))) {
+ TRACE("CreateThread signal thread allocation failed with %08x\n", status);
+ goto error;
+ }
teb->Peb = NtCurrentTeb()->Peb;
teb->ClientId.UniqueProcess = ULongToHandle(GetCurrentProcessId());
@@ -524,32 +767,64 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR *
info = (struct startup_info *)(teb + 1);
info->teb = teb;
- info->entry_point = start;
- info->entry_arg = param;
+#ifdef __linux__
+ info->native_thread = (void*)start == (void*)&native_unix_start;
+ if (info->native_thread) {
+ struct unix_arg *arg = param;
+ info->entry_point = (void*)arg->start;
+ info->entry_arg = arg->arg;
+ } else
+#endif
+ {
+ info->entry_point = start;
+ info->entry_arg = param;
+ }
thread_data = (struct ntdll_thread_data *)teb->SpareBytes1;
+#ifdef __linux__
+ thread_data->detached = !info->native_thread;
+#endif
thread_data->request_fd = request_pipe[1];
thread_data->reply_fd = -1;
thread_data->wait_fd[0] = -1;
thread_data->wait_fd[1] = -1;
+ thread_data->entry.next = NULL;
- if ((status = virtual_alloc_thread_stack( teb, stack_reserve, stack_commit ))) goto error;
+ if ((status = virtual_alloc_thread_stack( teb, stack_reserve ?: (8 << 20), stack_commit ?: (1 << 20) ))) {
+ TRACE("Allocating virtual stack for %p (%li/%li) failed with %08x\n", start, stack_reserve, stack_commit, status);
+ goto error;
+ }
pthread_attr_init( &attr );
pthread_attr_setstack( &attr, teb->DeallocationStack,
(char *)teb->Tib.StackBase - (char *)teb->DeallocationStack );
pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */
interlocked_xchg_add( &nb_threads, 1 );
- if (pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info ))
+
+ take_thread_lock();
+ ret = __glob_pthread_create( &thread_data->pthread_id, &attr, (void * (*)(void *))start_thread, info );
+ if (ret)
{
+ TRACE("pthread create failed with %i/%m\n", ret);
interlocked_xchg_add( &nb_threads, -1 );
pthread_attr_destroy( &attr );
status = STATUS_NO_MEMORY;
goto error;
}
+ if (!thread_data->detached)
+ list_add_tail(&active_list, &thread_data->entry);
+ detach_thread_unlock(NULL);
+
pthread_attr_destroy( &attr );
pthread_sigmask( SIG_SETMASK, &sigset, NULL );
+ TRACE("Created thread succesfully, win handle: %04x, pthread: %lx\n", tid, thread_data->pthread_id);
+
+#ifdef __linux__
+ if ((void*)start == (void*)&native_unix_start && id)
+ *(pthread_t*)id = thread_data->pthread_id;
+ else
+#endif
if (id) id->UniqueThread = ULongToHandle(tid);
if (handle_ptr) *handle_ptr = handle;
else NtClose( handle );
diff --git a/dlls/winegstreamer/glibthread.c b/dlls/winegstreamer/glibthread.c
index 0d829a0..46e22f4 100644
--- a/dlls/winegstreamer/glibthread.c
+++ b/dlls/winegstreamer/glibthread.c
@@ -43,6 +43,7 @@
#include <stdlib.h>
#include <stdio.h>
+#if 0
#include "windef.h"
#include "winbase.h"
#include "winnls.h"
@@ -388,3 +389,15 @@ void g_thread_impl_init (void)
g_thread_self_tls = TlsAlloc ();
g_thread_init(&g_thread_functions_for_glib_use_default);
}
+
+#else
+
+void g_thread_impl_init (void)
+{
+ static gboolean beenhere = FALSE;
+
+ if (!beenhere++)
+ g_thread_init(NULL);
+}
+
+#endif
diff --git a/libs/wine/loader.c b/libs/wine/loader.c
index 7261522..a8c31b9 100644
--- a/libs/wine/loader.c
+++ b/libs/wine/loader.c
@@ -73,6 +73,13 @@ char **__wine_main_argv = NULL;
WCHAR **__wine_main_wargv = NULL;
char **__wine_main_environ = NULL;
+#ifdef __linux__
+#include <pthread.h>
+typeof(pthread_create) *call_pthread_create, *__glob_pthread_create;
+typeof(pthread_join) *call_pthread_join, *__glob_pthread_join;
+typeof(pthread_detach) *call_pthread_detach, *__glob_pthread_detach;
+#endif
+
struct dll_path_context
{
unsigned int index; /* current index in the dll path list */
diff --git a/libs/wine/wine.map b/libs/wine/wine.map
index 2159fac..fb3b951 100644
--- a/libs/wine/wine.map
+++ b/libs/wine/wine.map
@@ -117,6 +117,12 @@ WINE_1.0
wine_utf8_mbstowcs;
wine_utf8_wcstombs;
wine_wctype_table;
+ __glob_pthread_create;
+ call_pthread_create;
+ __glob_pthread_join;
+ call_pthread_join;
+ __glob_pthread_detach;
+ call_pthread_detach;
local: *;
};
diff --git a/loader/Makefile.in b/loader/Makefile.in
index 95e4798..a18dd02 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -1,4 +1,4 @@
-EXTRALIBS = $(PTHREAD_LIBS)
+EXTRALIBS = $(PTHREAD_LIBS) $(DL_LIBS)
C_SRCS = \
main.c \
diff --git a/loader/main.c b/loader/main.c
index ac67290..76609e1 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -202,6 +202,45 @@ static int pre_exec(void)
#endif
+#ifdef __linux__
+
+extern typeof(pthread_create) *call_pthread_create, *__glob_pthread_create;
+extern typeof(pthread_detach) *call_pthread_detach, *__glob_pthread_detach;
+extern typeof(pthread_join) *call_pthread_join, *__glob_pthread_join;
+
+int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
+ void *(*start_routine) (void *), void *arg)
+{
+ return call_pthread_create(thread, attr, start_routine, arg);
+}
+
+int pthread_detach(pthread_t thread)
+{
+ return call_pthread_detach(thread);
+}
+
+int pthread_join(pthread_t thread, void **retval)
+{
+ return call_pthread_join(thread, retval);
+}
+
+static void init_thread_hook(void) {
+ call_pthread_create = __glob_pthread_create = dlvsym(RTLD_NEXT, "pthread_create", "GLIBC_2.2.5");
+ if (!__glob_pthread_create)
+ call_pthread_create = __glob_pthread_create = dlvsym(RTLD_NEXT, "pthread_create", "GLIBC_2.1");
+
+ call_pthread_detach = __glob_pthread_detach = dlsym(RTLD_NEXT, "pthread_detach");
+ call_pthread_join = __glob_pthread_join = dlsym(RTLD_NEXT, "pthread_join");
+
+ /* Call a function from libpthread to ensure being linked against it */
+ pthread_yield();
+}
+
+#else
+
+#define init_thread_hook()
+
+#endif
/**********************************************************************
* main
@@ -211,6 +250,8 @@ int main( int argc, char *argv[] )
char error[1024];
int i;
+ init_thread_hook();
+
if (!getenv( "WINELOADERNOEXEC" )) /* first time around */
{
static char noexec[] = "WINELOADERNOEXEC=1";
--
1.7.6.6.GIT

@ -0,0 +1,50 @@
From 0f579172142d290dc48b9d466f9cd699987aacf3 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Wed, 25 Feb 2015 22:45:42 +0100
Subject: [PATCH] ntdll: Fix race-condition when threads are killed during
shutdown.
When exit_thread is executed, nb_threads is decremented before the thread is
fully shutdown. When another thread runs ExitProcess() this will cause a SIGQUIT
signal to all threads, effectively decrementing nb_threads twice. The process
will terminate with a wrong exitcode then because the refcount reaches zero too
early.
Currently Wine has no locking protection of LdrShutdownProcess(), so it can
only be executed safely when all other threads have terminated before. Most
likely there are more Wine bugs in this area, but the attached patch should
fix the most critical one (messed up refcounting of threads) for now.
[Alexandre Rostovtsev <tetromino@gentoo.org> : rebase to be applied after
Maarten Lankhorst's "override pthreads to fix gstreamer v5" patch.]
---
dlls/ntdll/thread.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 936cabe..98e679e 100755
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -459,6 +459,7 @@ static void exit_thread_common( int status )
{
#ifndef __linux__
static void *prev_teb;
+ sigset_t sigset;
TEB *teb;
#endif
@@ -495,6 +496,11 @@ static void exit_thread_common( int status )
signal_free_thread( teb );
}
}
+
+ sigemptyset( &sigset );
+ sigaddset( &sigset, SIGQUIT );
+ pthread_sigmask( SIG_BLOCK, &sigset, NULL );
+ if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
#else
reap_thread(NtCurrentTeb());
#endif
--
2.3.1

@ -0,0 +1,48 @@
From 0d92921d264d5d0d1041c66353f022f1bc88577f Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sun, 8 Mar 2015 00:10:31 -0500
Subject: [PATCH] Revert "ntdll: Fix race-condition when threads are killed
during shutdown."
This reverts Sebastian Lackner's Wine-Staging patch to allow Maarten
Lankhorst's "override pthreads to fix gstreamer v5" to apply
---
dlls/ntdll/thread.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 74e64c9..3696c8e 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -370,7 +370,6 @@ void terminate_thread( int status )
void exit_thread( int status )
{
static void *prev_teb;
- sigset_t sigset;
TEB *teb;
if (status) /* send the exit code to the server (0 is already the default) */
@@ -384,7 +383,7 @@ void exit_thread( int status )
SERVER_END_REQ;
}
- if (interlocked_xchg_add( &nb_threads, 0 ) <= 1)
+ if (interlocked_xchg_add( &nb_threads, -1 ) <= 1)
{
LdrShutdownProcess();
exit( status );
@@ -406,11 +405,6 @@ void exit_thread( int status )
}
}
- sigemptyset( &sigset );
- sigaddset( &sigset, SIGQUIT );
- pthread_sigmask( SIG_BLOCK, &sigset, NULL );
- if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
-
close( ntdll_get_thread_data()->wait_fd[0] );
close( ntdll_get_thread_data()->wait_fd[1] );
close( ntdll_get_thread_data()->reply_fd );
--
2.3.1

@ -2,6 +2,12 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>wine</herd>
<herd>proxy-maintainers</herd>
<maintainer>
<email>np.hardass@gmail.com</email>
<name>NP-Hardass</name>
<description>Proxied co-maintainer</description>
</maintainer>
<longdescription>
Wine is an Open Source implementation of the Windows API on top of X and Unix.
@ -18,14 +24,15 @@ Think of Wine as a compatibility layer for running Windows programs. Wine does n
<flag name='osmesa'>Add support for OpenGL in bitmaps using libOSMesa</flag>
<flag name='pcap'>Support packet capture software (e.g. wireshark)</flag>
<flag name='perl'>Install helpers written in perl (winedump/winemaker)</flag>
<flag name='pipelight'>Apply unofficial Compholio patches for Pipelight/Silverlight support;
use at your own peril</flag>
<flag name='pipelight'>Apply unofficial Wine-Staging patches for Pipelight/Silverlight support</flag>
<flag name='prelink'>Run prelink on DLLs during build -- do not disable if you do not know what this means as it can break things at runtime</flag>
<flag name='realtime'>Pull in <pkg>sys-auth/rtkit</pkg> for low-latency pulseaudio support</flag>
<flag name='run-exes'>Use Wine to open and run .EXE and .MSI files</flag>
<flag name='s3tc'>Pull in <pkg>media-libs/libtxc_dxtn</pkg> for DXTn texture compression, needed for many games</flag>
<flag name='samba'>Add support for NTLM auth. see
http://wiki.winehq.org/NtlmAuthSetupGuide and
http://wiki.winehq.org/NtlmSigningAndSealing</flag>
<flag name='staging'>Apply unofficial Wine-Staging patches for advanced feature support that haven't made it into upstream Wine yet</flag>
<flag name='win32'>Build a 32bit version of Wine (won't run Win64 binaries)</flag>
<flag name='win64'>Build a 64bit version of Wine (won't run Win32 binaries)</flag>
</use>

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.28.ebuild,v 1.2 2015/01/01 21:01:23 ryao Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.28.ebuild,v 1.3 2015/03/08 07:00:24 tetromino Exp $
EAPI="5"
@ -26,6 +26,7 @@ GV="2.24"
MV="4.5.2"
COMPHOLIO_P="wine-compholio-${PV}"
WINE_GENTOO="wine-gentoo-2013.06.24"
GST_P="wine-1.7.28-gstreamer-v4"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/"
SRC_URI="${SRC_URI}
@ -36,6 +37,7 @@ SRC_URI="${SRC_URI}
mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v${PV}.tar.gz -> ${COMPHOLIO_P}.tar.gz )
pulseaudio? ( https://github.com/compholio/wine-compholio-daily/archive/v${PV}.tar.gz -> ${COMPHOLIO_P}.tar.gz )
gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
LICENSE="LGPL-2.1"
@ -295,6 +297,7 @@ src_unpack() {
use pipelight || use pulseaudio && unpack "${COMPHOLIO_P}.tar.gz"
unpack "${WINE_GENTOO}.tar.bz2"
use gstreamer && unpack "${GST_P}.patch.bz2"
l10n_find_plocales_changes "${S}/po" "" ".po"
}
@ -316,7 +319,7 @@ src_prepare() {
ewarn "Applying experimental patch to fix GStreamer support. Note that"
ewarn "this patch has been reported to cause crashes in certain games."
PATCHES+=( "${FILESDIR}/${PN}-1.7.28-gstreamer-v4.patch" )
PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
fi
if use pipelight; then
ewarn "Applying the unofficial Compholio patchset for Pipelight support,"

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.29.ebuild,v 1.2 2015/01/01 21:01:23 ryao Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.29.ebuild,v 1.3 2015/03/08 07:00:24 tetromino Exp $
EAPI="5"
@ -26,6 +26,7 @@ GV="2.24"
MV="4.5.2"
COMPHOLIO_P="wine-staging-${PV}"
WINE_GENTOO="wine-gentoo-2013.06.24"
GST_P="wine-1.7.28-gstreamer-v4"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/"
SRC_URI="${SRC_URI}
@ -36,6 +37,7 @@ SRC_URI="${SRC_URI}
mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
pipelight? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${COMPHOLIO_P}.tar.gz )
pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${COMPHOLIO_P}.tar.gz )
gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
LICENSE="LGPL-2.1"
@ -294,6 +296,7 @@ src_unpack() {
use pipelight || use pulseaudio && unpack "${COMPHOLIO_P}.tar.gz"
unpack "${WINE_GENTOO}.tar.bz2"
use gstreamer && unpack "${GST_P}.patch.bz2"
l10n_find_plocales_changes "${S}/po" "" ".po"
}
@ -315,7 +318,7 @@ src_prepare() {
ewarn "Applying experimental patch to fix GStreamer support. Note that"
ewarn "this patch has been reported to cause crashes in certain games."
PATCHES+=( "${FILESDIR}/${PN}-1.7.28-gstreamer-v4.patch" )
PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
fi
if use pipelight; then
ewarn "Applying the unofficial Compholio patchset for Pipelight support,"

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.33.ebuild,v 1.1 2015/01/01 21:01:23 ryao Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.33.ebuild,v 1.2 2015/03/08 07:00:24 tetromino Exp $
EAPI="5"
@ -26,6 +26,7 @@ GV="2.34"
MV="4.5.4"
COMPHOLIO_P="wine-staging-${PV}"
WINE_GENTOO="wine-gentoo-2013.06.24"
GST_P="wine-1.7.28-gstreamer-v4"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/"
SRC_URI="${SRC_URI}
@ -36,6 +37,7 @@ SRC_URI="${SRC_URI}
mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
pipelight? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${COMPHOLIO_P}.tar.gz )
pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${COMPHOLIO_P}.tar.gz )
gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
LICENSE="LGPL-2.1"
@ -296,6 +298,7 @@ src_unpack() {
use pipelight || use pulseaudio && unpack "${COMPHOLIO_P}.tar.gz"
unpack "${WINE_GENTOO}.tar.bz2"
use gstreamer && unpack "${GST_P}.patch.bz2"
l10n_find_plocales_changes "${S}/po" "" ".po"
}
@ -317,7 +320,7 @@ src_prepare() {
ewarn "Applying experimental patch to fix GStreamer support. Note that"
ewarn "this patch has been reported to cause crashes in certain games."
PATCHES+=( "${FILESDIR}/${PN}-1.7.28-gstreamer-v4.patch" )
PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
fi
if use pipelight; then
ewarn "Applying the unofficial Compholio patchset for Pipelight support,"

@ -0,0 +1,530 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-1.7.38.ebuild,v 1.1 2015/03/08 07:00:24 tetromino Exp $
EAPI="5"
AUTOTOOLS_AUTORECONF=1
PLOCALES="ar bg ca cs da de el en en_US eo es fa fi fr he hi hr hu it ja ko lt ml nb_NO nl or pa pl pt_BR pt_PT rm ro ru sk sl sr_RS@cyrillic sr_RS@latin sv te th tr uk wa zh_CN zh_TW"
PLOCALE_BACKUP="en"
inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib multilib-minimal pax-utils toolchain-funcs virtualx
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
EGIT_BRANCH="master"
inherit git-r3
SRC_URI=""
#KEYWORDS=""
else
MY_P="${PN}-${PV/_/-}"
SRC_URI="mirror://sourceforge/${PN}/Source/${MY_P}.tar.bz2"
KEYWORDS="-* ~amd64 ~x86 ~x86-fbsd"
S=${WORKDIR}/${MY_P}
fi
GV="2.36"
MV="4.5.6"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}"
WINE_GENTOO="wine-gentoo-2015.03.07"
GST_P="wine-1.7.34-gstreamer-v5"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/"
SRC_URI="${SRC_URI}
gecko? (
abi_x86_32? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86.msi )
abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
)
mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
if [[ ${PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
else
SRC_URI="${SRC_URI}
staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
SLOT="0"
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
test? ( abi_x86_32 )
elibc_glibc? ( threads )
mono? ( abi_x86_32 )
pipelight? ( staging )
s3tc? ( staging )
vaapi? ( staging )
osmesa? ( opengl )" #286560
# FIXME: the test suite is unsuitable for us; many tests require net access
# or fail due to Xvfb's opengl limitations.
RESTRICT="test"
NATIVE_DEPEND="
truetype? ( >=media-libs/freetype-2.0.0 )
capi? ( net-dialup/capi4k-utils )
ncurses? ( >=sys-libs/ncurses-5.2:= )
udisks? ( sys-apps/dbus )
fontconfig? ( media-libs/fontconfig:= )
gphoto2? ( media-libs/libgphoto2:= )
openal? ( media-libs/openal:= )
gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 )
X? (
x11-libs/libXcursor
x11-libs/libXext
x11-libs/libXrandr
x11-libs/libXi
x11-libs/libXxf86vm
)
xinerama? ( x11-libs/libXinerama )
alsa? ( media-libs/alsa-lib )
cups? ( net-print/cups:= )
opencl? ( virtual/opencl )
opengl? (
virtual/glu
virtual/opengl
)
gsm? ( media-sound/gsm:= )
jpeg? ( virtual/jpeg:0= )
ldap? ( net-nds/openldap:= )
lcms? ( media-libs/lcms:2= )
mp3? ( >=media-sound/mpg123-1.5.0 )
netapi? ( net-fs/samba[netapi(+)] )
nls? ( sys-devel/gettext )
odbc? ( dev-db/unixODBC:= )
osmesa? ( media-libs/mesa[osmesa] )
pcap? ( net-libs/libpcap )
staging? ( sys-apps/attr )
pulseaudio? ( media-sound/pulseaudio )
xml? ( dev-libs/libxml2 dev-libs/libxslt )
scanner? ( media-gfx/sane-backends:= )
ssl? ( net-libs/gnutls:= )
png? ( media-libs/libpng:0= )
v4l? ( media-libs/libv4l )
vaapi? ( x11-libs/libva[X] )
xcomposite? ( x11-libs/libXcomposite )"
COMMON_DEPEND="
!amd64? ( ${NATIVE_DEPEND} )
amd64? (
abi_x86_64? ( ${NATIVE_DEPEND} )
abi_x86_32? (
truetype? ( || (
>=app-emulation/emul-linux-x86-xlibs-2.1[development,-abi_x86_32(-)]
>=media-libs/freetype-2.5.0.1[abi_x86_32(-)]
) )
ncurses? ( || (
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
>=sys-libs/ncurses-5.9-r3[abi_x86_32(-)]
) )
udisks? ( || (
>=app-emulation/emul-linux-x86-baselibs-20130224[development,-abi_x86_32(-)]
>=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)]
) )
fontconfig? ( || (
app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
>=media-libs/fontconfig-2.10.92[abi_x86_32(-)]
) )
gphoto2? ( || (
app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
>=media-libs/libgphoto2-2.5.3.1[abi_x86_32(-)]
) )
openal? ( || (
app-emulation/emul-linux-x86-sdl[development,-abi_x86_32(-)]
>=media-libs/openal-1.15.1[abi_x86_32(-)]
) )
gstreamer? ( || (
app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
(
>=media-libs/gstreamer-0.10.36-r2:0.10[abi_x86_32(-)]
>=media-libs/gst-plugins-base-0.10.36:0.10[abi_x86_32(-)]
)
) )
X? ( || (
app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
(
>=x11-libs/libXcursor-1.1.14[abi_x86_32(-)]
>=x11-libs/libXext-1.3.2[abi_x86_32(-)]
>=x11-libs/libXrandr-1.4.2[abi_x86_32(-)]
>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
>=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)]
)
) )
xinerama? ( || (
app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
>=x11-libs/libXinerama-1.1.3[abi_x86_32(-)]
) )
alsa? ( || (
app-emulation/emul-linux-x86-soundlibs[alsa,development,-abi_x86_32(-)]
>=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)]
) )
cups? ( || (
app-emulation/emul-linux-x86-baselibs
>=net-print/cups-1.7.1-r1[abi_x86_32(-)]
) )
opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)] )
opengl? ( || (
app-emulation/emul-linux-x86-opengl[development,-abi_x86_32(-)]
(
>=virtual/glu-9.0-r1[abi_x86_32(-)]
>=virtual/opengl-7.0-r1[abi_x86_32(-)]
)
) )
gsm? ( || (
app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
>=media-sound/gsm-1.0.13-r1[abi_x86_32(-)]
) )
jpeg? ( || (
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
>=virtual/jpeg-0-r2:0[abi_x86_32(-)]
) )
ldap? ( || (
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
>=net-nds/openldap-2.4.38-r1:=[abi_x86_32(-)]
) )
lcms? ( || (
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
>=media-libs/lcms-2.5:2[abi_x86_32(-)]
) )
mp3? ( || (
app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
>=media-sound/mpg123-1.15.4[abi_x86_32(-)]
) )
netapi? ( >=net-fs/samba-3.6.23-r1[netapi(+),abi_x86_32(-)] )
nls? ( || (
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
>=sys-devel/gettext-0.18.3.2[abi_x86_32(-)]
) )
odbc? ( || (
app-emulation/emul-linux-x86-db[development,-abi_x86_32(-)]
>=dev-db/unixODBC-2.3.2:=[abi_x86_32(-)]
) )
osmesa? ( || (
>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
) )
pcap? ( net-libs/libpcap[abi_x86_32(-)] )
pulseaudio? ( || (
app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
) )
staging? ( || (
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
) )
xml? ( || (
>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
(
>=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
>=dev-libs/libxslt-1.1.28-r1[abi_x86_32(-)]
)
) )
scanner? ( || (
app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
>=media-gfx/sane-backends-1.0.23:=[abi_x86_32(-)]
) )
ssl? ( || (
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
>=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)]
) )
png? ( || (
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
>=media-libs/libpng-1.6.10:0[abi_x86_32(-)]
) )
v4l? ( || (
app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
) )
vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
xcomposite? ( || (
app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
) )
)
)"
RDEPEND="${COMMON_DEPEND}
dos? ( games-emulation/dosbox )
perl? ( dev-lang/perl dev-perl/XML-Simple )
s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.0.25 )
selinux? ( sec-policy/selinux-wine )
udisks? ( sys-fs/udisks:2 )
pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
staging? ( dev-lang/perl dev-perl/XML-Simple )
X? (
x11-proto/inputproto
x11-proto/xextproto
x11-proto/xf86vidmodeproto
)
xinerama? ( x11-proto/xineramaproto )
prelink? ( sys-devel/prelink )
>=sys-kernel/linux-headers-2.6
virtual/pkgconfig
virtual/yacc
sys-devel/flex"
# These use a non-standard "Wine" category, which is provided by
# /etc/xdg/applications-merged/wine.menu
QA_DESKTOP_FILE="usr/share/applications/wine-browsedrive.desktop
usr/share/applications/wine-notepad.desktop
usr/share/applications/wine-uninstaller.desktop
usr/share/applications/wine-winecfg.desktop"
wine_build_environment_check() {
[[ ${MERGE_TYPE} = "binary" ]] && return 0
if use abi_x86_64 && [[ $(( $(gcc-major-version) * 100 + $(gcc-minor-version) )) -lt 404 ]]; then
eerror "You need gcc-4.4+ to build 64-bit wine"
eerror
return 1
fi
if use abi_x86_32 && use opencl && [[ x$(eselect opencl show 2> /dev/null) = "xintel" ]]; then
eerror "You cannot build wine with USE=opencl because intel-ocl-sdk is 64-bit only."
eerror "See https://bugs.gentoo.org/487864 for more details."
eerror
return 1
fi
}
pkg_pretend() {
wine_build_environment_check || die
}
pkg_setup() {
wine_build_environment_check || die
}
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
git-r3_src_unpack
if use staging || use pulseaudio; then
EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
unset ${PN}_LIVE_REPO;
EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
fi
else
unpack ${MY_P}.tar.bz2
use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
fi
unpack "${WINE_GENTOO}.tar.bz2"
use gstreamer && unpack "${GST_P}.patch.bz2"
l10n_find_plocales_changes "${S}/po" "" ".po"
}
src_prepare() {
local md5="$(md5sum server/protocol.def)"
local PATCHES=(
"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
)
if use gstreamer; then
# See http://bugs.winehq.org/show_bug.cgi?id=30557
ewarn "Applying experimental patch to fix GStreamer support. Note that"
ewarn "this patch has been reported to cause crashes in certain games."
# Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
# during shutdown" patch prevents the gstreamer patch from applying cleanly.
# So undo the staging patch, apply gstreamer, then re-apply rebased staging
# patch on top.
if use staging; then
PATCHES+=(
"${FILESDIR}/${PN}-1.7.38-gstreamer-v5-staging-pre.patch"
"${WORKDIR}/${GST_P}.patch"
"${FILESDIR}/${PN}-1.7.38-gstreamer-v5-staging-post.patch" )
else
PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
fi
fi
if use staging; then
ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
ewarn "unless you can reproduce them with USE=-staging"
local STAGING_EXCLUDE=""
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
ebegin "Running Wine-Staging patch installer"
(
set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
cd "${STAGING_DIR}/patches"
source "${STAGING_DIR}/patches/patchinstall.sh"
)
eend $?
elif use pulseaudio; then
PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
fi
autotools-utils_src_prepare
# Modification of the server protocol requires regenerating the server requests
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
einfo "server/protocol.def was patched; running tools/make_requests"
tools/make_requests || die #432348
fi
sed -i '/^UPDATE_DESKTOP_DATABASE/s:=.*:=true:' tools/Makefile.in || die
if ! use run-exes; then
sed -i '/^MimeType/d' tools/wine.desktop || die #117785
fi
# hi-res default icon, #472990, http://bugs.winehq.org/show_bug.cgi?id=24652
cp "${WORKDIR}"/${WINE_GENTOO}/icons/oic_winlogo.ico dlls/user32/resources/ || die
l10n_get_locales > po/LINGUAS # otherwise wine doesn't respect LINGUAS
}
src_configure() {
export LDCONFIG=/bin/true
use custom-cflags || strip-flags
multilib-minimal_src_configure
}
multilib_src_configure() {
local myconf=(
--sysconfdir=/etc/wine
$(use_with alsa)
$(use_with capi)
$(use_with lcms cms)
$(use_with cups)
$(use_with ncurses curses)
$(use_with udisks dbus)
$(use_with fontconfig)
$(use_with ssl gnutls)
$(use_with gphoto2 gphoto)
$(use_with gsm)
$(use_with gstreamer)
--without-hal
$(use_with jpeg)
$(use_with ldap)
$(use_with mp3 mpg123)
$(use_with netapi)
$(use_with nls gettext)
$(use_with openal)
$(use_with opencl)
$(use_with opengl)
$(use_with osmesa)
$(use_with oss)
$(use_with pcap)
$(use_with png)
$(use_with threads pthread)
$(use_with scanner sane)
$(use_enable test tests)
$(use_with truetype freetype)
$(use_with v4l)
$(use_with X x)
$(use_with xcomposite)
$(use_with xinerama)
$(use_with xml)
$(use_with xml xslt)
)
if use pulseaudio || use staging; then
myconf+=( $(use_with pulseaudio pulse) )
fi
use staging && myconf+=(
--with-xattr
$(use_with vaapi va)
)
local PKG_CONFIG AR RANLIB
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
# set AR and RANLIB to make QA scripts happy; #483342
tc-export PKG_CONFIG AR RANLIB
if use amd64; then
if [[ ${ABI} == amd64 ]]; then
myconf+=( --enable-win64 )
else
myconf+=( --disable-win64 )
fi
# Note: using --with-wine64 results in problems with multilib.eclass
# CC/LD hackery. We're using separate tools instead.
fi
ECONF_SOURCE=${S} \
econf "${myconf[@]}"
emake depend
}
multilib_src_test() {
# FIXME: win32-only; wine64 tests fail with "could not find the Wine loader"
if [[ ${ABI} == x86 ]]; then
if [[ $(id -u) == 0 ]]; then
ewarn "Skipping tests since they cannot be run under the root user."
ewarn "To run the test ${PN} suite, add userpriv to FEATURES in make.conf"
return
fi
WINEPREFIX="${T}/.wine-${ABI}" \
Xemake test
fi
}
multilib_src_install_all() {
local DOCS=( ANNOUNCE AUTHORS README )
local l
add_locale_docs() {
local locale_doc="documentation/README.$1"
[[ ! -e ${locale_doc} ]] || DOCS+=( ${locale_doc} )
}
l10n_for_each_locale_do add_locale_docs
einstalldocs
prune_libtool_files --all
emake -C "../${WINE_GENTOO}" install DESTDIR="${D}" EPREFIX="${EPREFIX}"
if use gecko ; then
insinto /usr/share/wine/gecko
use abi_x86_32 && doins "${DISTDIR}"/wine_gecko-${GV}-x86.msi
use abi_x86_64 && doins "${DISTDIR}"/wine_gecko-${GV}-x86_64.msi
fi
if use mono ; then
insinto /usr/share/wine/mono
doins "${DISTDIR}"/wine-mono-${MV}.msi
fi
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
fi
use abi_x86_32 && pax-mark psmr "${D}"usr/bin/wine{,-preloader} #255055
use abi_x86_64 && pax-mark psmr "${D}"usr/bin/wine64{,-preloader}
if use abi_x86_64 && ! use abi_x86_32; then
dosym /usr/bin/wine{64,} # 404331
dosym /usr/bin/wine{64,}-preloader
fi
# respect LINGUAS when installing man pages, #469418
for l in de fr pl; do
use linguas_${l} || rm -r "${D}"usr/share/man/${l}*
done
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
}
pkg_postrm() {
gnome2_icon_cache_update
fdo-mime_desktop_database_update
}

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.173 2015/01/01 21:01:23 ryao Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/wine-9999.ebuild,v 1.174 2015/03/08 07:00:24 tetromino Exp $
EAPI="5"
@ -12,7 +12,8 @@ inherit autotools-utils eutils fdo-mime flag-o-matic gnome2-utils l10n multilib
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://source.winehq.org/git/wine.git"
inherit git-2
EGIT_BRANCH="master"
inherit git-r3
SRC_URI=""
#KEYWORDS=""
else
@ -22,12 +23,12 @@ else
S=${WORKDIR}/${MY_P}
fi
GV="2.24"
MV="4.5.2"
PULSE_PATCHES="winepulse-patches-1.7.21"
COMPHOLIOV="1.7.21"
COMPHOLIO_PATCHES="wine-compholio-daily-${COMPHOLIOV}"
WINE_GENTOO="wine-gentoo-2013.06.24"
GV="2.36"
MV="4.5.6"
STAGING_P="wine-staging-${PV}"
STAGING_DIR="${WORKDIR}/${STAGING_P}"
WINE_GENTOO="wine-gentoo-2015.03.07"
GST_P="wine-1.7.34-gstreamer-v5"
DESCRIPTION="Free implementation of Windows(tm) on Unix"
HOMEPAGE="http://www.winehq.org/"
SRC_URI="${SRC_URI}
@ -36,20 +37,28 @@ SRC_URI="${SRC_URI}
abi_x86_64? ( mirror://sourceforge/${PN}/Wine%20Gecko/${GV}/wine_gecko-${GV}-x86_64.msi )
)
mono? ( mirror://sourceforge/${PN}/Wine%20Mono/${MV}/wine-mono-${MV}.msi )
pipelight? ( https://github.com/compholio/wine-compholio-daily/archive/v${COMPHOLIOV}.tar.gz -> ${COMPHOLIO_PATCHES}.tar.gz )
pulseaudio? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PULSE_PATCHES}.tar.bz2 )
gstreamer? ( http://dev.gentoo.org/~tetromino/distfiles/${PN}/${GST_P}.patch.bz2 )
http://dev.gentoo.org/~tetromino/distfiles/${PN}/${WINE_GENTOO}.tar.bz2"
if [[ ${PV} == "9999" ]] ; then
STAGING_EGIT_REPO_URI="git://github.com/wine-compholio/wine-staging.git"
else
SRC_URI="${SRC_URI}
staging? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )
pulseaudio? ( https://github.com/wine-compholio/wine-staging/archive/v${PV}.tar.gz -> ${STAGING_P}.tar.gz )"
fi
LICENSE="LGPL-2.1"
SLOT="0"
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pipelight +png +prelink pulseaudio +realtime +run-exes samba scanner selinux +ssl test +threads +truetype +udisks v4l +X xcomposite xinerama +xml"
IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gsm gstreamer +jpeg +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png +prelink pulseaudio +realtime +run-exes s3tc samba scanner selinux +ssl staging test +threads +truetype +udisks v4l vaapi +X +xcomposite xinerama +xml"
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
test? ( abi_x86_32 )
elibc_glibc? ( threads )
gstreamer? ( pulseaudio )
mono? ( abi_x86_32 )
pipelight? ( staging )
s3tc? ( staging )
vaapi? ( staging )
osmesa? ( opengl )" #286560
# winepulse patches needed for gstreamer due to http://bugs.winehq.org/show_bug.cgi?id=30557
# FIXME: the test suite is unsuitable for us; many tests require net access
# or fail due to Xvfb's opengl limitations.
@ -88,13 +97,15 @@ NATIVE_DEPEND="
nls? ( sys-devel/gettext )
odbc? ( dev-db/unixODBC:= )
osmesa? ( media-libs/mesa[osmesa] )
pipelight? ( sys-apps/attr )
pcap? ( net-libs/libpcap )
staging? ( sys-apps/attr )
pulseaudio? ( media-sound/pulseaudio )
xml? ( dev-libs/libxml2 dev-libs/libxslt )
scanner? ( media-gfx/sane-backends:= )
ssl? ( net-libs/gnutls:= )
png? ( media-libs/libpng:0= )
v4l? ( media-libs/libv4l )
vaapi? ( x11-libs/libva[X] )
xcomposite? ( x11-libs/libXcomposite )"
COMMON_DEPEND="
@ -196,14 +207,15 @@ COMMON_DEPEND="
>=app-emulation/emul-linux-x86-opengl-20121028[development,-abi_x86_32(-)]
>=media-libs/mesa-9.1.6[osmesa,abi_x86_32(-)]
) )
pipelight? ( || (
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
) )
pcap? ( net-libs/libpcap[abi_x86_32(-)] )
pulseaudio? ( || (
app-emulation/emul-linux-x86-soundlibs[development,-abi_x86_32(-)]
>=media-sound/pulseaudio-5.0[abi_x86_32(-)]
) )
staging? ( || (
app-emulation/emul-linux-x86-baselibs[development,-abi_x86_32(-)]
>=sys-apps/attr-2.4.47-r1[abi_x86_32(-)]
) )
xml? ( || (
>=app-emulation/emul-linux-x86-baselibs-20131008[development,-abi_x86_32(-)]
(
@ -227,6 +239,7 @@ COMMON_DEPEND="
app-emulation/emul-linux-x86-medialibs[development,-abi_x86_32(-)]
>=media-libs/libv4l-0.9.5[abi_x86_32(-)]
) )
vaapi? ( x11-libs/libva[X,abi_x86_32(-)] )
xcomposite? ( || (
app-emulation/emul-linux-x86-xlibs[development,-abi_x86_32(-)]
>=x11-libs/libXcomposite-0.4.4-r1[abi_x86_32(-)]
@ -237,13 +250,16 @@ COMMON_DEPEND="
RDEPEND="${COMMON_DEPEND}
dos? ( games-emulation/dosbox )
perl? ( dev-lang/perl dev-perl/XML-Simple )
s3tc? ( >=media-libs/libtxc_dxtn-1.0.1-r1[${MULTILIB_USEDEP}] )
samba? ( >=net-fs/samba-3.0.25 )
selinux? ( sec-policy/selinux-wine )
udisks? ( sys-fs/udisks:2 )
pulseaudio? ( realtime? ( sys-auth/rtkit ) )"
# tools/make_requests requires perl
DEPEND="${COMMON_DEPEND}
amd64? ( abi_x86_32? ( !abi_x86_64? ( ${NATIVE_DEPEND} ) ) )
staging? ( dev-lang/perl dev-perl/XML-Simple )
X? (
x11-proto/inputproto
x11-proto/xextproto
@ -290,61 +306,71 @@ pkg_setup() {
src_unpack() {
if [[ ${PV} == "9999" ]] ; then
git-2_src_unpack
git-r3_src_unpack
if use staging || use pulseaudio; then
EGIT_REPO_URI=${STAGING_EGIT_REPO_URI}
unset ${PN}_LIVE_REPO;
EGIT_CHECKOUT_DIR=${STAGING_DIR} git-r3_src_unpack
fi
else
unpack ${MY_P}.tar.bz2
use staging || use pulseaudio && unpack "${STAGING_P}.tar.gz"
fi
use pulseaudio && unpack "${PULSE_PATCHES}.tar.bz2"
if use pipelight; then
unpack "${COMPHOLIO_PATCHES}.tar.gz"
# we use a separate pulseaudio patchset
rm -r "${COMPHOLIO_PATCHES}/patches/06-winepulse" || die
# ... and need special tools for binary patches
mv "${COMPHOLIO_PATCHES}/patches/10-Missing_Fonts" "${T}" || die
fi
unpack "${WINE_GENTOO}.tar.bz2"
use gstreamer && unpack "${GST_P}.patch.bz2"
l10n_find_plocales_changes "${S}/po" "" ".po"
}
src_prepare() {
local md5="$(md5sum server/protocol.def)"
local f
local PATCHES=(
"${FILESDIR}"/${PN}-1.5.26-winegcc.patch #260726
"${FILESDIR}"/${PN}-1.4_rc2-multilib-portage.patch #395615
"${FILESDIR}"/${PN}-1.7.12-osmesa-check.patch #429386
"${FILESDIR}"/${PN}-1.6-memset-O3.patch #480508
)
use pulseaudio && PATCHES+=(
"../${PULSE_PATCHES}"/*.patch #421365
)
if use gstreamer; then
# See http://bugs.winehq.org/show_bug.cgi?id=30557
ewarn "Applying experimental patch to fix GStreamer support. Note that"
ewarn "this patch has been reported to cause crashes in certain games."
PATCHES+=( "../${PULSE_PATCHES}"/gstreamer/*.patch )
# Wine-Staging 1.7.38 "ntdll: Fix race-condition when threads are killed
# during shutdown" patch prevents the gstreamer patch from applying cleanly.
# So undo the staging patch, apply gstreamer, then re-apply rebased staging
# patch on top.
if use staging; then
PATCHES+=(
"${FILESDIR}/${PN}-1.7.38-gstreamer-v5-staging-pre.patch"
"${WORKDIR}/${GST_P}.patch"
"${FILESDIR}/${PN}-1.7.38-gstreamer-v5-staging-post.patch" )
else
PATCHES+=( "${WORKDIR}/${GST_P}.patch" )
fi
fi
if use pipelight; then
ewarn "Applying the unofficial Compholio patchset for Pipelight support,"
ewarn "which is unsupported by Wine developers. Please don't report bugs"
ewarn "to Wine bugzilla unless you can reproduce them with USE=-pipelight"
PATCHES+=(
"../${COMPHOLIO_PATCHES}/patches"/*/*.patch #507950
"../${COMPHOLIO_PATCHES}/patches/patch-list.patch"
if use staging; then
ewarn "Applying the unofficial Wine-Staging patchset which is unsupported"
ewarn "by Wine developers. Please don't report bugs to Wine bugzilla"
ewarn "unless you can reproduce them with USE=-staging"
local STAGING_EXCLUDE=""
use pipelight || STAGING_EXCLUDE="${STAGING_EXCLUDE} -W Pipelight"
# Launch wine-staging patcher in a subshell, using epatch as a backend, and gitapply.sh as a backend for binary patches
ebegin "Running Wine-Staging patch installer"
(
set -- DESTDIR="${S}" --backend=epatch --no-autoconf --all ${STAGING_EXCLUDE}
cd "${STAGING_DIR}/patches"
source "${STAGING_DIR}/patches/patchinstall.sh"
)
# epatch doesn't support binary patches
ebegin "Applying Compholio font patches"
for f in "${T}/10-Missing_Fonts"/*.patch; do
"../${COMPHOLIO_PATCHES}/debian/tools/gitapply.sh" < "${f}" || die "Failed to apply Compholio font patches"
done
eend
eend $?
elif use pulseaudio; then
PATCHES+=( "${STAGING_DIR}/patches/winepulse-PulseAudio_Support"/*.patch )
fi
autotools-utils_src_prepare
# Modification of the server protocol requires regenerating the server requests
if [[ "$(md5sum server/protocol.def)" != "${md5}" ]]; then
einfo "server/protocol.def was patched; running tools/make_requests"
tools/make_requests || die #432348
@ -392,6 +418,7 @@ multilib_src_configure() {
$(use_with opengl)
$(use_with osmesa)
$(use_with oss)
$(use_with pcap)
$(use_with png)
$(use_with threads pthread)
$(use_with scanner sane)
@ -405,8 +432,13 @@ multilib_src_configure() {
$(use_with xml xslt)
)
use pulseaudio && myconf+=( --with-pulse )
use pipelight && myconf+=( --with-xattr )
if use pulseaudio || use staging; then
myconf+=( $(use_with pulseaudio pulse) )
fi
use staging && myconf+=(
--with-xattr
$(use_with vaapi va)
)
local PKG_CONFIG AR RANLIB
# Avoid crossdev's i686-pc-linux-gnu-pkg-config if building wine32 on amd64; #472038
@ -465,7 +497,7 @@ multilib_src_install_all() {
insinto /usr/share/wine/mono
doins "${DISTDIR}"/wine-mono-${MV}.msi
fi
if ! use perl ; then
if ! use perl ; then # winedump calls function_grep.pl, and winemaker is a perl script
rm "${D}"usr/bin/{wine{dump,maker},function_grep.pl} "${D}"usr/share/man/man1/wine{dump,maker}.1 || die
fi

@ -1,3 +1,3 @@
DIST winetricks-20130707.tar.gz 159044 SHA256 020b43f9d3f5aaf41dc5c2ffe72dd257862386fbebfa7b3827f6f18cb1dfd97c SHA512 6e7af997ad6a9852231049a572663c3f3da7fcc3c2ef5ccf3e6fd3f394b2f809f8582959ea201009519200da290a9a7e9b60f1a2c3f7ffa937012dabfc000117 WHIRLPOOL bce5ce3f0562c1598b875b970efa8d4ff05e558ad37ec62ed8b843cfb59afe3f64a4784eb493d48815035e06bd5665a144020bf5c058e99afafef13c81853aa5
DIST winetricks-20140302.tar.gz 163640 SHA256 c14972845a935c3b0f49ae70471f5f2ca0e76db18a59ca178416bef031d2e8c5 SHA512 dd5d6ba1b69ad1ec6db392e379c92c0e0143dea5eb71d682044216739caa81198154095252bff25886099517072086fa01c7e75ed6f451b2af691da992cc27a2 WHIRLPOOL 9c0c8e88feaf2917a51fb51094e75d53b61851ff5d651b220f16b5144c3a51ac344b87e0cd90ef2e03d0c367d7c37b76a96eaabd61ac68c04dce63c02f9b3b92
DIST winetricks-20141130.tar.gz 164917 SHA256 6088f45cac80e0a05a52b0a8885739f98b2c5ae07062bfa2aee1265d63891b56 SHA512 b7fbbcbef1a197b65c0def1cffb238d2ac58862e60aa76503171098ff35cf190a072ae7cddf865f5b03a8269702a804c7ad8ada498b922814f0aad8b2970cee1 WHIRLPOOL 16347e85d161cbf78df9d46b1b49292fe0618e6bfc32d0115e104d0bba1e5cbd6f974e6872ddb7ac8679c8dcf9eccbe0b26841ce02723d1456e0a3c3645d53ed
DIST winetricks-gentoo-2012.11.24.tar.bz2 6398 SHA256 dded8c294cc5c2e71e4a5d1531ab165178cf3d2d1d890d0656368c2e499bfeb9 SHA512 59c93b73f3a7b2d11aefcde2ff66659ff1de21ad4b5f232f4b60572f3a48b15a6c49f369b1696862bf1b33fde190bf5598945e9536fb41ddec42d8def4d2be2a WHIRLPOOL 268da9e06712a678fbbcfff8eac1fca364b5e46f0a9c48a591eb88f03260b1a55f203eb2908bfe1f0a534b77c866127ff6f7049b0e43fe8abeaaa26fe55de75b

@ -2,6 +2,12 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>wine</herd>
<herd>proxy-maintainers</herd>
<maintainer>
<email>np.hardass@gmail.com</email>
<name>NP-Hardass</name>
<description>Proxied co-maintainer</description>
</maintainer>
<upstream>
<remote-id type="google-code">winetricks</remote-id>
</upstream>

@ -1,17 +1,19 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-20130707.ebuild,v 1.1 2013/07/13 03:17:38 tetromino Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-20141130.ebuild,v 1.1 2015/03/07 22:22:23 tetromino Exp $
EAPI=5
inherit gnome2-utils eutils
if [[ ${PV} == "99999999" ]] ; then
ESVN_REPO_URI="http://winetricks.googlecode.com/svn/trunk"
inherit subversion
EGIT_REPO_URI="https://code.google.com/p/winetricks/"
inherit git-r3
SRC_URI=""
else
SRC_URI="http://winetricks.org/download/releases/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}"
fi
wtg=winetricks-gentoo-2012.11.24
SRC_URI="${SRC_URI}
@ -42,11 +44,9 @@ QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
# Tests require network access and run wine, which is unreliable from a portage environment
RESTRICT="test"
S="${WORKDIR}"
src_unpack() {
if [[ ${PV} == "99999999" ]] ; then
subversion_src_unpack
git-r3_src_unpack
if use gtk || use kde; then
unpack ${wtg}.tar.bz2
fi
@ -58,7 +58,7 @@ src_unpack() {
src_install() {
default
if use gtk || use kde; then
cd ${wtg} || die
cd "${WORKDIR}/${wtg}" || die
domenu winetricks.desktop
insinto /usr/share/icons/hicolor/scalable/apps
doins wine-winetricks.svg

@ -1,17 +1,19 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-99999999.ebuild,v 1.11 2013/07/09 12:41:56 tetromino Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/winetricks/winetricks-99999999.ebuild,v 1.12 2015/03/07 22:22:23 tetromino Exp $
EAPI=5
inherit gnome2-utils eutils
if [[ ${PV} == "99999999" ]] ; then
ESVN_REPO_URI="http://winetricks.googlecode.com/svn/trunk"
inherit subversion
EGIT_REPO_URI="https://code.google.com/p/winetricks/"
inherit git-r3
SRC_URI=""
else
SRC_URI="http://winetricks.org/download/releases/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}"
fi
wtg=winetricks-gentoo-2012.11.24
SRC_URI="${SRC_URI}
@ -42,11 +44,9 @@ QA_DESKTOP_FILE="usr/share/applications/winetricks.desktop"
# Tests require network access and run wine, which is unreliable from a portage environment
RESTRICT="test"
S="${WORKDIR}"
src_unpack() {
if [[ ${PV} == "99999999" ]] ; then
subversion_src_unpack
git-r3_src_unpack
if use gtk || use kde; then
unpack ${wtg}.tar.bz2
fi
@ -58,7 +58,7 @@ src_unpack() {
src_install() {
default
if use gtk || use kde; then
cd ${wtg} || die
cd "${WORKDIR}/${wtg}" || die
domenu winetricks.desktop
insinto /usr/share/icons/hicolor/scalable/apps
doins wine-winetricks.svg

@ -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/app-emulation/xtrs/xtrs-4.9d-r3.ebuild,v 1.5 2014/08/03 18:36:01 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xtrs/xtrs-4.9d-r3.ebuild,v 1.6 2015/03/07 21:24:23 ulm Exp $
EAPI=5
@ -21,7 +21,7 @@ IUSE="ls-dos"
RESTRICT="ls-dos? ( bindist )"
RDEPEND="sys-libs/ncurses
sys-libs/readline
sys-libs/readline:0
>=x11-libs/libX11-1.0.0"
DEPEND="${RDEPEND}
ls-dos? ( app-arch/unzip dev-util/xdelta:3 )"

@ -3,3 +3,4 @@ DIST calibre-1.47.0.tar.xz 36581960 SHA256 efeb71a5bb4742a9c0a99038fdd97baa55c35
DIST calibre-1.48.0.tar.xz 35126680 SHA256 e704090f6611c5e374252c3f1b58e077ccd3170a3ea39893e5bf687287abf472 SHA512 0b70f16b10e6c9bbc24955baf74e8fc8e116aaaa1d75d018f5135f657606286de3bfffbebf3b367b2be52708deb05a162de919bba930dcbff59c4ec15c13b28d WHIRLPOOL 1a07a8c916119e92bdf41276db1aef572b704271808bcd6c3a0a4e823c8a76bd2f4267765dee2f378430beec401288b25b35dee6859980adf5b7a9ebe885eff9
DIST calibre-2.18.0.tar.xz 36196564 SHA256 bd470b1dc3e286912866e83f2fa23646594065102896f8efb6705502a39bc716 SHA512 bad35d108e5a46c56e901c006e07f4897eab82a02ff1cc064763bcee913cac278ba31454a0ea0a047f214810fda52f9a1dc0357849864f3071994f63ca9e44d9 WHIRLPOOL 5f56cc8337e6d0a8d300eb134beaa88884831b96824cceca138057099aac3e576a6c0f5d67fea5e6f58c54d4154d984a05789ba5efc551d0a992142f004bc3a5
DIST calibre-2.19.0.tar.xz 36149428 SHA256 76318803979456e9dbac5903436ea8a1a47355a22d69f6a44c292e0a510c92a9 SHA512 8535e4fc27b9196a3f72134d73fb0496ee0c95cb0615f4e1c4abf392022498aabfa7abb3cfa24262e03f77710754a2eea53e5a4d906d76ac815bab72567b975e WHIRLPOOL 5593a9f200ea16a140ad6306253dd80521d2f030437bd9b803794050b5f686cefae1a8989747d9741ffb462d424b2a9b94c35c3562efc1a523856b87d232a1f4
DIST calibre-2.20.0.tar.xz 36187720 SHA256 6d529240eb317c34aa82ca85779c9685453e1bb7192652d8d097fcbe8933448c SHA512 3df3f7ba92d81c6ef47efbdb2ab995db0d3f19cee9857836a603c96f7a145657e16e5ed0b5cc5a59a449e1fa2e76d203e70ad2587871ecb38f06ecf75a309350 WHIRLPOOL 3236a89098d4e171f27b7a42e694c9fa3ca628077fbc495b1a911984a1d7670eb43740fa957578e5c145c19416ce0441849ce0c773ed0abd607d7ff54ad710fa

@ -0,0 +1,227 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/calibre/calibre-2.20.0.ebuild,v 1.1 2015/03/08 03:31:46 yngwin Exp $
EAPI=5
inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs
DESCRIPTION="Ebook management application"
HOMEPAGE="http://calibre-ebook.com/"
[[ ${PV} == ${PV%.*}.${PV#*.} ]] && MY_PV=${PV}.0 || MY_PV=${PV}
SRC_URI="http://sourceforge.net/projects/calibre/files/${MY_PV}/${PN}-${MY_PV}.tar.xz"
LICENSE="
GPL-3+
GPL-3
GPL-2+
GPL-2
GPL-1+
LGPL-3+
LGPL-2.1+
LGPL-2.1
BSD
MIT
Old-MIT
Apache-2.0
public-domain
|| ( Artistic GPL-1+ )
CC-BY-3.0
OFL-1.1
PSF-2
unRAR
"
KEYWORDS="~amd64 ~arm ~x86"
SLOT="0"
IUSE="+udisks"
COMMON_DEPEND="
>=app-text/podofo-0.8.2:=
>=app-text/poppler-0.26.5[qt5]
>=dev-lang/python-2.7.1:2.7[sqlite,ssl]
>=dev-libs/chmlib-0.40:=
dev-libs/glib:2
>=dev-libs/icu-4.4:=
>=dev-python/apsw-3.7.17[python_targets_python2_7(-)]
>=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)]
>=dev-python/dnspython-1.6.0[python_targets_python2_7(-)]
>=dev-python/cssselect-0.7.1[python_targets_python2_7(-)]
>=dev-python/cssutils-0.9.9[python_targets_python2_7(-)]
>=dev-python/dbus-python-0.82.2[python_targets_python2_7(-)]
>=dev-python/lxml-3.2.1[python_targets_python2_7(-)]
>=dev-python/mechanize-0.1.11[python_targets_python2_7(-)]
dev-python/netifaces[python_targets_python2_7(-)]
>=dev-python/python-dateutil-1.4.1[python_targets_python2_7(-)]
>=dev-python/PyQt5-5.2.0[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)]
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
>=media-gfx/imagemagick-6.5.9[jpeg,png]
media-libs/fontconfig
>=media-libs/freetype-2:=
>=media-libs/libmtp-1.1.5:=
>=media-libs/libwmf-0.2.8
sys-libs/zlib
virtual/libusb:1=
virtual/python-imaging[python_targets_python2_7(-)]
virtual/ttf-fonts
x11-libs/libX11
x11-libs/libXext
x11-libs/libXrender
>=x11-misc/xdg-utils-1.0.2-r2
udisks? ( virtual/libudev )"
RDEPEND="${COMMON_DEPEND}
udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
DEPEND="${COMMON_DEPEND}
>=dev-python/setuptools-0.6_rc5
>=virtual/podofo-build-0.8.2"
src_prepare() {
# Fix outdated version constant.
#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
# -i src/calibre/constants.py || \
# die "sed failed to patch constants.py"
# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
# calls xdg-* (bug #258938).
sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-e "s|PreserveMIMEDefaults():||" \
-e "s|xdg-icon-resource install|\\0 --mode user|" \
-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-i src/calibre/linux.py || die "sed failed to patch linux.py"
# Disable unnecessary privilege dropping for bug #287067.
sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-i setup/install.py || die "sed failed to patch install.py"
sed -e "/^ self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
'-i', 'Makefile'])" \
-i setup/extensions.py || die "sed failed to patch extensions.py"
# use system beautifulsoup, instead of bundled
rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
|| die "could not remove bundled beautifulsoup"
find "${S}" -type f -name \*.py -exec \
sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
|| die "could not sed bundled beautifulsoup out of the source tree"
# avoid failure of xdg tools to recognize vendor prefix
sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-i "${S}"/src/calibre/linux.py || die 'sed failed'
# no_updates: do not annoy user with "new version is availible all the time
# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
epatch \
"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
"${FILESDIR}/${PN}-disable_plugins.patch"
}
src_install() {
# Bypass kbuildsycoca and update-mime-database in order to
# avoid sandbox violations if xdg-mime tries to call them.
cat - > "${T}/kbuildsycoca" <<-EOF
#!${BASH}
echo $0 : $@
exit 0
EOF
cp "${T}"/{kbuildsycoca,update-mime-database}
chmod +x "${T}"/{kbuildsycoca,update-mime-database}
export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
# violation with kbuildsycoca as in bug #287067, comment #13.
export -n DISPLAY
# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
# File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
# return _parse_localename(localename)
# File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
# raise ValueError, 'unknown locale: %s' % localename
#ValueError: unknown locale: 46
export -n LANGUAGE
# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
# variables to point to our fake temporary $HOME.
export HOME="${T}/fake_homedir"
export XDG_CONFIG_HOME="${HOME}/.config"
export XDG_DATA_HOME="${HOME}/.local/share"
export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}"
tc-export CC CXX
# Bug #334243 - respect LDFLAGS when building extensions
export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
local libdir=$(get_libdir)
[[ -n $libdir ]] || die "get_libdir returned an empty string"
# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
local x
for x in /dev/dri/card[0-9] ; do
[[ -e ${x} ]] && addpredict ${x}
done
dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
"${EPREFIX}"/usr/bin/python2.7 setup.py install \
--root="${D}" \
--prefix="${EPREFIX}/usr" \
--libdir="${EPREFIX}/usr/${libdir}" \
--staging-root="${ED}usr" \
--staging-libdir="${ED}usr/${libdir}" || die
grep -rlZ "${ED}" "${ED}" | xargs -0 sed -e "s:${D}:/:g" -i ||
die "failed to fix harcoded \$D in paths"
# The menu entries end up here due to '--mode user' being added to
# xdg-* options in src_prepare.
dodir /usr/share/mime/packages
chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
die "failed to register mime types"
dodir /usr/share/icons
mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
die "failed to install icon files"
domenu "${HOME}"/.local/share/applications/*.desktop ||
die "failed to install .desktop menu files"
find "${ED}"usr/share -type d -empty -delete
cd "${ED}"/usr/share/calibre/fonts/liberation || die
local x
for x in * ; do
[[ -f ${EROOT}usr/share/fonts/liberation-fonts/${x} ]] || continue
ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
done
einfo "Converting python shebangs"
while read -r -d $'\0' ; do
local shebang=$(head -n1 "$REPLY")
if [[ ${shebang} == "#!"*python* ]] ; then
sed -i -e "1s:.*:#!${EPREFIX}/usr/bin/python2.7:" "$REPLY" || \
die "sed failed"
fi
done < <(find "${ED}" -type f -print0)
einfo "Compiling python modules"
"${EPREFIX}"/usr/bin/python2.7 -m compileall -q -f \
-d "${EPREFIX}"/usr/lib/calibre "${ED}"usr/lib/calibre || die
newinitd "${FILESDIR}"/calibre-server.init calibre-server
newconfd "${FILESDIR}"/calibre-server.conf calibre-server
}
pkg_postinst() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
}

@ -1,2 +1,3 @@
DIST evince-3.12.2.tar.xz 2913988 SHA256 30c243bbfde56338c25a39003b4848143be42157177e2163a368f14139909f7d SHA512 e3f14ba75f504fd65a5ef00f732796424302514064f503c4e20371cc862e2a75e12909656dca78e0d9689abdb9c198a4fd098bd81ae203aa897750673be465ad WHIRLPOOL f310e4940ec6ae652ee35ddaae98ee446681552e1e1d641b785ca54a679da236dc3c3ce9679d347a723474f0943265869963774d50965f408094d384fe72b73b
DIST evince-3.14.1.tar.xz 3082612 SHA256 13ec728d6957aa18ba21a3a66504dd52b8607596337f30f0908b62b5fcc14507 SHA512 a54b0ab1099fd69ae30b640ecd1edd17c638f0f70ea9f459c49489e40a349a658f76a19d6181aa65e34d97575d687500c216bca370f867fe3348e46e5a77b315 WHIRLPOOL 2eac059cf703c31fcbc1779612d1b2b651fc4c8a3513d095ed9ad403b9ac403912ddd56664e97400ce988709d8082ad59c127b2636be251b65a39edd44f6af70
DIST evince-3.14.2.tar.xz 3089840 SHA256 4c591d0b879092a5f6c9140b75f15bdea3665a332e9b384957c453fd67bf0070 SHA512 f6a2b4037a055997316f2820b2ec6d171f51b0005b16070a2f990d5738ad39a14cc6e4662ad785da528d5e8d8ac48bba3a628c0b728578b00f09859d08b79aa6 WHIRLPOOL 02dc43bf594480a02a3e76e95e0391cc13ca57c0974e304181d3e9a25361298fbdfc9ae43ff03f9e564d8d5704f301021b700da61a684987908fd0fe6459fce9

@ -0,0 +1,99 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-3.14.2.ebuild,v 1.1 2015/03/08 11:00:47 pacho Exp $
EAPI="5"
GCONF_DEBUG="yes"
GNOME2_LA_PUNT="yes"
inherit gnome2
DESCRIPTION="Simple document viewer for GNOME"
HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
LICENSE="GPL-2+ CC-BY-SA-3.0"
# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
SLOT="0/evd3.4-evv3.3"
IUSE="djvu dvi gnome +introspection libsecret nautilus +postscript t1lib tiff xps"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris"
# Since 2.26.2, can handle poppler without cairo support. Make it optional ?
# not mature enough
# atk used in libview
# gdk-pixbuf used all over the place
# libX11 used for totem-screensaver
COMMON_DEPEND="
dev-libs/atk
>=dev-libs/glib-2.36:2[dbus]
>=dev-libs/libxml2-2.5:2
sys-libs/zlib:=
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-3.14:3[introspection?]
gnome-base/gsettings-desktop-schemas
>=x11-libs/cairo-1.10:=
>=app-text/poppler-0.24:=[cairo]
djvu? ( >=app-text/djvu-3.5.17:= )
dvi? (
virtual/tex-base
dev-libs/kpathsea:=
t1lib? ( >=media-libs/t1lib-5:= ) )
gnome? ( gnome-base/gnome-desktop:3 )
introspection? ( >=dev-libs/gobject-introspection-1 )
libsecret? ( >=app-crypt/libsecret-0.5 )
nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
postscript? ( >=app-text/libspectre-0.2:= )
tiff? ( >=media-libs/tiff-3.6:0= )
xps? ( >=app-text/libgxps-0.2.1:= )
"
RDEPEND="${COMMON_DEPEND}
gnome-base/gvfs
gnome-base/librsvg
|| (
>=x11-themes/adwaita-icon-theme-2.17.1
>=x11-themes/gnome-icon-theme-2.17.1
>=x11-themes/hicolor-icon-theme-0.10 )
x11-themes/gnome-icon-theme-symbolic
"
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.3
app-text/yelp-tools
dev-util/gdbus-codegen
>=dev-util/gtk-doc-am-1.13
>=dev-util/intltool-0.35
sys-devel/gettext
virtual/pkgconfig
"
# eautoreconf needs:
# app-text/yelp-tools
src_prepare() {
gnome2_src_prepare
# Do not depend on adwaita-icon-theme, bug #326855, #391859
# https://bugs.freedesktop.org/show_bug.cgi?id=29942
sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-i configure || die "sed failed"
}
src_configure() {
gnome2_src_configure \
--disable-static \
--enable-pdf \
--enable-comics \
--enable-thumbnailer \
--with-platform=gnome \
--enable-dbus \
--enable-browser-plugin \
$(use_enable djvu) \
$(use_enable dvi) \
$(use_with libsecret keyring) \
$(use_enable gnome libgnome-desktop) \
$(use_enable introspection) \
$(use_enable nautilus) \
$(use_enable postscript ps) \
$(use_enable t1lib) \
$(use_enable tiff) \
$(use_enable xps) \
BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
ITSTOOL=$(type -P true)
}

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.7-r1.ebuild,v 1.1 2015/03/06 05:07:33 tetromino Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libglademm/libglademm-2.6.7-r1.ebuild,v 1.2 2015/03/07 18:57:02 tetromino Exp $
EAPI="5"
GCONF_DEBUG="no"
@ -56,6 +56,10 @@ multilib_src_compile() {
multilib_src_install() {
gnome2_src_install
if use examples; then
emake -C "examples" distclean || die "examples clean up failed"
fi
}
multilib_src_install_all() {
@ -66,7 +70,6 @@ multilib_src_install_all() {
fi
if use examples; then
emake -C "${S}/examples" distclean || die "examples clean up failed"
find "${S}/examples" -name "Makefile*" -delete \
|| die "examples cleanup failed"
insinto "/usr/share/doc/${PF}"

@ -0,0 +1 @@
DIST gson-2.3.1-sources.jar 139924 SHA256 2f2bfe44fad034b526caeb600f3cfca056a143c6c9fbd239f5cbcae4e862b8fa SHA512 a0423c03358a1d843806bc9367b1a328c147973247abfa47b956ab0409ae9542199f6402feb93155761fe538e5d0a79a095b8dad3ccd203c5be81e88713469ba WHIRLPOOL 2f5372c63c43b2ca60a329a33b456db64c4baa1a57186b0e01bcbd3454391b1d79cf26614df66eda40dbc1fa29a4da570d5b575ddab135ae17d47f5de96aa3ff

@ -0,0 +1,22 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/gson/gson-2.3.1.ebuild,v 1.1 2015/03/08 09:43:10 chewi Exp $
EAPI=5
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="Java library to convert JSON to Java objects and vice-versa"
HOMEPAGE="http://code.google.com/p/google-gson/"
SRC_URI="http://search.maven.org/remotecontent?filepath=com/google/code/${PN}/${PN}/${PV}/${P}-sources.jar"
LICENSE="Apache-2.0"
SLOT="2.2.2"
KEYWORDS="~amd64"
IUSE=""
DEPEND=">=virtual/jdk-1.5
app-arch/unzip"
RDEPEND=">=virtual/jre-1.5"

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
<longdescription>Gson is a Java library that can be used to convert Java Objects into their JSON representation. It can also be used to convert a JSON string to an equivalent Java object. Gson can work with arbitrary Java objects including pre-existing objects that you do not have source-code of.</longdescription>
</pkgmetadata>

@ -1,4 +1,4 @@
DIST jdk-1_5_0-doc-r1.zip 46191338 SHA256 accb7b36442ac5bed7a3091abedf4e29ba06e23b541f4faa1d0632a3d02053cc
DIST jdk-6u30-apidocs.zip 59086542 SHA256 92739c56e02fa6e7ac8d60a1f59a0ef4a59ac99ab2979d3cdc495bfecf1a50ab SHA512 5139b1a65765f258f21c629a0cfbf07aed0c12b3eb08d4615b049e825abd90c5b3385af99dba3a4ac6e0a94a5ffaa32ee648fb3e7ac1815ec6b74fe0d8e9f0ee WHIRLPOOL 941236c68b189f9cd23f0e904cc01da9f87cc39967c84cddf4c20a04fa2872eb99af147a21bb770320cad28b2cd86205402a141f7217d5301fa9a6ea41c3a136
DIST jdk-7u76-docs-all.zip 61127655 SHA256 a60ed730a3e9fc7126273ffd2670f905f07b1d97b48884477a0116a3d210ba74 SHA512 6bd6e158a2e1691b88dc48944430c581948da55161addc7152aa5707747d360e925ba6a9edfcd6c03fad1e2c7d2ec7d01bcf2d3e2868f1dc5fff94322d7d68ff WHIRLPOOL 0eb1abfeca20f8c59b333e96c520589a67c627996f2032cddb1e253710c4d2e1ba3eef93b3d662a39bfde83382c779e9510799e2b6edbeb95fb0beea478cd5bc
DIST jdk-8u31-docs-all.zip 89924958 SHA256 1e315c39025961a86dce661cf3c19ff2bb18cee22294997e097c60a613add589 SHA512 dde6fcbcc8afb29ac995a2a68201680ce17febe086a74f11b2bf07a5dfd711d279921d574a4bd155500342a6798a8e6a50a1497e2e6270b67d04cc1d3fcbf01d WHIRLPOOL ad26a7b72ef88675beb761f6dcba6269f3880714d0f66afb6b3b2cfb0855136b5d4ffe230277e9e01a3ae5ce9819d02e5f746029559dadb85060cfe00710c5d2
DIST jdk-8u40-docs-all.zip 92224691 SHA256 72fa379013ea0139a9840137ae062d2f6bbc4f31914519d2cbabb678929b4d93 SHA512 c66260fab072a7920b462bdaca6f0fdbe64eb77bc7be1994c990eac5782c3bc64dd4d18ab5663da9e5e54b5b3d9562d743bfcb99ca505c482a03443d47d6dd19 WHIRLPOOL 2dba709f242f151a304dbbe0c5a9bc92cde4b5c9d9e5bef9b07cb789193357cff25ec26f1c3f8971272c6381abdc9dd9a37f343a4f7f98dc26c6dfe71a87cd06

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.31.ebuild,v 1.1 2015/01/23 17:51:17 ercpe Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-java/java-sdk-docs/java-sdk-docs-1.8.0.40.ebuild,v 1.1 2015/03/07 23:40:45 chewi Exp $
EAPI="5"

@ -4,5 +4,5 @@ DIST ecl-12.12.1.tgz 9006697 SHA256 54e77ce8157752eab49f8640f7d0077522d493a4d4de
DIST ecl-12.2.1.tgz 8974948 SHA256 dbb3f83c27f3d2565ca22c1c6b4ab497bbfdd0d0a7b09dee76338f378621f091 SHA512 bf9bff5bfa02c638549ab7dab28d6778c6f676c0ea3ea8b8c11f85a4e9f3cf9fae23c7ec505024b3925ae0c905fccc132729964992c6d9b1524d9dd3b92bdf1f WHIRLPOOL cc8af8a2f92b66acb8578e76b7c982a57567591967c2e2fafbe681fdb8e78725072ec83d240addc255ff29979e6a6d23d077095f094288316f5dd16325d8ffbe
DIST ecl-12.7.1.tar.gz 9009087 SHA256 5709bfb92eff00ddc4bcd59375835e9421dae2d258466af75e7e8d2748e01c4d SHA512 1f4312a9b64e55b01df62b492c1d23bdb231abd28c357d18bd813481e0943a852fdaa79bc89c45d1d1da9c0e8a4e5b43c5525488280156d76cc42e0fe9e0c5fe WHIRLPOOL eb915ce3f014ac7583b4c678f9009acfab73a7ad15abe49542fe49718049804e3bc7270e3b8e8e45687738ebc1119d1a224c1b454e8feac1fc1687b2a2bf4320
DIST ecl-13.5.1.tgz 9401163 SHA256 f91c57ce065fe9748bc8104e191e4b2dcfe854d634315fe7800dd0a613472ca2 SHA512 a09f8b824aa78e461d700eefb1a8b68b876e15d49124a397e0b5b58ad73b80f818133a7b8e48ddb83505eea2f9c5fb024de8701b527524004e336e456eb07c84 WHIRLPOOL def6de6444430e45bfff29c0716a23869e3455ba9b1cd9bfc1f02ef5c79c83df5b2280b8bada28acb1e742cdbe5c819970273386333d7c7c7c4fb48464dc6a2b
DIST ecl-15.2.21.tgz 8750739 SHA256 9200a143361f28b603658de9c57cf06b618a38d46d159c8f717e9d93f610b115 SHA512 4e18d906dedca53705415423cc9cc783a813403671554f7183ae679f5d5e97721a94dde07f7e78845956a152a666c525f2e764e1b82a18021786935985830ca6 WHIRLPOOL f8180d0d66d9b3561b5849f879afcacc2998ace60ce852cca3de8fa4cdb06f5a1173edb12a83a6707156358234c2934c1d415a8da063204a2d830b929bc02937
DIST ecl-15.3.7.tgz 8755180 SHA256 2dc6ffbbf1e0a7b1323d49a991ba1f005127ca3e153651d91ba9e65bdaec948f SHA512 50a28ed551e507bee526ae44a12da2524c1feedf07cf8ca99650e37ecd7b99c4e2f2758c077979b174d303ffdcd9325637b708a29d14d8c3851c7e65d4ea026c WHIRLPOOL 57b0382b0e3dc7cd601b835a371c9ec6658911b1471cb5bfeee6144d22500e8ca55268f2a001c49d446e9be1a3771ca12348f2565f68ec83f1660c4295545a06
DIST ecl-9.12.3.tgz 5758828 SHA256 f4f2e9d584130db9bb61bd09a676ad67c5d0f1ca8096ed781b50a2ae99c5e682 SHA512 8171d28945e5c06f55f6bc5bcf41b5370ee4d5723b3957d2c841aee1e100f3c2ca497f0651f777acd39ceaefeec2737ec254165280446fe51a4ef5cf81ef64b0 WHIRLPOOL 6ff09c048eb639b424a6b32cac88877d11d150f06a1bb482061dc8561c304afc3dbede3610a523a450a1792fd768e713c36dba04ca16501f090a803d7326dd87

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-15.2.21.ebuild,v 1.1 2015/02/23 22:46:07 grozin Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lisp/ecls/ecls-15.3.7.ebuild,v 1.1 2015/03/08 10:35:02 grozin Exp $
EAPI=5
inherit eutils multilib

@ -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/dev-perl/File-HomeDir/File-HomeDir-1.0.0-r1.ebuild,v 1.4 2014/03/03 17:36:20 zlogene Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/File-HomeDir/File-HomeDir-1.0.0-r1.ebuild,v 1.5 2015/03/08 08:32:50 jer Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Get home directory for self or other user"
SLOT="0"
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~ppc-macos ~x64-macos ~x86-solaris"
IUSE="+xdg"
RDEPEND="virtual/perl-File-Spec

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Install/Module-Install-1.140.0.ebuild,v 1.1 2015/02/24 00:39:14 dilfridge Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Install/Module-Install-1.140.0.ebuild,v 1.2 2015/03/08 08:33:29 jer Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Standalone, extensible Perl module installer"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
RDEPEND="

@ -1 +1,2 @@
DIST Gnome2-1.042.tar.gz 80062 SHA256 f4a183bf17ae8de5e27bb9b98e14cd3e960cf6a194e54a712c5783700b37c379 SHA512 0d3b2995ba0542dd4b0eee9eec10dfb3de9259ec3d8d1002bd90bdff71372766ac6fdb67819bb1db42e0340e3cca46c38e5cbaf10844ebeb582131a59abac544 WHIRLPOOL 4668e8fb07b4e140da12e4c6ae19af43f16785fdde345f8c70820e4ade178608b3f48c9fcd19b0cd7e59ddc5f85d3541a80b2c93002117468bad40b8b14479bd
DIST Gnome2-1.045.tar.gz 79262 SHA256 1426044de3ab4900e0a7cb0cc27aa2213c6ad29ed0676b018dce2eee832692f7 SHA512 fa4ac02dbc3d96e6790cff964968f86b9eaf5bb79bbdd2fb3e967e4e8f4bcad25bf1308d25b26ae0298303dfaab7aaa5b49028336d25648614208e622a848316 WHIRLPOOL 54d747c44d06fa7324f3234d9849e400dedd9a0dbfff35834ad754bc74638df83dafd3dca5dab6de13832c533fdd19186765e301d004a03951f4cfad8be2ba6d

@ -0,0 +1,31 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/gnome2-perl/gnome2-perl-1.45.0.ebuild,v 1.1 2015/03/07 23:34:47 monsieurp Exp $
EAPI=5
MY_PN=Gnome2
MODULE_AUTHOR=XAOC
MODULE_VERSION=1.045
inherit perl-module
DESCRIPTION="Perl interface to the 2.x series of the Gnome libraries"
HOMEPAGE="http://gtk2-perl.sourceforge.net/ ${HOMEPAGE}"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~x86"
IUSE=""
RDEPEND="x11-libs/gtk+:2
dev-perl/gtk2-perl
gnome-base/libgnomeui
gnome-base/libbonoboui
dev-perl/gnome2-canvas
>=dev-perl/glib-perl-1.40.0
dev-perl/gnome2-vfs-perl"
DEPEND="${RDEPEND}
dev-perl/extutils-depends
dev-perl/extutils-pkgconfig"
SRC_TEST=do

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/ets/ets-4.4.1.ebuild,v 1.2 2015/03/06 22:18:56 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/ets/ets-4.4.1.ebuild,v 1.3 2015/03/08 10:35:54 pacho Exp $
EAPI=5
@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples"
# see the setup_data.py file for version numbers

@ -1,28 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/jsonrpclib/jsonrpclib-0_pre20110820.ebuild,v 1.1 2012/04/18 14:54:21 vapier Exp $
EAPI="4"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
inherit distutils
if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="git://github.com/joshmarshall/jsonrpclib.git"
inherit git-2
else
SRC_URI="mirror://gentoo/${P}.tar.bz2"
KEYWORDS="~amd64 ~arm ~x86"
fi
DESCRIPTION="python implementation of the JSON-RPC spec (1.0 and 2.0)"
HOMEPAGE="https://github.com/joshmarshall/jsonrpclib"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
DEPEND=""
RDEPEND="${DEPEND}
dev-python/simplejson"

@ -1,46 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/lp_solve/lp_solve-5.5.2.0.ebuild,v 1.3 2012/07/09 17:20:49 bicatali Exp $
EAPI=4
SUPPORT_PYTHON_ABIS=1
RESTRICT_PYTHON_ABIS="2.4 3* 2.7-pypy-* *-jython"
inherit distutils eutils
DESCRIPTION="Python wrappers for lpsolve"
HOMEPAGE="http://lpsolve.sourceforge.net/5.5/Python.htm"
SRC_URI="mirror://sourceforge/lpsolve/${PN}_${PV}_Python_source.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc examples"
RDEPEND="dev-python/numpy
sci-mathematics/lpsolve"
DEPEND="${RDEPEND}
dev-python/setuptools"
S="${WORKDIR}/${PN}_5.5/extra/Python/"
src_prepare(){
epatch "${FILESDIR}"/${P}-setup.patch
}
src_test() {
testing() {
PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" \
"$(PYTHON)" lpdemo.py
}
python_execute_function testing
}
src_install() {
distutils_src_install
dodoc changes
use doc && dohtml Python.htm
insinto /usr/share/doc/${PF}/examples
use examples && doins ex*py
}

@ -1,26 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/py2play/py2play-0.1.10.ebuild,v 1.4 2012/06/03 02:50:54 xmw Exp $
EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
inherit distutils
MY_P="${P/py2play/Py2Play}"
DESCRIPTION="A Peer To Peer network game engine"
HOMEPAGE="http://home.gna.org/oomadness/en/slune"
SRC_URI="http://download.gna.org/slune/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
DEPEND=""
RDEPEND=""
S="${WORKDIR}/${MY_P}"

@ -1,2 +1 @@
DIST python-bibtex-1.2.5.tar.gz 59588 SHA256 59641db49689c5ae8dd4244e2d900a436e426d0f9b74c2512d11a00e40cfdd72 SHA512 b0ed2fecd420310f3bd8f0223ac3649125519b8715be36ed7a709750f947397f332d456590e8623335aac60d1f507c52789a861963947644e004be537b02bcc6 WHIRLPOOL 8cee754e5b91e8c9176c8a5f8646ae05f9bc5bafa56275e6abf19442f2a7ea450435f4c11a355ba108ad6ef3ae2119534596c9834553627b3ec421776eadba40
DIST python-bibtex-1.2.7.tar.gz 60894 SHA256 37709a19b94858def4ede028e670b14153f98c62c6adc926af8102a3279eeaf0 SHA512 6739824fcdad91e2abb333d9e17a31bd222e6100630b8e4f65a9e718d36eb451600fdc7380cb63b89c4a33a7554b79dd1c52448d19c3359f21deee2134242e6b WHIRLPOOL 9c067e05473da5ec7ac5b6a0e5e5dc1363326aeff38946bef33858df8cc324079bf82bed59c5a7642310b749fcd9a8b62f341256373fcefe6919d54dae1fd034

@ -1,40 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-bibtex/python-bibtex-1.2.5.ebuild,v 1.6 2012/05/04 15:12:16 patrick Exp $
EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* *-jython"
inherit distutils eutils
DESCRIPTION="A Python extension to parse BibTeX files"
HOMEPAGE="http://pybliographer.org/"
SRC_URI="mirror://sourceforge/pybliographer/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
RDEPEND="
dev-libs/glib:2
>=app-text/recode-3.6-r1"
DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
distutils_src_prepare
# Disable tests during installation.
sed -e "/self.run_command ('check')/d" -i setup.py
}
src_test() {
testing() {
"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" check
}
python_execute_function testing
}

@ -1,50 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/subunit/subunit-0.0.10.ebuild,v 1.1 2013/02/22 03:34:54 patrick Exp $
EAPI="3"
SUPPORT_PYTHON_ABIS="1"
PYTHON_EXPORT_PHASE_FUNCTIONS="1"
# Automake build does not genereate the correct value for site-packages
# with pypy.
RESTRICT_PYTHON_ABIS="*-pypy-*"
inherit python
DESCRIPTION="A streaming protocol for test results"
HOMEPAGE="https://launchpad.net/subunit http://pypi.python.org/pypi/python-subunit"
SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
LICENSE="Apache-2.0 BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=dev-python/testtools-0.9.23"
DEPEND="${RDEPEND}
dev-lang/perl
dev-libs/check
dev-util/cppunit
virtual/pkgconfig"
src_prepare() {
python_clean_py-compile_files
python_src_prepare
}
src_test() {
testing() {
python_convert_shebangs ${PYTHON_ABI} runtests.py || return
emake check
}
python_execute_function -s testing
}
pkg_postinst() {
python_mod_optimize subunit
}
pkg_postrm() {
python_mod_cleanup subunit
}

@ -1,28 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/ttfquery/ttfquery-1.0.5.ebuild,v 1.4 2012/08/24 08:12:05 xmw Exp $
EAPI="4"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
inherit distutils
MY_PN="TTFQuery"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="Font metadata and glyph outline extraction utility library"
HOMEPAGE="http://ttfquery.sourceforge.net/ http://pypi.python.org/pypi/TTFQuery"
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~ia64 ppc x86"
IUSE=""
DEPEND="dev-python/fonttools
dev-python/numpy"
RDEPEND="${DEPEND}"
RESTRICT_PYTHON_ABIS="3.*"
S="${WORKDIR}/${MY_P}"

@ -1,41 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/twill/twill-0.9.ebuild,v 1.9 2014/10/15 23:05:15 blueness Exp $
EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
inherit distutils
MY_PV="${PV/_beta/b}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="Simple scripting language for web browsing with Python API"
HOMEPAGE="http://twill.idyll.org/"
SRC_URI="http://darcs.idyll.org/~t/projects/${MY_P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
IUSE="doc"
S="${WORKDIR}/${MY_P}"
src_test() {
elog "Testing disabled due to sandbox problems opening"
elog "a port on a server. Unpack the ebuild and run the"
elog "tests manually with 'nosetests' (dev-python/nose)"
elog "in the unpacked directory."
}
src_install() {
distutils_src_install
if use doc; then
dodir /usr/share/doc/${PF}/examples
cp -R doc/* "${D}"/usr/share/doc/${PF}/
cp examples/* "${D}"/usr/share/doc/${PF}/examples/
fi
}

@ -1,27 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/urlgrabber/urlgrabber-3.9.1-r1.ebuild,v 1.7 2012/06/15 14:44:56 jlec Exp $
EAPI="3"
PYTHON_DEPEND="2:2.5"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.4 3.* *-jython *-pypy-*"
inherit distutils eutils
DESCRIPTION="Python module for downloading files"
HOMEPAGE="http://urlgrabber.baseurl.org"
SRC_URI="http://urlgrabber.baseurl.org/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
IUSE=""
DEPEND="dev-python/pycurl"
RDEPEND="${DEPEND}"
RESTRICT="test"
src_prepare() {
epatch "${FILESDIR}"/${P}.patch
}

@ -1,41 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/versiontools/versiontools-1.9.1.ebuild,v 1.4 2012/04/28 12:26:19 xarthisius Exp $
EAPI=4
PYTHON_DEPEND="*"
SUPPORT_PYTHON_ABIS=1
RESTRICT_PYTHON_ABIS="*-jython"
DISTUTILS_SRC_TEST=setup.py
inherit distutils
DESCRIPTION="Smart replacement for plain tuple used in __version__"
HOMEPAGE="http://pypi.python.org/pypi/versiontools/ https://launchpad.net/versiontools"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
IUSE="doc"
LICENSE="GPL-2"
SLOT="0"
RDEPEND=""
DEPEND="dev-python/setuptools
doc? ( dev-python/sphinx )"
src_compile() {
distutils_src_compile
if use doc; then
einfo "Generation of documentation"
PYTHONPATH="build-$(PYTHON -f --ABI)" \
sphinx-build doc doc_output || die "Generation of documentation failed"
fi
}
src_install() {
distutils_src_install
if use doc; then
dohtml -r doc_output/*
fi
}

@ -1,38 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/workerpool/workerpool-0.9.2.ebuild,v 1.3 2014/08/10 21:24:59 slyfox Exp $
EAPI=4
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="*-jython"
DISTUTILS_SRC_TEST=nosetests
PYTHON_TESTS_RESTRICTED_ABIS="3.*"
inherit distutils
DESCRIPTION="Module for distributing jobs to a pool of worker threads"
HOMEPAGE="http://github.com/shazow/workerpool"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test examples"
RDEPEND=""
DEPEND="${RDEPEND}
dev-python/setuptools"
src_test() {
distutils_src_test -v test
}
src_install() {
distutils_src_install
if use examples; then
docompress -x usr/share/doc/${P}/samples
insinto usr/share/doc/${P}/
doins -r samples
fi
}

@ -1,24 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/wsgilog/wsgilog-0.3.ebuild,v 1.1 2012/12/22 11:56:52 hwoarang Exp $
EAPI="4"
SUPPORT_PYTHON_ABIS="1"
PYTHON_DEPEND="2:2.7"
RESTRICT_PYTHON_ABIS="3.*"
inherit eutils distutils
DESCRIPTION="Class for logging in WSGI-applications"
HOMEPAGE="http://pypi.python.org/pypi/wsgilog/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND=""
RDEPEND=""
DOCS="PKG-INFO"
PYTHON_PACKAGE="wsgilog"

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/assistant-5.4.1.ebuild,v 1.1 2015/02/24 18:49:19 pesa Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-qt/assistant/assistant-5.4.1.ebuild,v 1.2 2015/03/08 13:58:55 pesa Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit qt5-build
DESCRIPTION="Tool for viewing on-line documentation in Qt help file format"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS="~hppa"
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~hppa ~x86"
fi

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-5.4.1.ebuild,v 1.1 2015/02/24 18:48:03 pesa Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-qt/designer/designer-5.4.1.ebuild,v 1.2 2015/03/08 13:59:07 pesa Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit qt5-build
DESCRIPTION="WYSIWYG tool for designing and building Qt-based GUIs"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS="~hppa"
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~hppa ~x86"
fi

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist-tools/linguist-tools-5.4.1.ebuild,v 1.1 2015/02/24 18:48:24 pesa Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-qt/linguist-tools/linguist-tools-5.4.1.ebuild,v 1.2 2015/03/08 13:59:12 pesa Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit qt5-build
DESCRIPTION="Tools for working with Qt translation data files"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS="~hppa"
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~hppa ~x86"
fi

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/pixeltool-5.4.1.ebuild,v 1.1 2015/02/24 18:46:32 pesa Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-qt/pixeltool/pixeltool-5.4.1.ebuild,v 1.2 2015/03/08 13:59:23 pesa Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit qt5-build
DESCRIPTION="Qt screen magnifier"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS="~hppa"
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~hppa ~x86"
fi

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbus/qdbus-5.4.1.ebuild,v 1.1 2015/02/24 18:49:25 pesa Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbus/qdbus-5.4.1.ebuild,v 1.2 2015/03/08 13:59:28 pesa Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit qt5-build
DESCRIPTION="Interface to Qt applications communicating over D-Bus"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS="~hppa"
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~hppa ~x86"
fi

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/qdbusviewer-5.4.1.ebuild,v 1.1 2015/02/24 18:47:42 pesa Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdbusviewer/qdbusviewer-5.4.1.ebuild,v 1.2 2015/03/08 13:59:39 pesa Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit qt5-build
DESCRIPTION="Graphical tool that lets you introspect D-Bus objects and messages"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS="~hppa"
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~hppa ~x86"
fi

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdoc/qdoc-5.4.1.ebuild,v 1.1 2015/02/24 18:46:37 pesa Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qdoc/qdoc-5.4.1.ebuild,v 1.2 2015/03/08 13:59:44 pesa Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit qt5-build
DESCRIPTION="Qt documentation generator"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS="~hppa"
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~hppa ~x86"
fi

@ -1,3 +1,3 @@
DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 SHA512 954b0caa9a4c6b7debf62562f3c8f1b4edee13488867208e7d41544b244a111024f2c4c144e4b44e98973cf1d7b5885c13c0b6996ade58e204887eb13bb999cb WHIRLPOOL 1aa5018e19315bd2528580ffa388ff17d96666747e4abad28ea4bcd38315e6efc66379cdda90cb32c17dd1631d0ebedff422e53ee0b9b3c40d7a5766ff4dd9b4
DIST qt-creator-opensource-src-3.2.2.tar.gz 22789455 SHA256 a115f1d7b08446dcfeb79537f3d8d251dbc3c9808d0ff377efe5c4fad7dbd8f0 SHA512 f85381eb6f56d787e5efe02407c4b6f949fd2a766a25567ceccb3a002ec7dd9c6277d9cf39ef0afdd8e110d7bc7436344756225784009a2e01ba9fd8428f885e WHIRLPOOL aa65009cffbc10161cdd9f8e70121c5b2e80df034bb1e06400558a947dcf3284cc23d1b162f85a7ed19af216f0d94d0c5f997c0072c3f19149f64e528fde36a7
DIST qt-creator-opensource-src-3.3.1.tar.gz 22938882 SHA256 afefb73a05cdc36cdfb8a760c2b39eb6c366a22ef47c7d365d446092dd1d5331 SHA512 05d4fee5ef3d5c7b4ab69ec233244aa8e33bd71f55c8ccc57cb53e2c79fbee2cc16c7c827bf5646c0e0d3ee8e33a6808111f367ac3ec7a6d8fd14b998cde1eee WHIRLPOOL 8310134bcee4f4e1f15532a56f57e68bd01ee625fd73624fff1598b8bf2b206dfaa3cde954759101592143e0d6f562cc38dd126c4859c1ca934e8f1f4adccb0c
DIST qt-creator-opensource-src-3.3.2.tar.gz 22939032 SHA256 6ef76d23c778a58caffb487b8bc6a192defa2d5dd5fab1ecf8eb70d53ccfb98a SHA512 6b5c985075ad547558955972c3daa009557f949aa9b9a8a667368abd401c42af4914c330357ad1f8143c139cf58b23b9f44f65beb53feb46142c56fbe624b2f9 WHIRLPOOL 4832225337545e84b2e1e19e9f62abf54834d902ec8ab0ed7dd5adc90f23d51ae2dc51ada897dd0658a18b31306ae251d81377d0eabc7261cb9d9abfa0dc9c7b

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.1.ebuild,v 1.1 2015/02/24 17:54:24 pesa Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qt-creator/qt-creator-3.3.2.ebuild,v 1.1 2015/03/08 13:39:26 pesa Exp $
EAPI=5

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtconcurrent/qtconcurrent-5.4.1.ebuild,v 1.1 2015/02/24 18:48:29 pesa Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtconcurrent/qtconcurrent-5.4.1.ebuild,v 1.2 2015/03/08 13:59:49 pesa Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit qt5-build
DESCRIPTION="Multi-threading concurrence support library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS="~hppa"
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~hppa ~x86"
fi

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-5.4.1.ebuild,v 1.2 2015/03/03 07:31:18 dlan Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtcore/qtcore-5.4.1.ebuild,v 1.3 2015/03/08 14:00:04 pesa Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit qt5-build
DESCRIPTION="Cross-platform application development framework"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS="~arm64 ~hppa"
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
fi

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/qtdbus-5.4.1.ebuild,v 1.1 2015/02/24 18:49:03 pesa Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdbus/qtdbus-5.4.1.ebuild,v 1.2 2015/03/08 14:00:15 pesa Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit qt5-build
DESCRIPTION="The D-Bus module for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS="~hppa"
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~hppa ~x86"
fi

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/qtdeclarative-5.4.1.ebuild,v 1.2 2015/02/24 20:24:20 kensington Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdeclarative/qtdeclarative-5.4.1.ebuild,v 1.3 2015/03/08 14:00:27 pesa Exp $
EAPI=5
@ -9,7 +9,7 @@ inherit qt5-build
DESCRIPTION="The QML and Quick modules for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS="~hppa"
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~hppa ~x86"
fi

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdiag/qtdiag-5.4.1.ebuild,v 1.1 2015/02/24 18:49:08 pesa Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtdiag/qtdiag-5.4.1.ebuild,v 1.2 2015/03/08 14:00:32 pesa Exp $
EAPI=5
@ -11,7 +11,7 @@ inherit qt5-build
DESCRIPTION="Tool for reporting diagnostic information about Qt and its environment"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS="~hppa"
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~hppa ~x86"
fi

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.1.ebuild,v 1.1 2015/02/24 18:46:42 pesa Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-qt/qtgraphicaleffects/qtgraphicaleffects-5.4.1.ebuild,v 1.2 2015/03/08 14:00:37 pesa Exp $
EAPI=5
@ -9,7 +9,7 @@ inherit qt5-build virtualx
DESCRIPTION="Set of QML types for adding visual effects to user interfaces"
if [[ ${QT5_BUILD_TYPE} == live ]]; then
KEYWORDS="~hppa"
KEYWORDS=""
else
KEYWORDS="~amd64 ~arm ~hppa ~x86"
fi

@ -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/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.5.4-r1.ebuild,v 1.4 2014/11/10 17:07:58 mrueg Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.5.4-r1.ebuild,v 1.5 2015/03/08 13:13:56 graaff Exp $
EAPI=5
USE_RUBY="ruby19 ruby20"
@ -16,7 +16,7 @@ RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
inherit ruby-fakegem
DESCRIPTION="Provides POSIX tarchive management from Ruby programs"
HOMEPAGE="http://rubyforge.org/projects/ruwiki/"
HOMEPAGE="https://github.com/halostatue/minitar"
SRC_URI="mirror://rubygems/minitar-${PV}.gem"
LICENSE="|| ( GPL-2 Ruby )"
@ -24,11 +24,6 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
# Tests are broken but this was already the case with 0.5.2 and it seems
# that only the test case is broken:
# https://github.com/halostatue/minitar/issues/9
#RESTRICT="test"
RUBY_PATCHES=(
${PN}-0.5.2-gentoo.patch
${PN}-0.5.3-pipes.patch
@ -37,6 +32,14 @@ RUBY_PATCHES=(
all_ruby_prepare() {
# ignore faulty metadata
rm ../metadata || die
# Fix tests by using ruby19+ compatible code.
# Avoid failing tests.
# https://github.com/halostatue/minitar/issues/9
sed -i -e '52 s/x\[0\]/x[0].ord/' \
-e '/test_each_works/,/^ end/ s:^:#:' \
-e '/test_extract_entry_works/,/^ end/ s:^:#:' tests/tc_tar.rb || die
}
each_ruby_test() {

@ -0,0 +1,47 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/archive-tar-minitar/archive-tar-minitar-0.5.4-r2.ebuild,v 1.1 2015/03/08 13:16:09 graaff Exp $
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_TEST=""
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="README ChangeLog"
# We don't use RUBY_FAKEGEM_NAME here since for now we want to keep the
# same gem name.
inherit ruby-fakegem
DESCRIPTION="Provides POSIX tarchive management from Ruby programs"
HOMEPAGE="https://github.com/halostatue/minitar"
SRC_URI="mirror://rubygems/minitar-${PV}.gem"
LICENSE="|| ( GPL-2 Ruby )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE=""
RUBY_PATCHES=(
${PN}-0.5.2-gentoo.patch
${PN}-0.5.3-pipes.patch
)
all_ruby_prepare() {
# ignore faulty metadata
rm ../metadata || die
# Fix tests by using ruby19+ compatible code.
# Avoid failing tests.
# https://github.com/halostatue/minitar/issues/9
sed -i -e '52 s/x\[0\]/x[0].ord/' \
-e '/test_each_works/,/^ end/ s:^:#:' \
-e '/test_extract_entry_works/,/^ end/ s:^:#:' tests/tc_tar.rb || die
}
each_ruby_test() {
${RUBY} -Itests -Ctests testall.rb || die
}

@ -1 +1,2 @@
DIST awesome_print-1.2.0.gem 29184 SHA256 f9fb1d1bafddc4739266c68f3a043e409716a620aea937d54d1ae07c278305cd SHA512 10e1d77ceb0b05aa9b0f12911c24ab63d20a3c88f9fbace518562e7e6de21f6db5dbe75fc0b2c50fa244a33f08cba920d48dc04069ac740394200a1d695e2f4f WHIRLPOOL 1de1eecbfd2e5e3f03b69a0b6d4afd130fad59b22807f1a8d9f1416fd946a574f23bfc59f8391975e9d10770c9530aba48caca0ed137c0bdaaf2a4a50a6a8b9d
DIST awesome_print-1.6.1.gem 32256 SHA256 0d8be8d9b270b900a337356cb9453ffdaf219d29902f14bbe4f120ecfdd38fef SHA512 394f5011d45f1daca77215e585d50c8505a63498b982aae32b206b99051fc27b903135fdb62976d9aeb4dfa80f5d6980b55c7fbe0fdc75feb979fd3b3b935c92 WHIRLPOOL 9d6c5f8fe60e3ba7ebbc16c5bcaf91337d2142d4846b490c75185c905ada1dd6f76fbd8f73a859bdeef91542ad3623758cfaa029d1b303dfc02d9b964199bc40

@ -0,0 +1,21 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/awesome_print/awesome_print-1.6.1.ebuild,v 1.1 2015/03/08 06:49:25 graaff Exp $
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
inherit ruby-fakegem
DESCRIPTION="Ruby library that pretty prints Ruby objects in full color with proper indentation"
HOMEPAGE="https://github.com/michaeldv/awesome_print"
LICENSE="MIT"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
SLOT="0"
IUSE=""

@ -1,2 +1,3 @@
DIST bson-2.3.0.tar.gz 48880 SHA256 ea0d7f285926c176239fad0f2cd45e6c40981e2abb665f666cfa1137138604c9 SHA512 8b22e139f06c07cf26905ef8bc5ac7f039c9b0440015c2ab1035a0e402598c826c0be4c31e68a4894b350e405602c99df8c65b45af83f89b5507e965e6bf2e7d WHIRLPOOL a3fc514da88c5a0d9c55019367d243a403889e6119892f9ec70f844ecbc90bc345f3a5a5913248f7441b9910584714beb061dab61c904b573a50896392849e7d
DIST mongo-ruby-driver-1.12.0.tar.gz 360691 SHA256 33a58080b80cca03255934aea3641084042a0b5ef042b0967aa74d13f334418d SHA512 a5358810aeaddb0eff295e408a739ee4cba3473ae6f877c101c059d9dfb348bc4698ca2c7564049a3820d634792ee600e463e7b894cc82b3baa666dbd0dbf1b2 WHIRLPOOL 175d9049f50efc6afa5a684c9f632a5fb0e7e15d1d3b56ecad2fba3cc070b2c008be1eb3bafdaa2126249417df76d93faff6d8172ca95779bf60978358885aa5
DIST mongo-ruby-driver-1.6.2.tar.gz 15485515 SHA256 ef6885ba66fce2df619d5543ef1699b584362fe37931e9e2121d974a67cb4a58 SHA512 ce537f2b819c072fddcb12dac66d81e9dc23a739b43211b65239d3264be9d4ac586813a18ca674abf75078639e3ee22dced8e88061e7c263b2381ea0d4e97b28 WHIRLPOOL ceb3ad9cb7b5cd1372d27a7962b60242166a37d31320e54f28c51b5f18e3a53cc08194dc2ec293c953a12a0936b1d8869f9338f4ca3a84fa09a847558acc361e

@ -0,0 +1,108 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/bson/bson-1.12.0.ebuild,v 1.1 2015/03/08 08:08:55 graaff Exp $
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21"
RUBY_FAKEGEM_TASK_DOC="moot" # we do it manually, but still declare it
RUBY_FAKEGEM_DOCDIR="html"
RUBY_FAKEGEM_EXTRADOC=""
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
GITHUB_USER="mongodb"
GITHUB_PROJECT="mongo-ruby-driver"
RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
inherit multilib ruby-fakegem
DESCRIPTION="A Ruby BSON implementation for MongoDB. (Includes binary C-based extension.)"
HOMEPAGE="http://www.mongodb.org/"
SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
LICENSE="APSL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test doc"
ruby_add_bdepend \
"test? (
dev-ruby/bundler
>=dev-ruby/rake-10.1
dev-ruby/sfl
>=dev-ruby/shoulda-3.3.2
dev-ruby/mocha
dev-ruby/test-unit:2
)
doc? ( dev-ruby/rdoc )"
all_ruby_prepare() {
# remove the stuff that is actually part of dev-ruby/mongo
rm -f bin/mongo* || die
# Avoid test dependency on pry
sed -i -e '/\(pry\|coverall\)/I s:^:#:' Gemfile tasks/testing.rake test/test_helper.rb || die
# Avoid deployment dependencies and fix version issues
sed -i -e '/rest-client/ s/1.6.8/~> 1.6/' \
-e '/test-unit/ s/~>2.0/>= 2.0/' \
-e '/rake/ s/10.1.1/~>10.1/' \
-e '/:deploy/,/end/ s:^:#:' Gemfile || die
# Don't clean up the compiled version after testing
sed -i -e '/:cleanup/,/end/ s:lib/bson_ext::' tasks/testing.rake || die
}
each_ruby_configure() {
${RUBY} -C ext/cbson extconf.rb || die "extconf.rb failed"
}
each_ruby_compile() {
emake -C ext/cbson V=1 CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}"
mkdir -p lib/bson_ext || die
cp ext/cbson/*$(get_modname) lib/bson_ext || die
}
all_ruby_compile() {
# Trying to get the Rakefile to build the sources is more trouble
# than it's worth, do it manually instead.
if use doc; then
rdoc --op html --inline-source lib/**/*.rb || die "rdoc failed"
fi
}
each_ruby_test() {
C_EXT=true JENKINS_CI=true ${RUBY} -S rake test:bson || die "tests failed"
}
each_ruby_install() {
# Remove remaining mongo code that will be installed as part of
# dev-ruby/mongo. We do this here rather than in src_prepare so we
# can bootstrap with tests enabled.
rm -rf lib/mongo* || die
# we have to set the library path here because the gemspec tries to
# load bson itself, and would fail without that.
RUBYLIB="lib" \
each_fakegem_install
# and now we create the simulated gem for bson_ext; we create a file
# bson_ext.rb within ext so that we don't have to change the
# bson_ext.gemspec file, and at the same time we ensure that bson
# gem is loaded when loading bson_ext.
dodir $(ruby_fakegem_gemsdir)/gems/bson_ext-${PV}/ext
cat - <<EOF > "${D}/$(ruby_fakegem_gemsdir)/gems/bson_ext-${PV}/ext/bson_ext.rb"
require 'bson'
EOF
RUBYLIB="lib" \
RUBY_FAKEGEM_NAME=bson_ext \
RUBY_FAKEGEM_GEMSPEC=bson_ext.gemspec \
ruby_fakegem_install_gemspec
}
pkg_postinst() {
elog "Unlike upstream setup, we do not split bson and bson_ext gem."
elog "This means that for all the supported targets, the C-based extension"
elog "is installed by this package, and is available transparently."
}

@ -1 +1,2 @@
DIST mongo-ruby-driver-1.12.0.tar.gz 360691 SHA256 33a58080b80cca03255934aea3641084042a0b5ef042b0967aa74d13f334418d SHA512 a5358810aeaddb0eff295e408a739ee4cba3473ae6f877c101c059d9dfb348bc4698ca2c7564049a3820d634792ee600e463e7b894cc82b3baa666dbd0dbf1b2 WHIRLPOOL 175d9049f50efc6afa5a684c9f632a5fb0e7e15d1d3b56ecad2fba3cc070b2c008be1eb3bafdaa2126249417df76d93faff6d8172ca95779bf60978358885aa5
DIST mongo-ruby-driver-1.6.2.tar.gz 15485515 SHA256 ef6885ba66fce2df619d5543ef1699b584362fe37931e9e2121d974a67cb4a58 SHA512 ce537f2b819c072fddcb12dac66d81e9dc23a739b43211b65239d3264be9d4ac586813a18ca674abf75078639e3ee22dced8e88061e7c263b2381ea0d4e97b28 WHIRLPOOL ceb3ad9cb7b5cd1372d27a7962b60242166a37d31320e54f28c51b5f18e3a53cc08194dc2ec293c953a12a0936b1d8869f9338f4ca3a84fa09a847558acc361e

@ -0,0 +1,68 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mongo/mongo-1.12.0.ebuild,v 1.1 2015/03/08 08:27:29 graaff Exp $
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21"
RUBY_FAKEGEM_TASK_TEST="test:unit"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC=""
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
GITHUB_USER="mongodb"
GITHUB_PROJECT="mongo-ruby-driver"
RUBY_S="${GITHUB_USER}-${GITHUB_PROJECT}-*"
inherit ruby-fakegem
DESCRIPTION="A Ruby driver for MongoDB"
HOMEPAGE="http://www.mongodb.org/"
SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
LICENSE="APSL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
# This is the same source package as bson, so keep them the same
# version, but not revision
ruby_add_rdepend "~dev-ruby/bson-${PV}"
ruby_add_bdepend \
"test? (
dev-ruby/bundler
>=dev-ruby/rake-10.1
dev-ruby/sfl
>=dev-ruby/shoulda-3.3.2
dev-ruby/mocha
dev-ruby/test-unit:2
)"
all_ruby_prepare() {
# remove the stuff that is actually part of dev-ruby/bson
rm -f bin/{b2j,j2b}son || die
# Avoid test dependency on pry
sed -i -e '/\(pry\|coverall\)/I s:^:#:' Gemfile tasks/testing.rake test/test_helper.rb || die
# Avoid deployment dependencies and fix version issues
sed -i -e '/rest-client/ s/1.6.8/~> 1.6/' \
-e '/test-unit/ s/~>2.0/>= 2.0/' \
-e '/rake/ s/10.1.1/~>10.1/' \
-e '/:deploy/,/end/ s:^:#:' Gemfile || die
}
each_ruby_test() {
JENKINS_CI=true ${RUBY} -S rake test:unit || die "Tests failed."
}
each_ruby_install() {
# Remove bson code used for testing. This is installed as part of
# dev-ruby/bson.
rm -rf lib/bson* || die
each_fakegem_install
}

@ -1,2 +1,3 @@
DIST mongoid-2.4.10.tar.gz 363928 SHA256 6570f81408fe71a747a76f77ba8106c94b1e79567c31952da4353e116df78e24 SHA512 8e3360fdffa09e0ae31377949d1ebadc58cbb761ce8b0ceb6944031dfb057e8e190df4c5ed025388adf385e41825d9ba1bbaab7476448e809956d16318ec42c4 WHIRLPOOL b24d2ad5d741c87ceb87c45cf6bc605a88f8559b690650ade52307446f81cf02099f95dfff0984137cefd97756ff3879ed042912520ff70de92a2dd87ea39e6f
DIST mongoid-2.4.9.tar.gz 361699 SHA256 87d1f1b85dc2b7b2a7a9fc9b13fff44588d7ff9e4136d3be65029d318d93312c SHA512 a133358ac488affd34be7d9aa7dd543fa25a2e45665cddd0c4977c83db9b8f19be6ba86a372960328b826e7c90a921adbc251454dd9d13e9c1d5ca53dd4de059 WHIRLPOOL 1a7eeb9c0fef76728c9bdd0a1d64fde874993ea9d66472892db8c0d115c84e3fe7ae0583ceb371f02ad7d124b73d79e506d92baa00b3c107ab22ea57503521da
DIST mongoid-2.8.1.tar.gz 367336 SHA256 76289084e680fe4ba476112eadda9dac0212a28e169023e84788db8a56494305 SHA512 cdd7e92722a5451c8d9ef0a21b7176446f9d6f41f42f62e0f91006feb6217a4a5c3bf2b193ee57d196aef2a61dc13b50cd76c35da295140abc4a7136d02eda81 WHIRLPOOL b4bc238ef853b1bc8dd42169f1075bd75f6f10fbe02c41aedf93901cb66d79527d6815c8934da2738f8f82ff24081995f6487fc4959888b25014f25509110dd6

@ -0,0 +1,81 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mongoid/mongoid-2.8.1.ebuild,v 1.1 2015/03/08 10:17:21 graaff Exp $
EAPI=5
USE_RUBY="ruby20 ruby21"
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
# functional testing crashes Ruby from within Portage, but works
# outside of it, needs to be investigated thoroughly, but at least
# unit testing works.
RUBY_FAKEGEM_RECIPE_TEST="rspec"
RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
GITHUB_USER="${PN}"
GITHUB_PROJECT="${PN}"
inherit ruby-fakegem
DESCRIPTION="ODM (Object Document Mapper) Framework for MongoDB"
HOMEPAGE="http://two.mongoid.org/"
SRC_URI="https://github.com/${GITHUB_USER}/${GITHUB_PROJECT}/archive/v${PV}.tar.gz -> ${GITHUB_PROJECT}-${PV}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
ruby_add_rdepend "
>=dev-ruby/activemodel-3.1 =dev-ruby/activemodel-3*
>=dev-ruby/mongo-1.9:0
>=dev-ruby/tzinfo-0.3.22:0
"
ruby_add_bdepend "
test? (
dev-ruby/bundler
dev-ruby/ammeter
dev-ruby/mocha:0.11
dev-ruby/rdoc
dev-ruby/rspec
dev-util/watchr
)"
DEPEND+=" test? ( dev-db/mongodb )"
all_ruby_prepare() {
# Remove unsupported development dependencies and fix versions.
sed -i -e '/\(guard-rspec\|rb-fsevent\)/ s:^:#:' \
-e '/mocha/ s/= 0.11/~> 0.11.0/' mongoid.gemspec || die
# Avoid specs tied to localhost
rm spec/functional/mongoid/config/{database,replset_database}_spec.rb || die
# Avoid some failing specs that should be investigated later
sed -i -e '/sets the capped size/,/end/ s:^:#:' spec/functional/mongoid/collection_spec.rb || die
sed -i -e '/.from_hash/,/^ end/ s:^:#:' spec/functional/mongoid/config_spec.rb || die
rm spec/functional/mongoid/persistence_spec.rb || die
}
each_ruby_test() {
mkdir "${T}/mongodb_$(basename $RUBY)"
mongod --port 27017 --dbpath "${T}/mongodb_$(basename $RUBY)" \
--noprealloc --noauth --nohttpinterface --nounixsocket --nojournal \
--bind_ip 127.255.255.254 &
mongod_pid=$!
failed=0
sleep 2
export MONGOID_SPEC_HOST="127.255.255.254"
export MONGOID_SPEC_PORT="27017"
${RUBY} -S bundle exec rspec-2 --format progress spec || failed=1
kill "${mongod_pid}"
[[ "${failed}" == "1" ]] && die "tests failed"
}

@ -1,2 +1 @@
DIST right_aws-1.10.0.gem 101376 SHA256 c911f839a3aac2f08398408d7b7631811a877d1199d1850a861278893e776992 SHA512 3bb9d921369e4d9a462b68775878d00796c4553e8e07ce6bf2db5613fbae78b07fe38c979ac68ac7400d3c5666f93380dfbb266ed536567e25ac47f239c61354 WHIRLPOOL 99fb55c41e878563218a8a6093a76d896b8514d57272ae8a7b788d21b31a9bc34d94ad03211d4678809990156c46950bef392d2709e29c4c086a26ae9da009af
DIST right_aws-3.0.4.gem 192000 SHA256 1711e0d3fe2ffd9e9e10b9395a41c66c9590359385756ebefcc33415ae0d3d23 SHA512 f2b18b1374943048c9453cdb6c2a3a69e9979d4fbab09b16f7333dbb22e895e823cbdf4ebd1817665d6c7007244259e72a08fdc47c83e860d1c5ff8ddb357b31 WHIRLPOOL 6ccdf6e714ad2285ce6187ba28fdc0dd8f253074062c9dc69af067b85028e1d929546a3fc78236e1e6da64e92f8cfaa54e69b35e44815b055c53d829d9218ed2

@ -1,38 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/right_aws/right_aws-1.10.0.ebuild,v 1.4 2014/11/11 10:50:01 mrueg Exp $
EAPI=5
USE_RUBY="ruby19"
RUBY_FAKEGEM_TASK_DOC="docs"
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_EXTRADOC="README.txt History.txt"
inherit ruby-fakegem
DESCRIPTION="A robust, fast, and secure interface to Amazon EC2, EBS, S3, SQS, SDB, and CloudFront"
HOMEPAGE="http://www.rightscale.com/"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
# Tests require you to set up Amazon AWS access so we have no way to
# handle this from within the ebuild :(
RESTRICT="test"
# uuidtools is just needed for sdb, but still better to add it to the
# dependencies.
# libxml is also optionally supported.
ruby_add_rdepend '>=dev-ruby/right_http_connection-1.2.4 dev-ruby/uuidtools'
all_ruby_prepare() {
# by default the Rakefile will require rcovtask from rcov to allow
# coverage testing; since we don't care about that we'll just be
# ignoring it for now.
sed -i \
-e '/rcovtask/s:^:#:' \
Rakefile || die
}

@ -1,11 +1,13 @@
# 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/dev-util/mpatch/mpatch-0.8.ebuild,v 1.4 2014/08/10 21:28:38 slyfox Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-util/mpatch/mpatch-0.8-r1.ebuild,v 1.1 2015/03/08 08:25:25 idella4 Exp $
EAPI="3"
PYTHON_DEPEND="2"
EAPI=5
inherit distutils
PYTHON_COMPAT=( python2_7 )
DISTUTILS_SINGLE_IMPL=1
inherit distutils-r1
DESCRIPTION="Patch-like tool for applying diffs which can resolve common causes of patch rejects"
HOMEPAGE="http://oss.oracle.com/~mason/mpatch/"
@ -20,11 +22,10 @@ DEPEND=""
RDEPEND=""
pkg_setup() {
python_set_active_version 2
python_pkg_setup
python-single-r1_pkg_setup
}
src_install() {
distutils_src_install
dobin cmd/qp cmd/mp || die "dobin failed"
distutils-r1_src_install
dobin cmd/qp cmd/mp
}

@ -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/eclass/mysql-multilib.eclass,v 1.15 2015/02/16 17:25:14 grknight Exp $
# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-multilib.eclass,v 1.17 2015/03/08 09:42:19 ulm Exp $
# @ECLASS: mysql-multilib.eclass
# @MAINTAINER:
@ -206,6 +206,7 @@ IUSE="+community cluster debug embedded extraengine jemalloc latin1 minimal
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] ; then
IUSE="bindist ${IUSE}"
RESTRICT="${RESTRICT} !bindist? ( bindist )"
fi
### End readline/libedit
@ -373,8 +374,8 @@ if [[ -n "${WSREP_REVISION}" ]] ; then
fi
if [[ ${PN} == "mysql-cluster" ]] ; then
mysql_version_is_at_least "7.2.9" && RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.6 )" && \
DEPEND="${DEPEND} java? ( >=virtual/jdk-1.6 )"
mysql_version_is_at_least "7.2.9" && RDEPEND="${RDEPEND} java? ( >=virtual/jre-1.6 )" && \
DEPEND="${DEPEND} java? ( >=virtual/jdk-1.6 )"
fi
# compile-time-only
@ -556,7 +557,7 @@ multilib_src_configure() {
)
mysql_version_is_at_least "10.0.9" && mycmakeargs+=( -DWITH_PCRE=system )
fi
fi
configure_cmake_locale

@ -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/eclass/mysql-v2.eclass,v 1.36 2015/02/16 14:37:50 grknight Exp $
# $Header: /var/cvsroot/gentoo-x86/eclass/mysql-v2.eclass,v 1.37 2015/03/08 09:39:55 ulm Exp $
# @ECLASS: mysql-v2.eclass
# @MAINTAINER:
@ -222,12 +222,15 @@ IUSE="${IUSE} latin1 extraengine cluster max-idx-128 +community profiling"
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]] && \
mysql_version_is_at_least "5.5" ; then
IUSE="bindist ${IUSE}"
RESTRICT="${RESTRICT} !bindist? ( bindist )"
elif [[ ${PN} == "mysql" || ${PN} == "percona-server" ]] && \
mysql_check_version_range "5.5.37 to 5.6.11.99" ; then
IUSE="bindist ${IUSE}"
RESTRICT="${RESTRICT} !bindist? ( bindist )"
elif [[ ${PN} == "mysql-cluster" ]] && \
mysql_check_version_range "7.2 to 7.2.99.99" ; then
IUSE="bindist ${IUSE}"
RESTRICT="${RESTRICT} !bindist? ( bindist )"
fi
if [[ ${PN} == "mariadb" || ${PN} == "mariadb-galera" ]]; then

@ -1,8 +1,8 @@
# 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/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild,v 1.19 2014/05/15 16:59:30 ulm Exp $
# $Header: /var/cvsroot/gentoo-x86/games-simulation/cannonsmash/cannonsmash-0.6.6.ebuild,v 1.20 2015/03/07 21:35:02 tupone Exp $
EAPI=2
EAPI=5
inherit eutils games
MY_OGG=danslatristesse2-48.ogg
@ -54,18 +54,16 @@ src_configure() {
src_compile() {
emake \
localedir="/usr/share" \
|| die "emake failed"
localedir="/usr/share"
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
default
if use vorbis ; then
insinto "${GAMES_DATADIR}"/csmash
doins "${DISTDIR}"/${MY_OGG} || die "doins failed"
doins "${DISTDIR}"/${MY_OGG}
fi
newicon win32/orange.ico ${PN}.ico
make_desktop_entry csmash "Cannon Smash" /usr/share/pixmaps/${PN}.ico
dodoc AUTHORS CREDITS README*
prepgamesdirs
}

@ -1 +1 @@
DIST planets-0.1.13.tgz 49732 RMD160 aca43156b191f221f257ab1738d33621d2277016 SHA1 76f530a81c86afd4f8c43589a8dfd1e51892a975 SHA256 cd4be19dc1e16cc3d5bb20fdfa2af025b50cd21dbce5d1e8b3041c4e786c3624
DIST planets-0.1.13.tgz 49732 SHA256 cd4be19dc1e16cc3d5bb20fdfa2af025b50cd21dbce5d1e8b3041c4e786c3624 SHA512 fdfc2cde52baaac71683fbf31b6fe09f6bec81650842eb6b88dbc34d643142f73a89a935db028ab000d3fa33e1646b28558e398bb0eddba273f94e429e61a67d WHIRLPOOL 3980b333761185525d4f91caee6f850d086954c5f119b66827f3a1b4a91e85d35a302fad941139732d1e813d539172652beda5fe7776f78925a6d8fc33c4cf0b

@ -1,8 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-simulation/planets/planets-0.1.13.ebuild,v 1.7 2009/01/19 23:56:42 mr_bones_ Exp $
# $Header: /var/cvsroot/gentoo-x86/games-simulation/planets/planets-0.1.13.ebuild,v 1.8 2015/03/07 21:45:58 tupone Exp $
EAPI=2
EAPI=5
inherit eutils games
DESCRIPTION="a simple interactive planetary system simulator"
@ -20,7 +20,7 @@ DEPEND="${RDEPEND}
dev-lang/ocaml[tk]"
src_install() {
dogamesbin planets || die "dogamesbin failed"
dogamesbin planets
doicon ${PN}.png
domenu ${PN}.desktop
doman ${PN}.1

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.1.1.ebuild,v 1.2 2015/02/28 22:27:05 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/gd/gd-2.1.1.ebuild,v 1.3 2015/03/07 20:09:49 vapier Exp $
EAPI="5"
@ -13,7 +13,7 @@ SRC_URI="https://bitbucket.org/libgd/gd-libgd/downloads/lib${P}.tar.xz"
LICENSE="gd IJG HPND BSD"
SLOT="2/3"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="fontconfig jpeg png static-libs truetype xpm zlib"
IUSE="fontconfig jpeg png static-libs truetype webp xpm zlib"
# fontconfig has prefixed font paths, details see bug #518970
REQUIRED_USE="prefix? ( fontconfig )"
@ -22,6 +22,7 @@ RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
png? ( >=media-libs/libpng-1.6.10:0[${MULTILIB_USEDEP}] )
truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
webp? ( media-libs/libvpx[${MULTILIB_USEDEP}] )
xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
@ -45,6 +46,7 @@ multilib_src_configure() {
$(use_with png) \
$(use_with truetype freetype) \
$(use_with jpeg) \
$(use_with webp vpx) \
$(use_with xpm) \
$(use_with zlib)
}

@ -27,4 +27,7 @@ and so forth.
<remote-id type="github">libgd/libgd</remote-id>
<bugs-to>https://github.com/libgd/libgd/issues</bugs-to>
</upstream>
<use>
<flag name='webp'>Enable support for the webp format</flag>
</use>
</pkgmetadata>

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-ttf/sdl2-ttf-2.0.12-r1.ebuild,v 1.3 2015/01/23 03:53:33 mr_bones_ Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl2-ttf/sdl2-ttf-2.0.12-r1.ebuild,v 1.4 2015/03/08 06:47:50 mr_bones_ Exp $
EAPI=5
inherit autotools eutils multilib-minimal
@ -12,7 +12,7 @@ SRC_URI="http://www.libsdl.org/projects/SDL_ttf/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 ~x86"
IUSE="static-libs X"
RDEPEND="X? ( >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )

@ -1,6 +1,4 @@
DIST makemkv-bin-1.8.10.tar.gz 12216470 SHA256 551da0dcd56e313d6da7428da02a87569216da654f4ee6fd3b0278dabc103333 SHA512 cfa5724b413fab608ed15e5977301f9a6fe69d787ae2ad19c3d615ec443bf7250c33f582c252f9ab1c9632d8919d252937922407158d75f8b4295eb23032f374 WHIRLPOOL 44a7df0c38ccb7693938f10f63831828ca9f3e22a627b5d4e7f23a4756f8f6edf0f27e39c75f3678fec8c18c14cf944c126eba60c211c2b5e590b029593774c5
DIST makemkv-bin-1.8.12.tar.gz 12228591 SHA256 54af3d514dfcbf73ef5095b62e962f44ede15412dbf8bb7e17ca75824522a51e SHA512 ce00428630e2f12c3fe3c12a1555099fe5bfcd1c09efad7098e91ac56d1ced0cef541e8a154f14b159b056382621b240ff2135da00af9856ea62614e3092428d WHIRLPOOL 44d8125828e46507d1c1fe14afa365b4593197728cb6f4f1f7db86e12954b25709abf662b85778d5b968efa332585e2a583d5eea73e9af5c8de103e7c293fdcd
DIST makemkv-bin-1.8.13.tar.gz 12229854 SHA256 86cbfb530f284e5f7975ee9331458233dfecb909aa380495440f8a8bdbade5a6 SHA512 19f473fd100aed6e7af72ee4b52d723d82ef4687492661e9817034c439a4fe198412b49a25e3596f2bfc9b9c949b31017c1ac6afc0159fb6f6d623ebbf0b6886 WHIRLPOOL 9e6ad435683936886bbafe06f85a788994700c3a8322433fd61553a264456e6681243b13e4606e3bd3b327e7ebcdddced2491f3cb2ffbc404c3b84a5047618bb
DIST makemkv-bin-1.9.1.tar.gz 5051390 SHA256 d88a08ee6b188db94ef8d366ae8aa3c65eab8a2993f549b847989808198da810 SHA512 ab64351acd260fd3fa36eadf9a4335283a7fd08f7fb8a673570a7321065b3a37af6789486046fe616c3d1d8c656f97abb1fa88222887c6df1dbe077f6a6821ee WHIRLPOOL 218ccc33f693adad84687a525333855cf7ea8b4016e643f68858fe04e738c1796b3c1ab7da8ec64315ceab683d0befc3d533244491b4400a91c101399d6b7693
DIST makemkv-oss-1.8.10.tar.gz 4215868 SHA256 e6dd93cb0cfa144e94c110b02b7fcbbc9945cf3fb4cf3398e1babd7b698b959d SHA512 5bba3ad68987d3ec085a14b9db4f25b0e77bf439e4c589f43c823de0a18bd2da41daee45335761bcbf8edb53c64702f8faaffd1d62ce906ea81cf7f63fb29778 WHIRLPOOL 8758acc6ea12b872c1873ab2f0aec8ea175493786cdc517da256b4480c0643b9caa7fd679eb2251698b9749381676a0d99309ab9f35c247ab60aec39706edb95
DIST makemkv-oss-1.8.12.tar.gz 4215876 SHA256 0f45a1413d705ca4359404d6911fd166cdc67cd3b3bcd8aebbdc3e6970fbfeaf SHA512 10870dbecf5924946e633ac1958abf7572cdc65191398b2e2e297233274f65e547d9f5cef243de434cf8d8b31fe5240ff02e8c67f7fc135ee1c7150fee30116c WHIRLPOOL 11d0248587009d31cb03493fc2110f55a99e7109aaa89db7d989059cdfdcce3ac5c6eee24b20ab343b96afa77806e06343fa7900d4c1d71635252b7a2e3d6ae1
DIST makemkv-oss-1.8.13.tar.gz 4215928 SHA256 1c15e3c2a25d81bb12af7a86b0d2022f9d10644e7bd26dc8bf6366b635460d4e SHA512 7196e853d25512475b19dd9cca94e1b0718483598636838429f63f6157368aafcf17ec82377243961d1f98f568249df91bca836cef818c48738f071edc6b75b5 WHIRLPOOL 3de9b9aa74959132135674b41627b87092b8298eff22b22988c45de142b0a3150fc742afb6806659faa1bc37275575a96705d7dc5df8e3d906c4fa38f4b37f02
DIST makemkv-oss-1.9.1.tar.gz 4217346 SHA256 22677e16a1fadda80f9b0961a114c396aa0d8a105fe62f66722f0d24469795f4 SHA512 19d0a766f53e564c9a6f11964baf7a250e08ea4957205e19c7d8d49b5c666134df6f4fa8392e994a010de69dc43c912a9d9ac34d41e69c62b0dac8c807e8a402 WHIRLPOOL 6e488753b7ec9e4121cd15128b3e5d5b0571e240cb3214fa32ac81e75c0918b11fabdfdd288c3c6301a175c70f424d5e337db13af13dcae6126ffdc909d66e4c

@ -1,11 +0,0 @@
--- makemkv-oss-1.8.11/Makefile.in.orig 2014-04-25 09:25:24.558767575 -0600
+++ makemkv-oss-1.8.11/Makefile.in 2014-04-25 09:25:44.930534931 -0600
@@ -50,7 +50,7 @@
endif
out/%: out/%.full
- $(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@
+ $(OBJCOPY) --discard-all $< $@
out/libdriveio.so.0.full:
mkdir -p out

@ -1,11 +0,0 @@
--- makemkv-oss-1.8.12/Makefile.in.orig 2014-04-25 09:25:24.558767575 -0600
+++ makemkv-oss-1.8.12/Makefile.in 2014-04-25 09:25:44.930534931 -0600
@@ -50,7 +50,7 @@
endif
out/%: out/%.full
- $(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@
+ $(OBJCOPY) --discard-all $< $@
out/libdriveio.so.0.full:
mkdir -p out

@ -1,11 +0,0 @@
--- makemkv-oss-1.8.13/Makefile.in.orig 2014-04-25 09:25:24.558767575 -0600
+++ makemkv-oss-1.8.13/Makefile.in 2014-04-25 09:25:44.930534931 -0600
@@ -50,7 +50,7 @@
endif
out/%: out/%.full
- $(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@
+ $(OBJCOPY) --discard-all $< $@
out/libdriveio.so.0.full:
mkdir -p out

@ -1,11 +0,0 @@
--- makemkv-oss-1.8.7/Makefile.in.orig 2013-11-20 19:48:33.000000000 -0800
+++ makemkv-oss-1.8.7/Makefile.in 2013-11-21 19:05:22.319663127 -0800
@@ -50,7 +50,7 @@
endif
out/%: out/%.full
- $(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@
+ $(OBJCOPY) --discard-all $< $@
out/libdriveio.so.0.full:
mkdir -p out

@ -1,11 +0,0 @@
--- makemkv-oss-1.8.8/Makefile.in.orig 2013-11-20 19:48:33.000000000 -0800
+++ makemkv-oss-1.8.8/Makefile.in 2013-11-21 19:05:22.319663127 -0800
@@ -50,7 +50,7 @@
endif
out/%: out/%.full
- $(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@
+ $(OBJCOPY) --discard-all $< $@
out/libdriveio.so.0.full:
mkdir -p out

@ -1,11 +0,0 @@
--- makemkv-oss-1.8.9/Makefile.in.orig 2013-11-20 19:48:33.000000000 -0800
+++ makemkv-oss-1.8.9/Makefile.in 2013-11-21 19:05:22.319663127 -0800
@@ -50,7 +50,7 @@
endif
out/%: out/%.full
- $(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@
+ $(OBJCOPY) --discard-all $< $@
out/libdriveio.so.0.full:
mkdir -p out

@ -0,0 +1,13 @@
--- makemkv-oss-1.8.10/makemkvgui/src/api_linux.cpp.orig 2014-04-13 14:01:36.000000000 +0100
+++ makemkv-oss-1.8.10/makemkvgui/src/api_linux.cpp 2014-05-08 00:09:52.863784998 +0100
@@ -36,9 +36,7 @@
}
static const char* const app_locations[]={
- "/bin",
- "/usr/bin",
- "/usr/local/bin",
+ "/opt/bin",
NULL };
const char* const* ApGetAppLocations()

@ -1,118 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.12-r2.ebuild,v 1.3 2014/10/19 21:55:56 mattm Exp $
EAPI=5
inherit eutils gnome2-utils multilib flag-o-matic
MY_P=makemkv-oss-${PV}
MY_PB=makemkv-bin-${PV}
DESCRIPTION="Tool for ripping Blu-Ray, HD-DVD and DVD discs and copying content to a Matroska container"
HOMEPAGE="http://www.makemkv.com/"
SRC_URI="http://www.makemkv.com/download/old/${MY_P}.tar.gz
http://www.makemkv.com/download/old/${MY_PB}.tar.gz"
LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="multilib qt4"
QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
RDEPEND="
sys-libs/glibc[multilib?]
dev-libs/expat
dev-libs/openssl:0
sys-libs/zlib
qt4? (
virtual/opengl
dev-qt/qtcore:4
dev-qt/qtdbus:4
dev-qt/qtgui:4
)
>=sys-libs/glibc-2.12.0
|| ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
"
DEPEND="${RDEPEND}"
S=${WORKDIR}/makemkv-oss-${PV}
src_prepare() {
epatch "${FILESDIR}"/${P}-makefile.linux.patch
}
src_configure() {
replace-flags -O* -Os
local args=""
use qt4 || args="--disable-gui"
if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
econf $args
fi
}
src_compile() {
emake GCC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" || die "Make failed!"
}
src_install() {
# install oss package
dolib.so out/libdriveio.so.0
dolib.so out/libmakemkv.so.1
dolib.so out/libmmbd.so.0
dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so
dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so.0.${PV}
into /opt
if use qt4; then
dobin out/makemkv
local res
for res in 16 22 32 64 128; do
newicon -s ${res} makemkvgui/share/icons/${res}x${res}/makemkv.png ${PN}.png
done
make_desktop_entry ${PN} MakeMKV ${PN} 'Qt;AudioVideo;Video'
fi
# install bin package
pushd "${WORKDIR}"/${MY_PB}/bin >/dev/null
if use x86; then
dobin i386/{makemkvcon,mmdtsdec}
elif use amd64; then
dobin amd64/makemkvcon
use multilib && dobin i386/mmdtsdec
fi
popd >/dev/null
# install license and default profile
pushd "${WORKDIR}"/${MY_PB}/src/share >/dev/null
insinto /usr/share/MakeMKV
doins *.{gz,xml}
popd >/dev/null
}
pkg_preinst() { gnome2_icon_savelist; }
pkg_postinst() {
gnome2_icon_cache_update
elog "While MakeMKV is in beta mode, upstream has provided a license"
elog "to use if you do not want to purchase one."
elog ""
elog "See this forum thread for more information, including the key:"
elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053"
elog ""
elog "Note that beta license may have an expiration date and you will"
elog "need to check for newer licenses/releases. "
elog ""
elog "If this is a new install, remember to copy the default profile"
elog "to the config directory:"
elog "cp /usr/share/MakeMKV/default.mmcp.xml ~/.MakeMKV/"
}
pkg_postrm() { gnome2_icon_cache_update; }

@ -1,117 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.13.ebuild,v 1.1 2014/10/19 21:55:56 mattm Exp $
EAPI=5
inherit eutils gnome2-utils multilib flag-o-matic
MY_P=makemkv-oss-${PV}
MY_PB=makemkv-bin-${PV}
DESCRIPTION="Tool for ripping Blu-Ray, HD-DVD and DVD discs and copying content to a Matroska container"
HOMEPAGE="http://www.makemkv.com/"
SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
http://www.makemkv.com/download/${MY_PB}.tar.gz"
LICENSE="LGPL-2.1 MPL-1.1 MakeMKV-EULA openssl"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="multilib qt4"
QA_PREBUILT="opt/bin/makemkvcon opt/bin/mmdtsdec"
RDEPEND="
sys-libs/glibc[multilib?]
dev-libs/expat
dev-libs/openssl:0
sys-libs/zlib
qt4? (
virtual/opengl
dev-qt/qtcore:4
dev-qt/qtdbus:4
dev-qt/qtgui:4
)
|| ( >=media-video/ffmpeg-1.0.0 >=media-video/libav-0.8.9 )
"
DEPEND="${RDEPEND}"
S=${WORKDIR}/makemkv-oss-${PV}
src_prepare() {
epatch "${FILESDIR}"/${P}-makefile.linux.patch
}
src_configure() {
replace-flags -O* -Os
local args=""
use qt4 || args="--disable-gui"
if [[ -x ${ECONF_SOURCE:-.}/configure ]] ; then
econf $args
fi
}
src_compile() {
emake GCC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" || die "Make failed!"
}
src_install() {
# install oss package
dolib.so out/libdriveio.so.0
dolib.so out/libmakemkv.so.1
dolib.so out/libmmbd.so.0
dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so.0.${PV}
dosym libdriveio.so.0 /usr/$(get_libdir)/libdriveio.so
dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so.1.${PV}
dosym libmakemkv.so.1 /usr/$(get_libdir)/libmakemkv.so
dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so
dosym libmmbd.so.0 /usr/$(get_libdir)/libmmbd.so.0.${PV}
into /opt
if use qt4; then
dobin out/makemkv
local res
for res in 16 22 32 64 128; do
newicon -s ${res} makemkvgui/share/icons/${res}x${res}/makemkv.png ${PN}.png
done
make_desktop_entry ${PN} MakeMKV ${PN} 'Qt;AudioVideo;Video'
fi
# install bin package
pushd "${WORKDIR}"/${MY_PB}/bin >/dev/null
if use x86; then
dobin i386/{makemkvcon,mmdtsdec}
elif use amd64; then
dobin amd64/makemkvcon
use multilib && dobin i386/mmdtsdec
fi
popd >/dev/null
# install license and default profile
pushd "${WORKDIR}"/${MY_PB}/src/share >/dev/null
insinto /usr/share/MakeMKV
doins *.{gz,xml}
popd >/dev/null
}
pkg_preinst() { gnome2_icon_savelist; }
pkg_postinst() {
gnome2_icon_cache_update
elog "While MakeMKV is in beta mode, upstream has provided a license"
elog "to use if you do not want to purchase one."
elog ""
elog "See this forum thread for more information, including the key:"
elog "http://www.makemkv.com/forum2/viewtopic.php?f=5&t=1053"
elog ""
elog "Note that beta license may have an expiration date and you will"
elog "need to check for newer licenses/releases. "
elog ""
elog "If this is a new install, remember to copy the default profile"
elog "to the config directory:"
elog "cp /usr/share/MakeMKV/default.mmcp.xml ~/.MakeMKV/"
}
pkg_postrm() { gnome2_icon_cache_update; }

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.8.13-r1.ebuild,v 1.1 2015/02/01 23:11:48 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/media-video/makemkv/makemkv-1.9.1.ebuild,v 1.1 2015/03/08 10:55:49 chewi Exp $
EAPI=5
inherit eutils gnome2-utils multilib flag-o-matic
@ -8,7 +8,7 @@ inherit eutils gnome2-utils multilib flag-o-matic
MY_P=makemkv-oss-${PV}
MY_PB=makemkv-bin-${PV}
DESCRIPTION="Tool for ripping Blu-Ray, HD-DVD and DVD discs and copying content to a Matroska container"
DESCRIPTION="Tool for ripping and streaming Blu-Ray, HD-DVD and DVD discs"
HOMEPAGE="http://www.makemkv.com/"
SRC_URI="http://www.makemkv.com/download/${MY_P}.tar.gz
http://www.makemkv.com/download/${MY_PB}.tar.gz"
@ -39,7 +39,7 @@ DEPEND="${RDEPEND}"
S=${WORKDIR}/makemkv-oss-${PV}
src_prepare() {
epatch "${FILESDIR}"/${P}-makefile.linux.patch
epatch "${FILESDIR}"/${PN}-{1.8.10-makefile.linux,path}.patch
}
src_configure() {
@ -113,6 +113,12 @@ pkg_postinst() {
elog "If this is a new install, remember to copy the default profile"
elog "to the config directory:"
elog "cp /usr/share/MakeMKV/default.mmcp.xml ~/.MakeMKV/"
elog ""
elog "MakeMKV can also act as a drop-in replacement for libaacs and"
elog "libbdplus, allowing transparent decryption of a wider range of"
elog "titles under players like VLC and mplayer. To enable this, set"
elog "the following variables when launching the player:"
elog "LIBAACS_PATH=libmmbd LIBBDPLUS_PATH=libmmbd"
}
pkg_postrm() { gnome2_icon_cache_update; }

@ -1,9 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
<email>mattm@gentoo.org</email>
<name>Matthew Marlowe</name>
</maintainer>
<herd>video</herd>
<maintainer>
<email>chewi@gentoo.org</email>
<name>James Le Cuirot</name>
</maintainer>
<longdescription>
MakeMKV is your one-click solution to convert video that you own
into free and patents-unencumbered format that can be played
everywhere. MakeMKV is a format converter, otherwise called
transcoder. It converts the video clips from proprietary (and
usually encrypted) disc into a set of MKV files, preserving most
information but not changing it in any way. The MKV format can
store multiple video/audio tracks with all meta-information and
preserve chapters. There are many players that can play MKV
files nearly on all platforms, and there are tools to convert
MKV files to many formats, including DVD and Blu-ray discs.
Additionally MakeMKV can instantly stream decrypted video
without intermediate conversion to wide range of players, so you
may watch Blu-ray and DVD discs with your favorite player on
your favorite OS or on your favorite device.
</longdescription>
</pkgmetadata>

@ -1 +1 @@
Sat, 07 Mar 2015 18:37:02 +0000
Sun, 08 Mar 2015 14:07:03 +0000

@ -1 +1 @@
Sat, 07 Mar 2015 18:37:02 +0000
Sun, 08 Mar 2015 14:07:03 +0000

@ -20,7 +20,7 @@
always a description without a lang attribute. Also there are no overlapping
descriptions allowed (multiple description tags with the same language)
$Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.1143 2015/03/04 18:16:31 amadio Exp $
$Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.1144 2015/03/07 20:37:19 tetromino Exp $
-->
<herds>
@ -1178,6 +1178,14 @@
<description>
Wine - System for running windows apps under Linux.
</description>
<maintainer>
<email>ryao@gentoo.org</email>
<name>Richard Yao</name>
</maintainer>
<maintainer>
<email>tetromino@gentoo.org</email>
<name>Alexandre Rostovtsev</name>
</maintainer>
<maintainer>
<email>vapier@gentoo.org</email>
</maintainer>

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save