diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2017-03-16 22:59:25 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2017-03-17 19:46:26 +0100 |
| commit | 9724f460fdd4ffe597cd9675ec964518172f6651 (patch) | |
| tree | 14d720aa4affeff997f0db339556dc7b7828243c /dev-libs | |
| parent | dev-libs/libzip: Use fts-standalone on musl libc (diff) | |
| download | gentoo-9724f460fdd4ffe597cd9675ec964518172f6651.tar.gz gentoo-9724f460fdd4ffe597cd9675ec964518172f6651.tar.bz2 gentoo-9724f460fdd4ffe597cd9675ec964518172f6651.zip | |
dev-libs/libzip: 1.2.0 version bump
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'dev-libs')
| -rw-r--r-- | dev-libs/libzip/Manifest | 1 | ||||
| -rw-r--r-- | dev-libs/libzip/files/libzip-1.2.0-fts.patch (renamed from dev-libs/libzip/files/libzip-1.1.3-fts.patch) | 0 | ||||
| -rw-r--r-- | dev-libs/libzip/files/libzip-1.2.0-headers.patch | 12 | ||||
| -rw-r--r-- | dev-libs/libzip/libzip-1.2.0.ebuild (renamed from dev-libs/libzip/libzip-1.1.3-r1.ebuild) | 14 |
4 files changed, 22 insertions, 5 deletions
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest index 6aaa97920c30..8261429ac91a 100644 --- a/dev-libs/libzip/Manifest +++ b/dev-libs/libzip/Manifest @@ -1,2 +1,3 @@ DIST libzip-1.0.1.tar.xz 450308 SHA256 f948d597afbb471de8d528d0e35ed977de85b2f4d76fdd74abbb985550e5d840 SHA512 df51ca44e97e2644a5d6930e3c76830453579c1486d11b9529d3cef173bb5ae873ef34b0af0ea6403dd4076805371fa93975a18ce56e37aa2a52500eb279887b WHIRLPOOL 6705e5739417738d474a85e10c72718c2feaae68698d6fc71af17d2761c76acab705fcf6c8c69be165afca9230dc55c47843d9b0281abde445aad23addef1c41 DIST libzip-1.1.3.tar.xz 460128 SHA256 729a295a59a9fd6e5b9fe9fd291d36ae391a9d2be0b0824510a214cfaa05ceee SHA512 a3be13a98ab28d5a2c3729ba6b01891c1fdbee724e6827d208a8d33dad7108a57c82108409f8073002a4fddae97490bdbe7697dccb70ac9601ee862d4271f138 WHIRLPOOL ab3434f08542ba34a11b628f451b8e1133230237a9b6f25dc57454950ba57d01ad3cec3f4cc7b076f07eff12457044e273bbbfcf8df0c8f32e074fdcafe8b817 +DIST libzip-1.2.0.tar.xz 938284 SHA256 ffc0764395fba3d45dc5a6e32282788854618b9e9838337f8218b596007f1376 SHA512 1ba8626d72e6b47f735568afaf007d1e18beb3ebedf6b69a6b575f9e04d3b84550371191a89be153f8fcedb4a8eac2f996e141da95cdbb52380b6283cc99cf8b WHIRLPOOL 794a462fc4d1529008fccbe6df41c5616b34712ef34721e0cbe555aa12ada7928d22f6e9421de210efdf7b460188a4d6a9a6e53fc0266bcf52d47d6a7e30a5f6 diff --git a/dev-libs/libzip/files/libzip-1.1.3-fts.patch b/dev-libs/libzip/files/libzip-1.2.0-fts.patch index bd9bf232c0a8..bd9bf232c0a8 100644 --- a/dev-libs/libzip/files/libzip-1.1.3-fts.patch +++ b/dev-libs/libzip/files/libzip-1.2.0-fts.patch diff --git a/dev-libs/libzip/files/libzip-1.2.0-headers.patch b/dev-libs/libzip/files/libzip-1.2.0-headers.patch new file mode 100644 index 000000000000..f1a6d5d0819d --- /dev/null +++ b/dev-libs/libzip/files/libzip-1.2.0-headers.patch @@ -0,0 +1,12 @@ +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -3,8 +3,7 @@ + + lib_LTLIBRARIES = libzip.la + noinst_HEADERS = zipint.h gladman-fcrypt.h +-include_HEADERS = zip.h +-nodist_libinclude_HEADERS = zipconf.h ++include_HEADERS = zip.h zipconf.h + + # also update CMakeLists.txt when changing version + libzip_la_LDFLAGS=-no-undefined -version-info 3:0:1 diff --git a/dev-libs/libzip/libzip-1.1.3-r1.ebuild b/dev-libs/libzip/libzip-1.2.0.ebuild index ecc3aa63760f..574096ebb16a 100644 --- a/dev-libs/libzip/libzip-1.1.3-r1.ebuild +++ b/dev-libs/libzip/libzip-1.2.0.ebuild @@ -18,18 +18,22 @@ RDEPEND=" sys-libs/zlib elibc_musl? ( sys-libs/fts-standalone ) " -DEPEND="${RDEPEND} - app-arch/xz-utils -" +DEPEND="${RDEPEND}" DOCS=( AUTHORS NEWS.md API-CHANGES THANKS ) PATCHES=( - "${FILESDIR}/${PN}-1.1.3-headers.patch" - "${FILESDIR}/${PN}-1.1.3-fts.patch" + "${FILESDIR}/${P}-headers.patch" + "${FILESDIR}/${P}-fts.patch" ) src_prepare() { default eautoreconf } + +src_install() { + default + use static-libs || rm "${D}"/usr/lib64/libzip.a || die + find "${D}" -name '*.la' -delete || die +} |