Patch src/Makefile.in instead of src/Makefile.am to avoid having to run autoconf, thus fixing bug #159088.

Package-Manager: portage-2.1.2_rc4-r1

2 files changed, 15 insertions, 74 deletions

diff --git a/mail-filter/bogofilter/Manifest b/mail-filter/bogofilter/Manifest
index 8ed057326104..a43851effa05 100644
--- a/mail-filter/bogofilter/Manifest
+++ b/mail-filter/bogofilter/Manifest
@@ -5,10 +5,10 @@ AUX 1.1.1-patch.1107.lexer_v3_l 755 RMD160 2ff3ee1f380d56e45e4f1387ad78bef328c77
 MD5 b8a43b91ab58487dd09e5b0b85617dfc files/1.1.1-patch.1107.lexer_v3_l 755
 RMD160 2ff3ee1f380d56e45e4f1387ad78bef328c770f2 files/1.1.1-patch.1107.lexer_v3_l 755
 SHA256 7b6710873a76acba298b02772f37ae0fc9dda08d6ee7b5547a2e6e0a3591c719 files/1.1.1-patch.1107.lexer_v3_l 755
-AUX 1.1.3-patch.1142.Makefile.am 2028 RMD160 20fb02ece013acadd401611e64ceb64b3fb0735e SHA1 56561dfc261eac47b15d2d030bfdb4366636818c SHA256 4d0d3a2412e9a326700cf47e71bae4dce8ca22d0a72eacf631f0e3f549c35886
-MD5 bf36683b11f6fc4ead47e3be5c27610d files/1.1.3-patch.1142.Makefile.am 2028
-RMD160 20fb02ece013acadd401611e64ceb64b3fb0735e files/1.1.3-patch.1142.Makefile.am 2028
-SHA256 4d0d3a2412e9a326700cf47e71bae4dce8ca22d0a72eacf631f0e3f549c35886 files/1.1.3-patch.1142.Makefile.am 2028
+AUX 1.1.3-patch.1142.Makefile.in 2401 RMD160 c59775fcf7f2d9a33dc92bb1e44a51c3184a4fc1 SHA1 19ff1be947c72cc528ddcc169e0b96ff438d5d92 SHA256 b34a54a7ac780981c4dc90066865621692f479a391888a181cee61608886f78a
+MD5 00eca3a04d44443a84922145edf1c0e9 files/1.1.3-patch.1142.Makefile.in 2401
+RMD160 c59775fcf7f2d9a33dc92bb1e44a51c3184a4fc1 files/1.1.3-patch.1142.Makefile.in 2401
+SHA256 b34a54a7ac780981c4dc90066865621692f479a391888a181cee61608886f78a files/1.1.3-patch.1142.Makefile.in 2401
 DIST bogofilter-0.92.8.tar.bz2 637420 RMD160 72b3d7426fca787fcb774b8d6c540a4668796e35 SHA1 ffaf181f71dfee7d4475d5c20fed4a8f50a3e7c4 SHA256 1f2f103b9e0038f789f842ecad11805bb8277f701b747ec3e851b02d3ebfc807
 DIST bogofilter-1.1.1.tar.bz2 790929 RMD160 0510317b5cac1197dc99e837b0fc67471422c9d3 SHA1 5c88e00f0b8415eb6a9b4274f5a4a335639a40b9 SHA256 98684dd687139af5c04ed73c3c64016f7ec9e951da8d435d9666a9a036099fa5
 DIST bogofilter-1.1.3.tar.bz2 798238 RMD160 78b778d3437e6bebaac0502e2e23166b87a1c2e4 SHA1 df20fb72b8b1d2535015fc339cfa58fa449ba0e2 SHA256 7219d5d2949fc7a956cf9a31fc84d085138c167634f846239488d1f518f12955
@@ -20,14 +20,14 @@ EBUILD bogofilter-1.1.1-r1.ebuild 2235 RMD160 d4eae2c80ce6e0b59aaf23a9cafeac0f7e
 MD5 c59bc8750b3080a7bafcba6e9de29a28 bogofilter-1.1.1-r1.ebuild 2235
 RMD160 d4eae2c80ce6e0b59aaf23a9cafeac0f7e7fccb1 bogofilter-1.1.1-r1.ebuild 2235
 SHA256 8cf949da0034adbb651770eb3234c163ad54e4a504640ad5bd6a3ef1ad26ea99 bogofilter-1.1.1-r1.ebuild 2235
