diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2016-11-16 22:41:18 +0000 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2016-11-16 22:48:57 +0000 |
| commit | 253b1d93e3d85af187f126ab1e74b0c2dd90bf48 (patch) | |
| tree | d434439fc94f5317c14fd38f181a952c6c295602 /app-crypt | |
| parent | dev-util/elfkickers: remove older versions (diff) | |
| download | gentoo-253b1d93e3d85af187f126ab1e74b0c2dd90bf48.tar.gz gentoo-253b1d93e3d85af187f126ab1e74b0c2dd90bf48.tar.bz2 gentoo-253b1d93e3d85af187f126ab1e74b0c2dd90bf48.zip | |
app-crypt/rhash: Version bump to 1.3.4
Upstream merged my patch. Always make build-shared as its cheap and
needed for the tests.
Package-Manager: portage-2.3.2
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/rhash/Manifest | 2 | ||||
| -rw-r--r-- | app-crypt/rhash/files/librhash-symlink.patch | 38 | ||||
| -rw-r--r-- | app-crypt/rhash/rhash-1.3.4.ebuild (renamed from app-crypt/rhash/rhash-1.3.3-r2.ebuild) | 9 |
3 files changed, 3 insertions, 46 deletions
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest index a29fefa0ad61..13d53c90d2b1 100644 --- a/app-crypt/rhash/Manifest +++ b/app-crypt/rhash/Manifest @@ -1 +1 @@ -DIST rhash-1.3.3-src.tar.gz 248855 SHA256 5b520b597bd83f933d316fce1382bb90e0b0b87b559b8c9c9a197551c935315a SHA512 0ac1699a0e5718b750610cd6189d9d582186d7e17191e3723a994559c8f9c6ea7e0d34825da0c96fd0fc6be3e14b5f44ce7a21d17156cdfce3f0e3e4ff09389e WHIRLPOOL d2b17c8fd0a121e6d7e853c22bfce0545235e272c48893f13a28a5d424b26bc0cb18a5aa7eb51e07428b677116f4fdae89859a4d4e3e7cdefb4dea62337b558e +DIST rhash-1.3.4-src.tar.gz 249357 SHA256 406662c4703bd4cb1caae26f32700951a5e12adf39f141d3f40e0b461b1e9e49 SHA512 a78be309011798d5e55023eb93f898c10254a42270288fa5ec68ad446b5f3d001e8c6f893683e5171e3858c86d45ce2ce16eefde1173209e1925420c27a7ff7a WHIRLPOOL 5883dcbf0c2bf51036434d1906b85b615eae65ef2729a68d7ac637e2bea3c494cd3ee7fa9a60d3c4f3241bc4fd5c62c8f7e058c0e53649d50dade241e06dda2e diff --git a/app-crypt/rhash/files/librhash-symlink.patch b/app-crypt/rhash/files/librhash-symlink.patch deleted file mode 100644 index faba2fbf0658..000000000000 --- a/app-crypt/rhash/files/librhash-symlink.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 30c5897a7533b746388f44f3999ad2e23c529364 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Fri, 16 Sep 2016 22:53:51 +0100 -Subject: [PATCH] Handle librhash.so symlink in shared Makefile rules, not - static - ---- - librhash/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/librhash/Makefile b/librhash/Makefile -index a38073f..fc5e5c3 100644 ---- a/librhash/Makefile -+++ b/librhash/Makefile -@@ -46,18 +46,18 @@ dist-clean: clean - install-lib-static: $(LIBRARY) install-headers - $(INSTALL) -d $(DESTDIR)$(LIBDIR) - $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBDIR)/ -- ln -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(SOLINK) - - install-lib-shared: $(SONAME) - $(INSTALL) -d $(DESTDIR)$(LIBDIR) - $(INSTALL_SHARED) $(SONAME) $(DESTDIR)$(LIBDIR)/ -+ ln -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(SOLINK) - - uninstall-lib-static: uninstall-headers - rm -f $(DESTDIR)$(LIBDIR)/$(LIBRARY) -- rm -f $(DESTDIR)$(LIBDIR)/$(SOLINK) - - uninstall-lib-shared: - rm -f $(DESTDIR)$(LIBDIR)/$(SONAME) -+ rm -f $(DESTDIR)$(LIBDIR)/$(SOLINK) - - install-headers: - $(INSTALL) -d $(DESTDIR)$(INCDIR) --- -2.8.2 - diff --git a/app-crypt/rhash/rhash-1.3.3-r2.ebuild b/app-crypt/rhash/rhash-1.3.4.ebuild index 578f5811a5ff..cd33ea8d75a7 100644 --- a/app-crypt/rhash/rhash-1.3.3-r2.ebuild +++ b/app-crypt/rhash/rhash-1.3.4.ebuild @@ -20,10 +20,6 @@ RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} nls? ( sys-devel/gettext )" -PATCHES=( - "${FILESDIR}"/librhash-symlink.patch -) - src_prepare() { default @@ -46,8 +42,7 @@ multilib_src_compile() { emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \ ADDCFLAGS="${ADDCFLAGS[*]}" ADDLDFLAGS="${ADDLDFLAGS[*]}" \ - $(multilib_is_native_abi && echo build-shared || echo lib-shared) \ - $(use static-libs && echo lib-static) + build-shared $(use static-libs && echo lib-static) } myemake() { @@ -55,7 +50,7 @@ myemake() { } multilib_src_install() { - myemake install-lib-shared + myemake -C librhash install-lib-shared install-so-link multilib_is_native_abi && myemake install-shared use static-libs && myemake install-lib-static } |