diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-03-24 17:45:30 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-03-24 17:45:30 +0000 |
| commit | 919ce5548aead4e65db73cd95bd8a0596bd4ae89 (patch) | |
| tree | ffe385655f6ae0d1742c320233d33cc5ddb12ec9 /dev-util | |
| parent | libusbx is now libusb since 1.0.18 (diff) | |
| download | historical-919ce5548aead4e65db73cd95bd8a0596bd4ae89.tar.gz historical-919ce5548aead4e65db73cd95bd8a0596bd4ae89.tar.bz2 historical-919ce5548aead4e65db73cd95bd8a0596bd4ae89.zip | |
Enable LZO by default since it is going to be used by Gentoo, and require at least one compressor enabled.
Package-Manager: portage-2.2.9-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/squashmerge/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/squashmerge/Manifest | 33 | ||||
| -rw-r--r-- | dev-util/squashmerge/squashmerge-9999.ebuild | 7 |
3 files changed, 27 insertions, 19 deletions
diff --git a/dev-util/squashmerge/ChangeLog b/dev-util/squashmerge/ChangeLog index 33ac896545bf..4e58066941bd 100644 --- a/dev-util/squashmerge/ChangeLog +++ b/dev-util/squashmerge/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/squashmerge # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/squashmerge/ChangeLog,v 1.2 2014/02/12 08:01:24 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/squashmerge/ChangeLog,v 1.3 2014/03/24 17:45:28 mgorny Exp $ + + 24 Mar 2014; Michał Górny <mgorny@gentoo.org> squashmerge-9999.ebuild: + Enable LZO by default since it is going to be used by Gentoo, and require at + least one compressor enabled. 12 Feb 2014; Michał Górny <mgorny@gentoo.org> squashmerge-9999.ebuild: Fix typo, bug #501036. Thanks to Kalin KOZHUHAROV for noticing. diff --git a/dev-util/squashmerge/Manifest b/dev-util/squashmerge/Manifest index 5586dbe5cefc..16d49f83d5c8 100644 --- a/dev-util/squashmerge/Manifest +++ b/dev-util/squashmerge/Manifest @@ -1,25 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -EBUILD squashmerge-9999.ebuild 897 SHA256 b95bfce7c1ac01d22b729e8376d5a1ecab5f9256296f456b0e364976e142afd1 SHA512 c2c1fe7c3edbdb037c69afab5bd8f92ae15033c3e873fc679db7e96c64e8a68495e88f1232dd0122553245568d6e5d4b97ee871bf15b79828cb0e890ea3dcd75 WHIRLPOOL c57514ca5ceab393fd66622c2ac35862a72e24371a5ea1ca4b18799dfc157c9f2088f8e9b55ecf9d78f0f143ee196f9e533857e504d8a0d572a896f89cb97982 -MISC ChangeLog 545 SHA256 97520392508ff22f51626d110a012130d9c1a389e2aca2b7fa816d896c4aec11 SHA512 d2be92faf4c75d4f81282d14198c4f32e1414c6d62605fb548a9e1ba9879948fe0a174bcd22f7f86f2cd9f10416909d5cb2c19f5616c0762f0895ddbb14a1bdd WHIRLPOOL 053530d48c4a50bddfdcb8ecdc6fdd0aa777b7751f447d7d310835ae3b2a45dcb8b2a0247ba9cfc44ebf50a99aef31f1595ea82275bba12c0eca9e1d0d7f7ec6 +EBUILD squashmerge-9999.ebuild 996 SHA256 d6285f4575e72a7f3c410edc667ee990c720c058d36a33216a95da0a0ed66baa SHA512 84b33b60403ab341234e27f4fd3447c1df45a7c61bf19368ed9d03ea2ebc5350cb3369c4812defd3a6c5651a7ffb6e69e70a03f6e83771531a084ec99d11d790 WHIRLPOOL d2f4e6ce2047b42ad31a8d09c16a3703b9eab4a319cfc72c6b2aa351cddff00e7b4a9a1e6c1c9b34b9e24127260ef0f6b9b9494bd271341744e9c458d60e9b05 +MISC ChangeLog 732 SHA256 38948e577d9c6fc1b6c37d9da55b53c2627a97e395f3efbe2890fed7e6c054e9 SHA512 d4d12aac9938e55499bc976e32c0ea89ebe10e0b1c33682d50fefb0efe97fa3f244f4e941002c715bf8eefae6bf161b8b0b45cb67a12402184b54135c6bcbf54 WHIRLPOOL df3f7ec9b66b5fe747923001f37ba7da77e87936dfa8e7a18d0f0c3d55d825659dcdbcd6259d476ba59e14a7e25a85d51123661bccce2d8b17a82f56b9696589 MISC metadata.xml 548 SHA256 d8099e8d396ba26aadf23b93af4f15cc7c1f810d15a8f8e4af1bf151197456db SHA512 32aa70b68cf5443b13ba4f2f4a3b452413cdbe8669b5ccbfdaacb7c3ea21fada470d581e3c27266fa734ac4c8e151debe86a5299fe7baca8ae2ac3509dbc1a16 WHIRLPOOL 17f21dde84de4e52f1e58bba46810625d87f95448bf43166ccc0179d82306cc60d00279aa646c1162d1fe2ce611d68b0cf8fec262eef86c2935d4e6efcd5501e +MISC squashmerge-9999.ebuild.orig 897 SHA256 b95bfce7c1ac01d22b729e8376d5a1ecab5f9256296f456b0e364976e142afd1 SHA512 c2c1fe7c3edbdb037c69afab5bd8f92ae15033c3e873fc679db7e96c64e8a68495e88f1232dd0122553245568d6e5d4b97ee871bf15b79828cb0e890ea3dcd75 WHIRLPOOL c57514ca5ceab393fd66622c2ac35862a72e24371a5ea1ca4b18799dfc157c9f2088f8e9b55ecf9d78f0f143ee196f9e533857e504d8a0d572a896f89cb97982 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJS+ypYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJTMG85XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC -MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOp0gP/28dnOKfHrwrrL4yjDHqk49G -5V2MR0l++IpwlMsg65NY4DBN1W7q4axLDQfdDXQ2F+8T18ccTherLtQYz8cWhe3Z -WNYjeet26VPQ+t/nT2i9yZqjlJZnzd1hKCLHAwDqCcrJvJb12hP6yVurwBhyXRYZ -HxhffWUiBrZqssMz1ReHG5KwonbIQHbXxoTPlAlOKm1lxEjyg0f35zxitQbmfOPa -Zna75PbAc8XJN97Phy+t1AVOGPxq2YEtlKLpWNWwbAVakDbQQiJ/4ATEJTe2yZ7V -mOUuEKtz3meLbmmmMnCSECfslm1ccTam9T1F/Czw5le2cjfyPSjbsHAZM2TPyyM2 -vG2n25yETUvgaC5GfISTItMpg56mts6wmcC9bIlHkK0khQBLg0XyApO4xUvkxgaK -KJbZYKRkGU43JgP34XlLvi5eZnsyNfxQNQRAmK9kGKoWZROHHXDCMJb9TYQrzyia -+ag06uSath2XciPQ+62KPTjuSMKSsNriEDeUe4ghvAChyYzn1AI8whlaTedN6Iev -VhfiFALrlXSJbsw0QiA5VgHRLu4rCi6Gwc1x11Ed0/heazOY69BTKmbvsh1entFU -BmWx83svIPLp869mEJnFyai13mnqD07wt8JDs9Uy5j35pXNEh4r/AvSfe3Ei7OYP -+/GoVGSepNKQw/XigtNL -=ke15 +MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOLDgP/i3y9JUETsz3w5PeowQh929V +9XF2p143gZiCBONXwR4u0F7ZJNfQLWAIukP1Z8OqJuAknO8vMSMVmgoDbRyFGRtA +J67NWmUcmIj9tecXW1qpb6BJVtF0jUn1LM6HXBhzrmh9wJa0PbYrqyGo2P0Yny10 +WOagu9rXakDqBz9bQ60K/ptJxEp7s6D76Mu+3ZewZ3XSqltGNJLkJhKlbx0W19cT +Bgqf+tG6LS8cn+izdH0aK8ndcgMaMY+iph/+WkSvnRiKa1m68KE22/dpCv56ylit +PrtV/0CPq2pxzln2sKmydQPdTqRUBhIg7/4qHO1HQZNGrcchEiY3+Mit+JNDeloI +8+92yJoGJWazjpWTwpcdvSAgQ5g4QbhFXKdLgYK2gnlEwefffB58UXU4m7aUOlnZ +Gthz6zlK5LVKBfKaGweChihXHYVZnkBfelqYAuxPOnLkwmg7hOVuvmLISrDECvsa +zhWLOFkcLrOl139kfovahANawAkjjfi/1b7pIL+4Eawa8Ge7uPWfzW1E9fV05RjI +Iu8DExf5yvO6pjR7zuX4Bm4wB9Mp8T4PiQcSj02fRYm8BMtnZShCQwMOa9wTi8ay +miMSd9f7lYqTBEePgyP5vG1YU/hHlcoIS6yi3rOFzGM1J2QDlaHUCw3CbXB0psmG +hyi2nGMzFgFZTVCRJLTf +=HCzu -----END PGP SIGNATURE----- diff --git a/dev-util/squashmerge/squashmerge-9999.ebuild b/dev-util/squashmerge/squashmerge-9999.ebuild index 7250301d0d93..ed1de8bdf2de 100644 --- a/dev-util/squashmerge/squashmerge-9999.ebuild +++ b/dev-util/squashmerge/squashmerge-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/squashmerge/squashmerge-9999.ebuild,v 1.2 2014/02/12 08:01:24 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/squashmerge/squashmerge-9999.ebuild,v 1.3 2014/03/24 17:45:28 mgorny Exp $ EAPI=5 @@ -20,7 +20,7 @@ SRC_URI="mirror://bitbucket/mgorny/${PN}/downloads/${P}.tar.bz2" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="lz4 lzo" +IUSE="lz4 +lzo" #if LIVE KEYWORDS= @@ -34,6 +34,9 @@ RDEPEND="${COMMON_DEPEND} dev-util/xdelta:3" DEPEND=${COMMON_DEPEND} +# SquashDelta does not make much sense without a compression algo. +REQUIRED_USE="|| ( lz4 lzo )" + src_configure() { local myeconfargs=( $(use_enable lz4) |