-EBUILD bogofilter-1.1.3.ebuild 2307 RMD160 cd42e7f7219e29fb1f0bcd95979eeb4a1249fe16 SHA1 ea12d5532e12de3349e607f24ddc57035c1c6072 SHA256 fdf199d1579dea3a9d33d874b1875efd0cfff9070b54204f230ed78b59e0a0cb
-MD5 5c8928f12049d73a859235d60800f180 bogofilter-1.1.3.ebuild 2307
-RMD160 cd42e7f7219e29fb1f0bcd95979eeb4a1249fe16 bogofilter-1.1.3.ebuild 2307
-SHA256 fdf199d1579dea3a9d33d874b1875efd0cfff9070b54204f230ed78b59e0a0cb bogofilter-1.1.3.ebuild 2307
-MISC ChangeLog 17964 RMD160 33a91d9f7b4df26dffd9bbdeb4466f1e1a01d578 SHA1 f84b1d25852bac78a56fc468dbbb4d10401c4ac1 SHA256 b2120cd1b6bbdef6b7acaeb3efa0366a0e6773405af68334a486be5f3f8239b0
-MD5 12a599c1eacb9d0abaf2cfab3f57ec18 ChangeLog 17964
-RMD160 33a91d9f7b4df26dffd9bbdeb4466f1e1a01d578 ChangeLog 17964
-SHA256 b2120cd1b6bbdef6b7acaeb3efa0366a0e6773405af68334a486be5f3f8239b0 ChangeLog 17964
+EBUILD bogofilter-1.1.3.ebuild 2243 RMD160 5dc2fef8197f1556e3faa58a50895c6cbe0d5755 SHA1 a698fb92f9fe10309af9937c8b3772a40872d225 SHA256 b6b57d6db2a5afdbfa3f078df3e47488046b10a55af7f5ec51f0fd32a5b0b0a4
+MD5 6aa971491d012f21a54cea6e5798aacc bogofilter-1.1.3.ebuild 2243
+RMD160 5dc2fef8197f1556e3faa58a50895c6cbe0d5755 bogofilter-1.1.3.ebuild 2243
+SHA256 b6b57d6db2a5afdbfa3f078df3e47488046b10a55af7f5ec51f0fd32a5b0b0a4 bogofilter-1.1.3.ebuild 2243
+MISC ChangeLog 18227 RMD160 d6f51a60c559eb339b62ac23c5eda75b54a0b485 SHA1 1cb9405d1b1af570b00894ab0a7f78f0d74baa9e SHA256 b9fb4363d74c1ff00974e923058dbc3e39d3d745645d04918c8bd1459d7f15f5
+MD5 80b79323fbd6cdbdd880c11a42f08a6c ChangeLog 18227
+RMD160 d6f51a60c559eb339b62ac23c5eda75b54a0b485 ChangeLog 18227
+SHA256 b9fb4363d74c1ff00974e923058dbc3e39d3d745645d04918c8bd1459d7f15f5 ChangeLog 18227
 MISC metadata.xml 424 RMD160 7780bbf745ba6b51f837cdc076b1b315ba8d33b9 SHA1 0b17aa0a89b5854ee1850da8e222b95015e1afd9 SHA256 ace8b08d5d5b207b9226c509b6d1f9610da16264d08033e28713df61063563d9
 MD5 48bd0f185b30f8151e8da04a025e0373 metadata.xml 424
 RMD160 7780bbf745ba6b51f837cdc076b1b315ba8d33b9 metadata.xml 424
@@ -44,7 +44,7 @@ SHA256 c5369fe9bfa4a1054371abc154d2f80b52cac9809ccae694fdcbdc78c6c1857c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFkZPRQlM6RnzZP+IRAibrAJ4zHt0hy3ylJRwgIiWuHrBiCe9GyACgwuKS
-sdlTzm5bgQ+ScdSUFtTgF8E=
-=zrne
+iD8DBQFFkacQQlM6RnzZP+IRAmk4AKCt4umt7NXniO2NyvwdKGXiUR4OoQCcDs2Q
+JWJGkjd4ZGRl5B0whFCWF9o=
+=bfvz
 -----END PGP SIGNATURE-----
