gentoo auto-resync : 26:03:2024 - 01:01:01

3 files changed, 104 insertions, 0 deletions

diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index b6086e475b0d..c56b40d11272 100644
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -1,8 +1,10 @@
 AUX xdelta-1.1.4-glib2.patch 4545 BLAKE2B ea73867aa9f09ee70c5bd6708c2cc2eeb9a8de1878168641e517744dabcb9f49ed62bbac1d9cfb1704d06acc32285741a3a4076a7f8a1e383967ef70f4ac2410 SHA512 563a99d6007228ef2e0f838cc66251918b875ce779f12fa03015dc97d14379951fd9d2a165b7562e97ad41931ac8ca0a535941cbd4605b5f67e176d1f9d31288
+AUX xdelta-1.1.4-gzip.patch 1794 BLAKE2B 61cbfb75613d8536c801871c25ab135dc1f6a62f91e4930f53e26d8a42a46893f3217f77953df07e88b04630f302b62a447746a2241e10331fd35a805991b0a5 SHA512 5507479136bd0ed894b2376fd73c482c072423039d192340b841b2fa9ec2c7d0babfd7426a8750eb4bc454cddfacdc6e9404568c3e12ccb202696b25e564e430
 AUX xdelta-1.1.4-m4.patch 458 BLAKE2B 802797681fcee8a7f07babe3e4598677704ca43548e4a88b1bbfa364cede17bcdca68e2fe7dad7c5e4f01c1bcdf88ec47879ec89352b7ab0765043b2579cefe7 SHA512 f932359b311cffbe711a006a670dbeb2ebcea2386f04bcd3ce38ffd0d743f7c0aa4138b5a781942dc02c40950982b2f295b9a79935dce3666c4ae1dd7d068fd3
 AUX xdelta-1.1.4-pkgconfig.patch 2551 BLAKE2B 606dd386fbfb768c931e2c08b5508f6bc3dfe96d61c3cf62b57c85f0b697612473355775008ac224192e6800a3cff447357a1e24961f86b5615f8c7cb4cc5c0f SHA512 08428227f9aa15e373f2fc81a097e3aad7df2d53d65172da9d1da3c81c52b9d646ad8d1f0f69533e4486cf72e4cf8ec106e948dc0c9a1cd1aad8732ceb4aeeb5
 DIST xdelta-1.1.4.tar.gz 423529 BLAKE2B b565f82ba0504118b74127096939e5699ea312be5c6c8a345abfcf0fb01b45e759abe595b33619b2714671e2f0307d603366a1f7a6b1fb5a786378716a51df6b SHA512 eef45f7977e9a7f490b881f33ab8a948cc5eff9300ea850cc30062905c8e883c104961f075f56f7ce8e385142c35de168aef1e0b8169bda66786ea4bee33168b
 DIST xdelta3-3.0.11.tar.gz 683605 BLAKE2B bc33c9d6a3bb21bc52d72bba54f5e2b1058ea8d7cd7474aaf6dbdc27e165e0fbea644c584402f5bbc8ace7cd6a3aefae18588a659418f93eb041168545363bf4 SHA512 41c48e28f92ad50a737cf0acac150fe17d1132e9a652c482d751c8c4e745c6922d576a183eeabae343a1a238ed8c53353e537977628c86eb599ab3d1c01e7c52
 EBUILD xdelta-1.1.4-r3.ebuild 834 BLAKE2B b99098382f637fb93858ea8573b3a0c2b9a2a0034143da1b84b1651a148424ec2fd41e5d4e81064da1e3c3912579e6401fd2f29156bcff9e7fef628ef70a9453 SHA512 5ef14b5cc39e01e62263c23be30ef6b4f591f238f717c50aefd39b02db466bfa20c06fb8cbd2e9347d64cc807ac40c690f7c84a2b037100322b6c7c4d42a183d
