app-crypt/argon2: Drop old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/app-crypt/argon2/Manifest b/app-crypt/argon2/Manifest
index 6bc6809f343a18f534e3294d8249409e99985a8c..18945a78ec686a734e950ebc61b0410685b0d072 100644 (file)
--- a/app-crypt/argon2/Manifest
+++ b/app-crypt/argon2/Manifest
@@ -1,3 +1,2 @@
-DIST argon2-20160821.tar.gz 1170019 BLAKE2B c69e918376ec064702fc59dd92f1b240c66686932db7fcbf0b475307cd96e2354aaa06dfa5493744b71749b90d5935265990bea93ab6734a51085fbe74f1a48d SHA512 e5b7484a2f3212d78481e7994457d69e5f42d6132b31f86d8de106e8e3fa8ffa3b7244fd74b63d15846be3a0fd407e6c57c6f766cdfa0ee1e3d7706124853b5f
 DIST argon2-20161029.tar.gz 1506864 BLAKE2B fbb0588439e811666af027710d1e5ef182b4d1c9012ca2c60d22ce103ceca14bb392dd8916b37c1c07799dc97f9401aa66d3bd08b250dd48314aa57a8599dff5 SHA512 e1f947a97e8b5f292dd32a6f1ea0ef3f2e411629218653821886ec4e1d5f8289d5b8f4b8bf0a37e69c344a83b975c695947d6b49fd2001a0e4273bebd4792892
 DIST argon2-20171227.tar.gz 1503745 BLAKE2B 70171ce1b446974e18e6f7077f436c6b78f29fd3eb075314014219280fd984e51b00137d901175da5fcb8a8472df0cbb16ff0333a2f2f098e52d3e0ea496e2cc SHA512 9c9e1a3905e61ac6913d1e073c104477e419ddd0506adc4487e88e98d19165ed8901fe8bb11246ed0cc71b3523c190da9692d5926642f86be09c3e67510afe4d

diff --git a/app-crypt/argon2/argon2-20160821.ebuild b/app-crypt/argon2/argon2-20160821.ebuild
deleted file mode 100644 (file)
index b407a8d..0000000
--- a/app-crypt/argon2/argon2-20160821.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
-HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
-SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 CC0-1.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/phc-winner-${P}"
-PATCHES=(
-       "${FILESDIR}/${P}-makefile-install-target.patch"
-       "${FILESDIR}/${P}-makefile-soname-symlinks.patch"
-       )
-src_prepare() {
-       default
-       if ! use static-libs; then
-               sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
-       fi
-       sed -i -e 's/-O3 //' Makefile || die "sed failed"
-       sed -i -e 's/-g //' Makefile || die "sed failed"
-       sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed"
-       sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
-}

diff --git a/app-crypt/argon2/argon2-20161029.ebuild b/app-crypt/argon2/argon2-20161029.ebuild
deleted file mode 100644 (file)
index ca5a7d9..0000000
--- a/app-crypt/argon2/argon2-20161029.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Password hashing software that won the Password Hashing Competition (PHC)"
-HOMEPAGE="https://github.com/P-H-C/phc-winner-argon2"
-SRC_URI="https://github.com/P-H-C/phc-winner-argon2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 CC0-1.0 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs"
-
-S="${WORKDIR}/phc-winner-${P}"
-PATCHES=(
-       "${FILESDIR}/${P}-makefile-soname-symlinks.patch"
-       )
-src_prepare() {
-       default
-       if ! use static-libs; then
-               sed -i -e 's/LIBRARIES = \$(LIB_SH) \$(LIB_ST)/LIBRARIES = \$(LIB_SH)/' Makefile || die "sed failed!"
-       fi
-       sed -i -e 's/-O3 //' Makefile || die "sed failed"
-       sed -i -e 's/-g //' Makefile || die "sed failed"
-       sed -i -e "s/-march=\$(OPTTARGET) /${CFLAGS} /" Makefile || die "sed failed"
-       sed -i -e 's/CFLAGS += -march=\$(OPTTARGET)//' Makefile || die "sed failed"
-}

diff --git a/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch b/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch
deleted file mode 100644 (file)
index bcd8562..0000000
--- a/app-crypt/argon2/files/argon2-20160821-makefile-install-target.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/Makefile b/Makefile
-index e9d27c8..90c1818 100644
---- a/Makefile
-+++ b/Makefile
-@@ -80,11 +80,25 @@ endif
- 
- LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
- LIB_ST := lib$(LIB_NAME).a
-+LIBRARIES = $(LIB_SH) $(LIB_ST)
-+HEADERS = include/argon2.h
- 
--.PHONY: clean dist format $(GENKAT)
-+INSTALL = install
-+
-+DESTDIR =
-+PREFIX = /usr
-+INCLUDE_REL = include
-+LIBRARY_REL = lib
-+BINARY_REL = bin
-+
-+INST_INCLUDE = $(DESTDIR)$(PREFIX)/$(INCLUDE_REL)
-+INST_LIBRARY = $(DESTDIR)$(PREFIX)/$(LIBRARY_REL)
-+INST_BINARY = $(DESTDIR)$(PREFIX)/$(BINARY_REL)
-+
-+.PHONY: clean dist format $(GENKAT) all install
- 
- all: clean $(RUN) libs 
--libs: $(LIB_SH) $(LIB_ST)
-+libs: $(LIBRARIES)
- 
- $(RUN):               $(SRC) $(SRC_RUN)
-               $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
-@@ -129,3 +143,11 @@ testci:   $(SRC) src/test.c
- format:
-               clang-format -style="{BasedOnStyle: llvm, IndentWidth: 4}" \
-                       -i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h
-+
-+install: $(RUN) libs
-+      $(INSTALL) -d $(INST_INCLUDE)
-+      $(INSTALL) $(HEADERS) $(INST_INCLUDE)
-+      $(INSTALL) -d $(INST_LIBRARY)
-+      $(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
-+      $(INSTALL) -d $(INST_BINARY)
-+      $(INSTALL) $(RUN) $(INST_BINARY)

diff --git a/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch b/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch
deleted file mode 100644 (file)
index 11892de..0000000
--- a/app-crypt/argon2/files/argon2-20160821-makefile-soname-symlinks.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 1838c13..85aa710 100644
---- a/Makefile
-+++ b/Makefile
-@@ -87,8 +87,10 @@ endif
- endif
- 
- LIB_SH := lib$(LIB_NAME).$(LIB_EXT)
-+LIB_SH_VERSION := $(LIB_SH).0
- LIB_ST := lib$(LIB_NAME).a
- LIBRARIES = $(LIB_SH) $(LIB_ST)
-+INSTALL_LIBRARIES = $(LIBRARIES) $(LIB_SH_VERSION)
- HEADERS = include/argon2.h
- 
- INSTALL = install
-@@ -153,9 +155,11 @@ format:
-                       -i include/*.h src/*.c src/*.h src/blake2/*.c src/blake2/*.h
- 
- install: $(RUN) libs
-+      mv $(LIB_SH) $(LIB_SH_VERSION)
-+      ln -sf $(LIB_SH_VERSION) $(LIB_SH)
-       $(INSTALL) -d $(INST_INCLUDE)
-       $(INSTALL) $(HEADERS) $(INST_INCLUDE)
-       $(INSTALL) -d $(INST_LIBRARY)
--      $(INSTALL) $(LIBRARIES) $(INST_LIBRARY)
-+      $(INSTALL) $(INSTALL_LIBRARIES) $(INST_LIBRARY)
-       $(INSTALL) -d $(INST_BINARY)
-       $(INSTALL) $(RUN) $(INST_BINARY)