diff --git a/mail-filter/bogofilter/files/1.1.3-patch.1142.Makefile.am b/mail-filter/bogofilter/files/1.1.3-patch.1142.Makefile.am
deleted file mode 100644
index d33e1abca715..000000000000
--- a/mail-filter/bogofilter/files/1.1.3-patch.1142.Makefile.am
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: src/Makefile.am
-===================================================================
-RCS file: /cvsroot/bogofilter/bogofilter/src/Makefile.am,v
-retrieving revision 1.141
-retrieving revision 1.142
-diff -u -B -r1.141 -r1.142
---- src/Makefile.am	30 Nov 2006 00:14:16 -0000	1.141
-+++ src/Makefile.am	9 Dec 2006 13:53:57 -0000	1.142
-@@ -12,22 +12,6 @@
- 
- noinst_LIBRARIES = libbogofilter.a
- 
--if NEED_GSL
--libbf_gsl_a_CFLAGS=$(AM_CFLAGS) -DRENAMEFILES
--libbf_gsl_a_SOURCES= \
--../gsl/cdf/chisq.c ../gsl/cdf/gamma.c \
--../gsl/specfunc/gamma_inc.c ../gsl/err/error.c \
--../gsl/sys/infnan.c ../gsl/sys/fdiv.c \
--../gsl/specfunc/exp.c ../gsl/specfunc/trig.c \
--../gsl/specfunc/log.c ../gsl/specfunc/psi.c \
--../gsl/specfunc/zeta.c ../gsl/specfunc/elementary.c \
--../gsl/err/stream.c ../gsl/specfunc/expint.c \
--../gsl/specfunc/erfc.c ../gsl/sys/coerce.c \
--../gsl/sys/pow_int.c ../gsl/sys/minmax.c
--noinst_LIBRARIES += libbf_gsl.a
--libbf_gsl_a_CPPFLAGS= -I$(top_srcdir)
--endif
--
- if USE_GCC4
- AM_CPPFLAGS = -iquote$(top_srcdir)/gnugetopt -iquote$(top_srcdir)/trio \
- 	      -I$(srcdir) @GSL_CFLAGS@ -I$(top_srcdir)/gsl/specfunc -I$(top_srcdir)
-@@ -59,8 +43,27 @@
- bogofilter_LDADD = $(LDADD) $(LIBDB) $(GSL_LIBS)
- bogoutil_LDADD = $(LDADD) $(LIBDB)
- configtest_LDADD = $(LDADD) $(LIBDB)
-+bogofilter_DEPENDENCIES = $(LDADD)
-+
-+if NEED_GSL
-+libbf_gsl_a_CFLAGS=$(AM_CFLAGS) -DRENAMEFILES
-+libbf_gsl_a_SOURCES= \
-+../gsl/cdf/chisq.c ../gsl/cdf/gamma.c \
-+../gsl/specfunc/gamma_inc.c ../gsl/err/error.c \
-+../gsl/sys/infnan.c ../gsl/sys/fdiv.c \
-+../gsl/specfunc/exp.c ../gsl/specfunc/trig.c \
-+../gsl/specfunc/log.c ../gsl/specfunc/psi.c \
-+../gsl/specfunc/zeta.c ../gsl/specfunc/elementary.c \
-+../gsl/err/stream.c ../gsl/specfunc/expint.c \
-+../gsl/specfunc/erfc.c ../gsl/sys/coerce.c \
-+../gsl/sys/pow_int.c ../gsl/sys/minmax.c
-+noinst_LIBRARIES += libbf_gsl.a
-+libbf_gsl_a_CPPFLAGS= -I$(top_srcdir)
-+bogofilter_DEPENDENCIES += libbf_gsl.a
-+endif
- 
- EXTRA_PROGRAMS=panicenv
-+
- panicenv_SOURCES=panicenv.c
- panicenv_LDADD=$(LIBDB)
-