+EBUILD xdelta-1.1.4-r4.ebuild 857 BLAKE2B febe4b6b7ed090fc8890a808c1dbb319eba2a1a1b9f309a36e3567808138bc2bbcac69ff73e85dcee76b8c0f179fdfb1eb12eca5146f61a2373a5e4c0400c884 SHA512 35ed366b2ddb463bcdf832ecf89d0e8c4fe7d0c412bc4f2d4c65c9420a19b7835741d470b6c210f6d21325ee5cb071613d50c46f391f784bf743497d9b553f89
 EBUILD xdelta-3.0.11-r1.ebuild 858 BLAKE2B 18236d56533a1d0ebfe84c7e233903b8e5bce89ad8740989df774b05b388098ea3305109839fd22c915ac8dfaa9dccbb4a7d9f70fa4f8fa45d6abb4fbbd7bcdd SHA512 412923fc332082a2825164898dd9566e48893a39689a23514203e17156fac31b3116bbb344abbd25a26be04c5ecfaffeb72a07fff5a24eaba39a0b40a50357b0
 MISC metadata.xml 382 BLAKE2B cc14f0abf5af25bd88162e05a791f04f324be346f1e36461af3ba9d28fef7e050746727f688a3a6229c2e69af389cbbc0c9ee0145ed57522e2090246d8d1ebf3 SHA512 0f3d418d613e9c3ad11655d54595046465dc28d452c99319efc1fc4b3e5b75bd708d6f83f29c40eab8ce83c9096b83175736cee80d1acc697e98ea4dd52651f4
diff --git a/dev-util/xdelta/files/xdelta-1.1.4-gzip.patch b/dev-util/xdelta/files/xdelta-1.1.4-gzip.patch
new file mode 100644
index 000000000000..67696da730ce
--- /dev/null
+++ b/dev-util/xdelta/files/xdelta-1.1.4-gzip.patch
@@ -0,0 +1,59 @@
+https://bugs.gentoo.org/919228
+
+--- a/test/xdeltatest.c
++++ b/test/xdeltatest.c
+@@ -512,7 +512,7 @@ run_command (TestProfile *tp, int zlevel, int slevel, File* from, File* to, File
+   if (zlevel > 0 && starts_with (tp->name, "diff"))
+     {
+       Patch  *patch   = read_patch (out, & sbuf);
+-      gzFile *rewrite = gzopen (out->name, diff_gzargs);
++      gzFile rewrite = gzopen (out->name, diff_gzargs);
+ 
+       if (! rewrite) fail ();
+ 
+diff --git a/xdelta-1.1.4/xdmain.c b/../../xdelta-1.1.4.new/xdmain.c
+index b1abc74..9c27195 100755
+--- a/xdmain.c
++++ b/xdmain.c
+@@ -179,6 +179,7 @@ struct _XdFileHandle
+   guint    narrow_high;
+   guint    current_pos;
+   FILE*    in;
++  gzFile   zin;
+   gboolean (* in_read) (XdFileHandle* handle, void* buf, gint nbyte);
+   gboolean (* in_close) (XdFileHandle* handle);
+   gboolean in_compressed;
+@@ -520,7 +521,7 @@ xd_gzwrite (XdFileHandle* fh, const void* buf, gint nbyte)
+ static gboolean
+ xd_gzread (XdFileHandle* fh, void* buf, gint nbyte)
+ {
+-  return gzread (fh->in, buf, nbyte) == nbyte;
++  return gzread (fh->zin, buf, nbyte) == nbyte;
+ }
+ 
+ static gboolean
+@@ -532,7 +533,7 @@ xd_gzclose (XdFileHandle* fh)
+ static gboolean
+ xd_gzrclose (XdFileHandle* fh)
+ {
+-  return gzclose (fh->in) == Z_OK;
++  return gzclose (fh->zin) == Z_OK;
+ }
+ 
+ static void
+@@ -1022,13 +1023,13 @@ xd_handle_narrow (XdFileHandle* fh, guint low, guint high, gboolean compressed)
+ 	}
+ 
+       g_assert (fh->fd >= 0);
+-      fh->in = gzdopen (dup (fh->fd), "rb");
++      fh->zin = gzdopen (dup (fh->fd), "rb");
+       fh->in_read =  &xd_gzread;
+       fh->in_close = &xd_gzrclose;
+       fh->in_compressed = TRUE;
+       fh->current_pos = 0;
+ 
+-      if (! fh->in)
++      if (! fh->zin)
+ 	{
+ 	  xd_error ("gzdopen failed: %s\n", g_strerror (errno));
+ 	  return -1;
diff --git a/dev-util/xdelta/xdelta-1.1.4-r4.ebuild b/dev-util/xdelta/xdelta-1.1.4-r4.ebuild
new file mode 100644
index 000000000000..b632f97574e6
--- /dev/null
+++ b/dev-util/xdelta/xdelta-1.1.4-r4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Computes changes between binary or text files and creates deltas"
+HOMEPAGE="https://xdelta.googlecode.com/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-libs/glib-2
+	>=sys-libs/zlib-1.1.4:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-m4.patch"
+	"${FILESDIR}/${P}-glib2.patch"
+	"${FILESDIR}/${P}-pkgconfig.patch"
+	"${FILESDIR}/${P}-gzip.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}