summaryrefslogtreecommitdiff
path: root/dev-util
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/Manifest.gzbin63886 -> 63895 bytes
-rw-r--r--dev-util/creduce/Manifest2
-rw-r--r--dev-util/creduce/metadata.xml4
-rw-r--r--dev-util/ftjam/Manifest2
-rw-r--r--dev-util/ftjam/metadata.xml4
-rw-r--r--dev-util/molecule-core/Manifest2
-rw-r--r--dev-util/molecule-core/metadata.xml4
-rw-r--r--dev-util/molecule-plugins/Manifest2
-rw-r--r--dev-util/molecule-plugins/metadata.xml4
-rw-r--r--dev-util/molecule/Manifest2
-rw-r--r--dev-util/molecule/metadata.xml4
-rw-r--r--dev-util/xxdiff/Manifest4
-rw-r--r--dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch11
-rw-r--r--dev-util/xxdiff/xxdiff-4.0.1.ebuild61
-rw-r--r--dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild67
15 files changed, 86 insertions, 87 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index cc04a74f8b68..fd473a5fcd40 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
Binary files differ
diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
index 8d0c6f01cfa8..e6d1f82f0d50 100644
--- a/dev-util/creduce/Manifest
+++ b/dev-util/creduce/Manifest
@@ -7,4 +7,4 @@ EBUILD creduce-2.6.0.ebuild 685 BLAKE2B 4653902af6969da46109a8731b2d26246364e7b8
EBUILD creduce-2.7.0-r1.ebuild 803 BLAKE2B 051af5639098a78c93c666c4d3df9f1cd720e9438d81b9b5e81242a2a45c34eb060a247bb99cad6ceb7b2d0a4b8712ca99dc7539b0bb57a4e32fa34d09c80812 SHA512 ffd1803f88caa11a1720e99cd3f8a7382d8574e6fb7ea2b5600d9ac8c70614763bb55f7d29df9d0f3ebd9eb233fb3a4fa2f2756accca4bed82aaf4c65db9928c
EBUILD creduce-2.7.0.ebuild 703 BLAKE2B 9e1bb8170ce619ef3fb23a67c8d5987a202a2608e4a366e6eab765b33f960ddbaa55299a4fb29fc79a2cada80809b66bdf58af7a3869c69e1dfb70fbc62b105f SHA512 dc9bb094eb8d54ec90e74a8031289936c0bd3fc5a5e5520bbedb7d457f73aaa458bf0c094542b94a4d32f508df4163b98651c1ead335a91f032478f498d1e0da
EBUILD creduce-9999.ebuild 765 BLAKE2B 36967f9afcf36c7b72645f87c58c8edd795a49c69b457be719ba176a6416526592bf33503c7b214d17fa2ca391526c3ede457a7ad8f30d1214b8e964327d1d6d SHA512 26e023880d1143b27d11971f2f95e937f210630c9f2899c239d7f7076ac7741e9cde7e9ba2661c08f2b42e8c71f0dc6e4075f6421e927601ce1276616fe51da8
-MISC metadata.xml 349 BLAKE2B ee757f3e750c03cd87820c6170cb2c32298261d3a6cb4a303fa45256c847c1652d80c86eae8de5d1a40c50446101fb847d07a4cef3d53faeab2131c0a2c0a57a SHA512 1088fd88c07aa98bbbf8a8674d3b7908ea2bf707200f60640da713398556edaabca17924bae9a58745d266bc859b9269e677ac33405dcfca6df657e8cb9d06a4
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/creduce/metadata.xml b/dev-util/creduce/metadata.xml
index cfa489ca83c4..0319eec4c8be 100644
--- a/dev-util/creduce/metadata.xml
+++ b/dev-util/creduce/metadata.xml
@@ -2,10 +2,6 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>rhill@gentoo.org</email>
- <name>Ryan Hill</name>
- </maintainer>
- <maintainer type="person">
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/dev-util/ftjam/Manifest b/dev-util/ftjam/Manifest
index c85764f0bf4b..5c65a922e58d 100644
--- a/dev-util/ftjam/Manifest
+++ b/dev-util/ftjam/Manifest
@@ -4,4 +4,4 @@ AUX ftjam-2.5.3-i-hate-yacc.patch 1756 BLAKE2B 26aefb56b2125b765eee2b6dc9a55fd0d
AUX ftjam-2.5.3-nostrip.patch 780 BLAKE2B 7299ec77c1ed3ccbc87669850ee54d6d61534983793f076e56d95ea83e9c8617c80ec08d84bad24bbf45f11b6e0275167f4454223366ef041a81a4360d1b1d09 SHA512 6d8b399f8a4047c34b1315a230cf47e8ab76c7fbad9089fd4c3c18b2ba7fbb2f3ecbcb2d3a1075f0d95d36e547490de345167ba55fed75221b2b8162796ccc25
DIST ftjam-2.5.3rc2.tar.bz2 215963 BLAKE2B 77e92dba10dd2b99b53bea87dc47c7f1d5da2a39789cc938d8141debf3ba5d6e25ab4092e1a3b69266b3353866c76e72706d13d3751a321e42bc5aafdf87e8cd SHA512 18a40c6741493adf293f032d9c7a9ab419402505a37993fa859e36e7a1655ec9d3d07662e6ee242487b143aa7e0f6c46f253bc7e23c3162c7381aaced001bfcd
EBUILD ftjam-2.5.3_rc2-r1.ebuild 1116 BLAKE2B 0f5469c8d02f32a733c8c3db225c55dac1dd62efb0123956b08f77d08452bf3f6f271256a60e803f23d4bd06ec0c7a86cd6459272bbc7e2c108f250a0ba4884b SHA512 9d519c8359142593d607b2b3a1430bd4435dd360bd13518ee005086e23c90cc07b5676f9abec2a5b082284894afdd6fd3713ebb244679db367ec7506d82a3c63
-MISC metadata.xml 319 BLAKE2B d14d1041416dc750996100b721a4adaad4b9c28648b983c583f60d1868f3ce5bd64e8ea27b14f309456ba0b7a9fafba49d01866bdc6eeeb1f75da3b7b7bb0155 SHA512 c645d76d4eb37391099c7882f68a268bbe45e844dab9015b8d5f557c9acce08df1b5eded075288e3fcf5e6390fb177fa4a9df3adba3327ca2e2b97d1ef183e0d
+MISC metadata.xml 217 BLAKE2B 55f0e28ee6fed5a28a2b01ba5367d8b0cd6e4d9fac04998f93794be3ad8a1d526d473378623b82888869bf94ddf8838c0134e733c5708e11d2b7ba0c148ab434 SHA512 84ae81764128d1c529f0228dee8311929ec35ad1bd0a8ba684febc06c8f6671b23317b2e04b0ab3670e476209ba085916afe8ada10b855510df91303aad473e5
diff --git a/dev-util/ftjam/metadata.xml b/dev-util/ftjam/metadata.xml
index ac75c3797151..7a1075ebf9ba 100644
--- a/dev-util/ftjam/metadata.xml
+++ b/dev-util/ftjam/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>rhill@gentoo.org</email>
- <name>Ryan Hill</name>
- </maintainer>
<upstream>
<remote-id type="sourceforge">freetype</remote-id>
</upstream>
diff --git a/dev-util/molecule-core/Manifest b/dev-util/molecule-core/Manifest
index 478e04f84b70..3dd3c51f6edc 100644
--- a/dev-util/molecule-core/Manifest
+++ b/dev-util/molecule-core/Manifest
@@ -1,3 +1,3 @@
DIST molecule-core-1.0.2.tar.bz2 30616 BLAKE2B 00aff5ffa61eac63dbd9bf93027f24e5953a1cb1daa8855e9904f75b8afc68677306ccda40cb5a1db765b086a8cce608ffa5a24efd69de7cab86c43ae3aec07b SHA512 1f501960e4029cb993680c7356aa8fc0ac7afa249d106b4ce97afb39f58cd666640bcf9fd8cee64482077ad23f91da743d6ce54e82863faab20d68a1814d92cb
EBUILD molecule-core-1.0.2-r1.ebuild 636 BLAKE2B 226407ff9b3daa3579cb4594b6a70083599554737324ed761432377f9f8334d9d01ff95b1e54aa0c693eb959638acc0a88b88f27b4185fed1cdfbbaf1f9098c0 SHA512 9798239f564bacbdd13243f3e3357a67419b0f8eb4977a2f8d761008ca8f8af5b7c3fc260d39dda18ea686e88a52865bb5b294d4ab199b9dd5fa49c8a2bb2ce3
-MISC metadata.xml 1305 BLAKE2B b4c238896ffb8a00f9c6223fab07fbe135afb4d5caf1bd01ebc2c17dda6443401363e9d36d94ca58a573a8bcfd703db3983b4095600dbe31b767215fd5e29879 SHA512 14f6103bc17d5d80fcf22e374223bbf61ea34b30e41887cfbe25bd8520ab668c79869142287f2b2d0931e24f3c37a1dd2b2709e4a846368fce81802010dc7664
+MISC metadata.xml 1197 BLAKE2B 2ab6fff633d6e31b8c8721f39138026dafd6ac7a5fa9e559e93f39b12e59a4f449704a8a2f4c3dd2f2d1aeb1572e0af22afb54ecd0da9b1165c0af5ebeb43f08 SHA512 740155e85fbd48b3e747a88cd6a1b612f1f6802e9a62c7a3f454fa4908150e0c37ed3c10505b4192acba929d45714bad4856aa3945c33ed5fd48e59435553362
diff --git a/dev-util/molecule-core/metadata.xml b/dev-util/molecule-core/metadata.xml
index 73c8492a5822..d531ba147a5e 100644
--- a/dev-util/molecule-core/metadata.xml
+++ b/dev-util/molecule-core/metadata.xml
@@ -5,10 +5,6 @@
<email>mudler@gentoo.org</email>
<name>Ettore Di Giacinto</name>
</maintainer>
- <maintainer type="person">
- <email>lxnay@gentoo.org</email>
- <name>Fabio Erculiani</name>
- </maintainer>
<longdescription lang="en">
Molecule is a build tool that can build, rebuild or extend Sabayon Linux or
Gentoo Linux OS releases OpenVZ templates and stage4 tarballs.
diff --git a/dev-util/molecule-plugins/Manifest b/dev-util/molecule-plugins/Manifest
index d5500342c1fe..dc3ff611bc4a 100644
--- a/dev-util/molecule-plugins/Manifest
+++ b/dev-util/molecule-plugins/Manifest
@@ -1,3 +1,3 @@
DIST molecule-plugins-1.0.2.tar.bz2 17428 BLAKE2B 60fac83a501bd8f0c05588dcace522c59093cd0fcebcc87d86c8b8301f775d4cb6367e2d83c3146b1514e53f800dd2a34185d48575636c401724dc4e471b230a SHA512 65b75c23f3c662812be2ab4fe0c92bd99aba48da6e05aad6175ba3fe1cd8106d9085ed53f27c738ef6af1b327ac8ac872ef7c3c48728366b510b7a82bb90c866
EBUILD molecule-plugins-1.0.2-r1.ebuild 689 BLAKE2B 7ad76bb2095f639d2a4ca6a9129f6160310c14dd04bba605846f9a9adae94f7bab433c19cf6535a98dcdc255f80be912f7c6db50a38b194b9ae78026f3fe368c SHA512 aeebf6736c4727ea0c6e50d3fb86e504805cca32dbbba93c299474f69341dfed6b42eb2058f28eab4b756fcce83088ffc85cea886690024fb8e08846d411e650
-MISC metadata.xml 359 BLAKE2B 7987fb2521bb8430b58406f7c8e23edf0d71f637202d58c924edaf68be47537cb34a7b505ef55ead988df3d5bfd435280965f11342ead07dd99330418e036e10 SHA512 b52ececf876369aa09bf3f332b5f11a457c6c61bc11af3541f55eb186c32bb844027b0d951744d21449f3386b896ee207fadcbc6b5da31885e55879bc2355201
+MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/dev-util/molecule-plugins/metadata.xml b/dev-util/molecule-plugins/metadata.xml
index f6216f16666e..d396d1b7e5a1 100644
--- a/dev-util/molecule-plugins/metadata.xml
+++ b/dev-util/molecule-plugins/metadata.xml
@@ -5,8 +5,4 @@
<email>mudler@gentoo.org</email>
<name>Ettore Di Giacinto</name>
</maintainer>
- <maintainer type="person">
- <email>lxnay@gentoo.org</email>
- <name>Fabio Erculiani</name>
- </maintainer>
</pkgmetadata>
diff --git a/dev-util/molecule/Manifest b/dev-util/molecule/Manifest
index a811d43691d3..9ddf6fcca51d 100644
--- a/dev-util/molecule/Manifest
+++ b/dev-util/molecule/Manifest
@@ -1,2 +1,2 @@
EBUILD molecule-2.ebuild 412 BLAKE2B db88d5bcca6b3b2958722af3bca51337bb835a3f840d8c18449ec236fde57507eb15c5a743ef79d4bf04ccd95d1281e30c24526f27a2f1134b0a414ea1d762b1 SHA512 c8151d3c5311d4684ac6407591666cf175d9007f7a9c9f7dd741104f48602c1ddc50262c139ab60aa4374d2688def5d711afe12c01a43cc1df68bc5099888ca0
-MISC metadata.xml 454 BLAKE2B 25723de2b1e95c4a1eee1e5804cb3b9364c4472268cb5cfb19f1e33bbc7b92b6b6400b56f6229466f9ffbc15a0a42a7b318f44a2f8ada49dbf3843b4e1e1fca6 SHA512 eb154c04d6050fe9c9766d35aa01ebbcb110b3f9af919e336eba3958741669edaa5361cb182c876fd62f398052afb41eaa4c82bc31a7db56fd39bd4bb676aaf9
+MISC metadata.xml 346 BLAKE2B 830af22619d9811dc4fe57284341e78745cadff972125d644a02453a2b4dda0ca787d7826a1f7b029b1b66f1242b49a561b1d9bca83b491ab4b1440904657761 SHA512 375fa961d0458d6e8ee556a76fcd9396b9b415880af196592b27aaffd02f5c68f8a8a8b2fe4a8346b2fb18aa94b2c0c2e806ff221f9f3a80fa8cc0700a8c4a5b
diff --git a/dev-util/molecule/metadata.xml b/dev-util/molecule/metadata.xml
index 1357e0ab5dce..e14a66af6247 100644
--- a/dev-util/molecule/metadata.xml
+++ b/dev-util/molecule/metadata.xml
@@ -5,10 +5,6 @@
<email>mudler@gentoo.org</email>
<name>Ettore Di Giacinto</name>
</maintainer>
- <maintainer type="person">
- <email>lxnay@gentoo.org</email>
- <name>Fabio Erculiani</name>
- </maintainer>
<use>
<flag name="plugins">Add plugins provided by dev-util/molecule-plugins</flag>
</use>
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 0f6f20a2ce6b..d0c710e36e65 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -1,9 +1,11 @@
AUX xxdiff-4.0.1-no-throw-in-dtor.patch 667 BLAKE2B 9543b6dbd0cfffd309298a100717477303b4d8342156896bba54fc6b9de70f37209aaa4d20c990d2353ab89a7c399078741f76ccb72cb8c2c2ac9855ac6f3486 SHA512 254961c7a3baced5f9dafdb71583145de4d8fccbc49ffb13568bf7414326ee3811389f38b1ac290f67867eebf0b724f5cdd776deab8b3f850847e1783bbf085f
+AUX xxdiff-4.0.1_p20170622-cxx11.patch 361 BLAKE2B e8f55fcd8f1564449cedc14df4339e1787391b8b3b6b7594b763d4c8189d858e0a9e41e5881ce2959e643480e6eee9cff348b83ee3968ee2fd9a751cdcb6088b SHA512 ef69f4a84a1a3f57f5ff435e0e863152c949a5faf9010c56bfd3b8455caac98fed1373f8a36d199eef6632d4a9e75ea58b965b9b5cd74ac4386a05a2cb9838a0
AUX xxdiff-4.0_beta1_p20110426-bison3.patch 3243 BLAKE2B 407c66b6b29eb38b7be66753012aa94cf8229596a63b5f3265d59407d2cdf45fc536d909bf99aee0d33c636288f8eb7990307fa2dab01eaad490551df93cc0cb SHA512 179b57f579cc0ef20d3b391b9120726c44549c363fb6a0d88528a6e0bcf256d144fce99d44bbd5510fc42c5a8aea8b4a9ffea6aeb0a667a15b89af0e51893832
AUX xxdiff-4.0_beta1_p20110426-gcc47.patch 631 BLAKE2B 3c686ab01fbdfcf4b0f9f7230ef0036ef3730a8bea5125a7e00e831212f59017a7e28e6447cde98715344148f2f4c7924f1876f2b0a8b0c5b4488ca54276fa3e SHA512 df3a4362d160cabdf3fb590965258b69d854ae3becef19d754932851e47d98d93869d666c41c11743d49cdc84222b2f0e819b119e2af8f7a3679e714bda13885
DIST xxdiff-4.0.1.tar.bz2 1981869 BLAKE2B 637066e213327b7e79361f78d3ed7004023b282230b6ac077785519c93cb5c04a1192c06ec8a8ee86dc9db6c9e01fc5465edb13128e257b0409b11a43e4fe3cf SHA512 bcc2b528a0ebf273677d74aa3a971feb9052a01a8187a5d8abe3bce744520a3fa61bd842a9d4ba465abbf00f6da62868a1f18adeb7d8eccee6f76df4a1e4db3a
+DIST xxdiff-4.0.1_p20170622.tar.bz2 1983188 BLAKE2B b604c68902defca4caaa342123df165ca5ed4757254e7e696e637ff347298cdfd53324de6c21f65de4e0229ad7adb02434eb59e047590d2c71fb1f7e87e508d6 SHA512 a1b4cb26331b0bcc7ccdf3090ca4f1cf821c6819a189e4148cde0ef40e4377bf2b82627571ff05c066c3796e06cadc7c5ad040af0446c8f5bf48c25547564511
DIST xxdiff-4.0_beta1_p20110426.tar.bz2 1770035 BLAKE2B 00c052c92cc0eb01f3072f4381e4fb18ebc0760c9a212a05573d958e3f444a02f07b856c6c326c234c82a8c7e315ac23f14d1bc3f53764983cd6c836accfeeed SHA512 d0be7a5775ed90aa1ac73320144aa24947c1bcc305bbb8f95c64009990dc44b96fd05abd7dc3f69c3a74fb93632099f4a40c76029ed29949854c5f3d7a890097
EBUILD xxdiff-4.0.1-r1.ebuild 1137 BLAKE2B 7f48690258560661bd46ce42c7d1f0a0b231b5c2d0d80d11f4525cbdfc4aaf5d7e22c4c46a8886a817946ece48ab04331b0a7ad293923da041448a34087b1e84 SHA512 af5bfc98af1cfe73327718b352335379e0e07c20c8814a6e13b3009a590a6cb9b5bfd395da0a1e51ec2793c13a05c8ac31ed5c3d5b9c3cdcf4e89de87387fbe3
-EBUILD xxdiff-4.0.1.ebuild 1087 BLAKE2B 73510fdb563eb9a3f2758da0242910588be0aa9cf6503bb2bec6e00c2289567246afe0bac416fa32b8bb2f0d4d5c8b2e5bc5338b819cfdad1ecbb4fcc1364ad2 SHA512 a1478abaf30230b1a36af7bf2a7d09f23ec0a8fa06f25f74abdd3ecce4c5b682d5380b89f45cef80a2051c10ca36abb2697219c4dbfc4d3aa5cd1b4600d12a34
+EBUILD xxdiff-4.0.1_p20170622.ebuild 1251 BLAKE2B cb0db889ad264b9c427d169e230dc06b07914debf90a31f6d32159ca754f64015aee81ed265549f74a87dabdb406e5c5bfb9401b8f99a71610702073644bb26f SHA512 ccc2434d8a9def3f9303878cce69638159568bfd779817cd4daceabc5108e310bd48c260c50a7e59803a3e5acde9cdcc2afc915411e3739adb3a4c428ab17ab3
EBUILD xxdiff-4.0_beta1_p20110426-r1.ebuild 1154 BLAKE2B 4b7d0ba77a0f0993707ed586400ae1b22a428fa9bfb45435232090bc67f67ad006ebcb35cb55a7b1ba8acc9b6f605ece580588bc124a207c34de85b999814c42 SHA512 2f538add6f3e640a6b329f57ebd6dba113acd6792c935f6bf8907a8a23b3934f623d4c05d12f6305b668637e84d10b34fec847735e0743e4991d1de9ae911964
MISC metadata.xml 435 BLAKE2B e8dcecbe49cd65c7b3ca119b141b7ac1d971be54d9a2b5fa63d25affaa2eb06f5eac261b004e33808e1ae6c735b131b37eee9380746d192a2aacfb81e49b132f SHA512 2ed2dc743bf4787b8a10c379ec52d84b8b76305f1b80b85da3b7c44ad5e3642673e34f9159d7804bb0780ef8a31d49d121c04c885d524253ab0e8ebde04136ed
diff --git a/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch b/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch
new file mode 100644
index 000000000000..b16a7c4072f9
--- /dev/null
+++ b/dev-util/xxdiff/files/xxdiff-4.0.1_p20170622-cxx11.patch
@@ -0,0 +1,11 @@
+In gentoo qt5 already requires c++11 features:
+
+diff --git a/src/xxdiff.pro b/src/xxdiff.pro
+index 32b106b..16fcd1f 100644
+--- a/src/xxdiff.pro
++++ b/src/xxdiff.pro
+@@ -113,3 +113,3 @@ irix-n32:QMAKE_CFLAGS_RELEASE += -OPT:Olimit=4000
+ # auto_ptr deprecated in C++11, removed in C++17
+-linux: QMAKE_CXXFLAGS += -std=c++03
++linux: QMAKE_CXXFLAGS += -std=c++11
+
diff --git a/dev-util/xxdiff/xxdiff-4.0.1.ebuild b/dev-util/xxdiff/xxdiff-4.0.1.ebuild
deleted file mode 100644
index 9ba26ac0ea35..000000000000
--- a/dev-util/xxdiff/xxdiff-4.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils qt4-r2
-
-DESCRIPTION="A graphical file and directories comparator and merge tool"
-HOMEPAGE="http://furius.ca/xxdiff/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-qt/qtgui:4"
-DEPEND="${RDEPEND}
- virtual/yacc"
-
-src_prepare() {
- pushd src >/dev/null
- sed -i -e '/qPixmapFromMimeSource/d' *.ui || die #365019
- qt4-r2_src_prepare
- popd
-
- distutils-r1_src_prepare
-}
-
-src_configure() {
- pushd src >/dev/null
- qt4-r2_src_configure
- cat Makefile.extra >> Makefile
- popd
-
- distutils-r1_src_configure
-}
-
-src_compile() {
- pushd src >/dev/null
- qt4-r2_src_compile
- popd
-
- distutils-r1_src_compile
-}
-
-src_install() {
- dobin bin/xxdiff
-
- distutils-r1_src_install
-
- dodoc CHANGES README* TODO doc/*.txt src/doc.txt
-
- dohtml doc/*.{png,html} src/doc.html
-
- # example tools, use these to build your own ones
- insinto /usr/share/doc/${PF}
- doins -r tools
-}
diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
new file mode 100644
index 000000000000..2a1d15e737b0
--- /dev/null
+++ b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 qmake-utils
+
+DESCRIPTION="A graphical file and directories comparator and merge tool"
+HOMEPAGE="http://furius.ca/xxdiff/"
+# generated as 'hg archive xxdiff-${P}.tar'
+# from https://bitbucket.org/blais/xxdiff tree
+#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+"
+DEPEND="
+ ${RDEPEND}
+ virtual/yacc
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0.1-no-throw-in-dtor.patch
+ "${FILESDIR}"/${P}-cxx11.patch
+)
+
+src_configure() {
+ pushd src >/dev/null || die
+ # mimic src/Makefile.bootstrap
+ eqmake5
+ cat Makefile.extra >> Makefile || die
+ popd
+
+ distutils-r1_src_configure
+}
+
+src_compile() {
+ emake -C src MAKEDIR=.
+
+ distutils-r1_src_compile
+ HTML_DOCS+=(
+ doc/*.{png,html}
+ src/doc.html
+ )
+}
+
+src_install() {
+ dobin bin/xxdiff
+
+ distutils-r1_src_install
+
+ dodoc CHANGES README* TODO doc/*.txt src/doc.txt
+
+ # example tools, use these to build your own ones
+ insinto /usr/share/doc/${PF}
+ doins -r tools
+}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 18:11:13 +0000