[gentoo-commits] repo/gentoo:master commit in: app-text/t1utils/files/, app-text/t1utils/

[gentoo-commits] repo/gentoo:master commit in: app-text/t1utils/files/, app-text/t1utils/

[Alexis Ballier]

commit:     dd4f80ff24cc83d1aeabb699c973bf1879d29b81
Author:     Karl Linden <karl.j.linden <AT> gmail <DOT> com>
AuthorDate: Sun Dec 31 15:30:18 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 05:40:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd4f80ff

app-text/t1utils: apply memmem patch from upstream

Closes: https://bugs.gentoo.org/630710
Closes: https://bugs.gentoo.org/642586
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-text/t1utils/files/t1utils-1.41-memmem.patch | 27 +++++++++++++++++++++++
 app-text/t1utils/t1utils-1.41-r2.ebuild          | 28 ++++++++++++++++++++++++
 2 files changed, 55 insertions(+)

diff --git a/app-text/t1utils/files/t1utils-1.41-memmem.patch b/app-text/t1utils/files/t1utils-1.41-memmem.patch
new file mode 100644
index 00000000000..db6f19549e5
--- /dev/null
+++ b/app-text/t1utils/files/t1utils-1.41-memmem.patch
@@ -0,0 +1,27 @@
+commit 3f1ddda424353f0f926dd28efa47b0ac61556ce8
+Author: Eddie Kohler <ekohler@gmail.com>
+Date:   Wed Aug 16 12:37:34 2017 -0400
+
+    Check for memmem declaration; sometimes it is not declared by default.
+
+diff --git a/configure.ac b/configure.ac
+index 5b4e3ff..b4dc4fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,7 @@ dnl strerror()?
+ dnl
+ 
+ AC_REPLACE_FUNCS([strerror memmem])
++AC_CHECK_DECLS([memmem])
+ 
+ 
+ dnl
+@@ -88,7 +89,7 @@ char* strerror(int errno);
+ #endif
+ 
+ /* Prototype memmem if we don't have it. */
+-#if !HAVE_MEMMEM
++#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM
+ void* memmem(const void* haystack, size_t haystack_len,
+              const void* needle, size_t needle_len);
+ #endif

diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
new file mode 100644
index 00000000000..8148e274d98
--- /dev/null
+++ b/app-text/t1utils/t1utils-1.41-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Type 1 Font utilities"
+SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
+HOMEPAGE="http://www.lcdf.org/type/#t1utils"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+LICENSE="BSD"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	!<media-libs/freetype-1.4_pre20080316"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-memmem.patch
+)
+DOCS=( NEWS.md README.md )
+
+src_prepare() {
+	default
+	eautoreconf
+}

[gentoo-commits] repo/gentoo:master commit in: app-text/t1utils/files/, app-text/t1utils/

[Sam James]

commit:     1ee68bdf5ee0c14e221e4a14038ba935d4b439d7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 07:44:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 07:44:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ee68bdf

app-text/t1utils: drop 1.41-r2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/t1utils/Manifest                        |  1 -
 app-text/t1utils/files/t1utils-1.41-memmem.patch | 27 -----------------------
 app-text/t1utils/t1utils-1.41-r2.ebuild          | 28 ------------------------
 3 files changed, 56 deletions(-)

diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index 5b3ea2712360..be0bcf1f3e44 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,2 +1 @@
-DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
 DIST t1utils-1.42.tar.gz 184666 BLAKE2B 63ebb856b7bd69751242b9858c47562fd720f098bda2dca694a13cf192e6970ae11d43cc2b2c0a1dde0a46d9d1762baf04ab279907a26270cae8ab04f2af02da SHA512 507b3179dad9479948331fc655d8d6d970a77923f55f5bee4ed5ae9c2222e27f410e62d96c4f27ecae9392335ca1df1f8bbb7ba7087a6268aeeee99d40aa42ed

diff --git a/app-text/t1utils/files/t1utils-1.41-memmem.patch b/app-text/t1utils/files/t1utils-1.41-memmem.patch
deleted file mode 100644
index db6f19549e5e..000000000000
--- a/app-text/t1utils/files/t1utils-1.41-memmem.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 3f1ddda424353f0f926dd28efa47b0ac61556ce8
-Author: Eddie Kohler <ekohler@gmail.com>
-Date:   Wed Aug 16 12:37:34 2017 -0400
-
-    Check for memmem declaration; sometimes it is not declared by default.
-
-diff --git a/configure.ac b/configure.ac
-index 5b4e3ff..b4dc4fb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -19,6 +19,7 @@ dnl strerror()?
- dnl
- 
- AC_REPLACE_FUNCS([strerror memmem])
-+AC_CHECK_DECLS([memmem])
- 
- 
- dnl
-@@ -88,7 +89,7 @@ char* strerror(int errno);
- #endif
- 
- /* Prototype memmem if we don't have it. */
--#if !HAVE_MEMMEM
-+#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM
- void* memmem(const void* haystack, size_t haystack_len,
-              const void* needle, size_t needle_len);
- #endif

diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
deleted file mode 100644
index 072c9c1ef29f..000000000000
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Type 1 Font utilities"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="BSD"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!<media-libs/freetype-1.4_pre20080316"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-memmem.patch
-)
-DOCS=( NEWS.md README.md )
-
-src_prepare() {
-	default
-	eautoreconf
-}