Replace libdl hack with a proper patch

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

4 files changed, 60 insertions, 21 deletions

diff --git a/net-print/cups-filters/ChangeLog b/net-print/cups-filters/ChangeLog
index 62feedd933db..9fc205af55a0 100644
--- a/net-print/cups-filters/ChangeLog
+++ b/net-print/cups-filters/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups-filters
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.18 2012/07/27 18:03:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/ChangeLog,v 1.19 2012/07/27 18:23:43 dilfridge Exp $
+
+  27 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  cups-filters-1.0.19.ebuild, +files/cups-filters-1.0.19-libdl.patch:
+  Replace libdl hack with a proper patch
 
   27 Jul 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   cups-filters-1.0.19.ebuild, cups-filters-9999.ebuild:
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index d42cef851733..7f58f251a53a 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -2,26 +2,27 @@
 Hash: SHA256
 
 AUX cups-filters-1.0.11-makefiles.patch 7582 SHA256 9a25decdb0033eb1a1910c3787eaad6ac4ec69715db426edbdbdf22b759a5bdc SHA512 27ba3e34e5db125caddbdb6e87b2673cb281e460bfd52ea7a6dfecdd90f080a927fb0a9d68ac9979df577647dc3f9a0d8154046970bc1ebe5c4277d5b50c2faa WHIRLPOOL 17da06b1de4b646b153dfc7986bad257dbd4770cb7386e6f5fbb54b6d1ca36d4dcece891d8294eca233d25784b85113085afd1db81cb32b4b2f2625a2ea4fb54
+AUX cups-filters-1.0.19-libdl.patch 1011 SHA256 65548de08de68ca114691385acf0dc44072661aadc3f5077b31877021e5b0d6e SHA512 8c98d3e4c60be5c956f8b0d5d5abc5f0225c60056e8c6bc9035fde5262ca18f3fe701f1fdc169c824655a5deba0f4428e11e289a5f0def852d7dd0b3d96c9525 WHIRLPOOL e83c54c0b253872f77454529a0461530cc5666918c2e97c9ee65645ad6032ad27625a816ea3bda6f78b4a12c7dc801cc411aed4dbc4a45eca434f45a4b3506dd
 AUX cups-filters-1.0.19-poppler020.patch 8289 SHA256 29c03711eb6d8ae04c8e4d401358126d2c82f7fc2f0008cc0d433c86ade9eb9d SHA512 b89da29740a7742cee4d77a1bec174677d7373fb7b91d5fb88f72c0cd67b69133ec33eade5371cba7e802128879c79a1a046ae8b1bf1e4a81c8f4d08191bc300 WHIRLPOOL 69062c1f94aad41d5638ec07df54ad21ee78926d045a04d3dd0835bc76113c4f6f6c59cc423be52f6d6d47b9bb93fa53b6aea051444c9870cf47c54c51938b58
 DIST cups-filters-1.0.19.tar.xz 1012400 SHA256 45774c604df90db30474d049557d6b683e02dfabb5b9c30ddf8b0152daec8781 SHA512 272d7b6a0065b379f4ec39f931fe35e1ed92f046090ecd3ef3a7b06e6d158c4ba7f5e0c78a3edea6c351aed9f94391de653418b727fa58ec6237071c9a61d3eb WHIRLPOOL e90dd2e274eff995e52cc014195130786bfed4a0e6b47cf14d774dcff884b31054a8260b1ab26649e3da2cd30c9041d512b00723c6c428ce643595eabb6e107c
-EBUILD cups-filters-1.0.19.ebuild 1792 SHA256 b30257b7d1a48ce1169d552c900c31b94982a801a8929db7ed178f26a3d27ea3 SHA512 6daaa2b284e50434779e0056239743b6bfd598026fc20c8b18f9f078d95f84e8050f4b7a433b8e19106382efc96061134f597e98f1f9d1618eba32eb637d6140 WHIRLPOOL d7f7818b7d2bf9c25e07484aa805e179399186921483a1fc8947c77fa5022d9786748aaeb611f55f69cc0209102ed9485c5df7b6037539d21092b001ecb5f8c3
+EBUILD cups-filters-1.0.19.ebuild 1763 SHA256 37dcd4937d97eeb1352fba960b3cd71794f8c712519a07ac2319ed9f65992ed9 SHA512 4dd4afb34d00da2d54b05952dcde6315ec750c619c5eb4a28d79eacd465b59ac170f7bc94ec66fd197bc2a854df54dfe26c075dfdeae120f346015836cf5504f WHIRLPOOL 368435257cde466192043c62c375980ed548a9af99ca80d1d1d780dd1ef546946418245a7f319da8de489cee3fc0b403783224756db039f9db49ec2e52c50704
 EBUILD cups-filters-9999.ebuild 1699 SHA256 a2963e92208f44619fad5152fe8a54f1653c6b32025d470490873aafe4700b08 SHA512 60ccab009b3e8aa22b89cb35fca70aaec5bf444c2ef44d6cc9ffc26e1b7fd6a91c25db47a5cc91f9d9399d711df1e5663194d2cee7aaab1b2b547ddb334b24ce WHIRLPOOL 3eeef637a5b2cb661950d2928019d7ef25a98b5de9cdc51c046bad42a85bbbea56e55a5b6b742ce2a05704381c12907804be153215d11c86115f53cca262350a
-MISC ChangeLog 3643 SHA256 adcbab350554504406a348eb8d3bf6cb602139fd7aafbea96046e253fb254781 SHA512 e76ca12cbe7bec980913755e185014e0d2217eadd64355b664a97825c9e2b3cd0b7132147f59138e410f7342dca142c7285f8b8b90c4e9872d6c5f83f2dcb581 WHIRLPOOL e60bb18d3adf86d6361732316921d85c7c66cf0cc34ca518c7720d9abdd371fc5176da3eb5ccc460936885666559462d63cbfae9caf3f2f06c497074774937a1
+MISC ChangeLog 3812 SHA256 d9c85ecc29ba2db8d44be6941c01486aa4b70776b7f20476246a974e1242b32f SHA512 24277cf6950f75b21c32c90fd91d5a1127fe7df33caae78cfb351087f55f9cd939aef47b9d72471710e5529b87f7297c58d3885a2bc0666707d4188496a89a9c WHIRLPOOL 5c2f9c5e5d283975fcf375ccd89e1988fbfabeb050ddb3e30043afa3cb18190cf907f730e6c8aba2f8ae869223a960991c9a99bed2a5c8ec514b4fde6495de67
 MISC metadata.xml 162 SHA256 753dd90680a9d937cb438cbf14dc217d518514d1596682a4e3478b1b7c7ba051 SHA512 ff7cd6e9d088c1ce0107a86a693abddb12d1385e8f9abb2614aa5cb8ed0c046a1387ccab1643fe711e84df1fa23659ce490f68f0504bbb908b7662a0ac490a03 WHIRLPOOL ccbf59144f058b49de3d54bbe6d92e2d2e8b605df10d5143ccfd7e4a021069ca025e87b4179179a60091c03d8bf1e371207c35f1102c2c1f848bf6697e9c2bb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQEthcAAoJEEb+UGWnxTyH51EP/1WQiCkqsq8Xw4B/BflwPZsZ
-TQxOvEQ8eNjfiZvC4N0FgWoe5SQIgXuAO6EDYWymuepsooZwgud/TkLqsBcgVwyw
-Q6CFaeoABxRQQOOsuga5aCJAgZqE0aYHCLlJLH+FNKjJhaKcUbZugvJREMYR26qO
-DJ1aprm6mluL7UqnrPgLfTeQP6Qvx9D/7f+ylxV8S0EfGijqPjM21H6A64hwASW/
-+fnmZmT9sR2f6q5Jy3XZcwI2lh+a/AA1z2Mbt7hMmVoRpE+oc//0SwhMMf2OqjI5
-mv+Hj5voYn9+0ouqe+Tsd1vLJ3MhVocprxU8RLPvVBtZVL4O5I0HxVB+lz19mAv+
-5tFgZ3D7epvL2GxiS2o61wgWLmke9Kj/QY+dO0PTveqhoG0/nL5cDzKYRvsHtRmD
-hSg4rtJm7ElnvrdONmLGrF0Uf81UPaMvnnBFJ7qL6LMIVi1JcmBV8y6yqr05bPi2
-hlvxy9NRYdVAdm3ti2oiQJkYUzpI99c829rqMZvv7mB7lGNf1Tpa5Un1bojkUem5
-CPWCMhrvzF8VCn3nuQIJwBQ9fRgsW3g/wyQgLNkBa8kysyGvewnxVKaWhMc7ba67
-zDIVDWeJrqbP6Qj6XlS3hrZYEke4146Vp0Sj0Qv10cf6o0r3bSrZ1M7D0Xae6GQ+
-P/Jtv1pKw+wOkGRo669d
-=EwWY
+iQIcBAEBCAAGBQJQEt0KAAoJEEb+UGWnxTyHmGMP/2dx8UNuEyeGX44eJ7zCjYW3
+9XTH3GjMauBQZ9P99tDoLjZEUitoTXPPFxh9+u9kr4cyweke/qQaNKcFZ6ROWsSm
+CxvXgryvqYKqyRYOxtHvqmh+QzKDhLiYnt/oOxrp+Thdv/ZBr43knkmWkd2dHt8t
+C1U7JP1VIlHb5F59hceV1HtijfSRjCyjWz2y1XGsplSGq7FDOXvNa7u14hfuSi3T
+NjS2a9glmzzvxRNJU+BIbZvExl0x2fowilInoL0X7s9g531DopX7g2Pj0DeROmWU
+XXcjdYdCeWSagZhiIz5p8IZ+Ue4lhHqJz0E1qDzTBAfDdS+b7VYe4PvtIH+uNVUO
+AePG0zI4eyvOtBn8LaZjTsGpZrPjjyE7ptWo9wK3x4iCDJmQgWhi1glBJKxuBsVO
+Q+wK2GzsulDpwvK3WLN8PgGQkDPvElm/lfaRS6Dg0AwPf2r134zLuzdgcWFW2RMz
+9IrJFjATWzpeTJXpf+Mu5zWKt6QAkGnUE4fm8cppVTiSoewH9o3WFncCzZzwDHNL
+WqGocZrikebU7MfD+fe0epPa7gPhuskBjVoTvch7xo/nyNwb8XEQ6CAXWL3MZcB1
+kEXKHor7y6x1PR4vfkBH1UUMp8s8LcJS20/cMDLfpyRx5BhaouNmYi0amtfRD+wa
+tWxyMVLxH5NVBlbbuX8A
+=XO8v
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups-filters/cups-filters-1.0.19.ebuild b/net-print/cups-filters/cups-filters-1.0.19.ebuild
index fe634c89c1b1..11253bb2680d 100644
--- a/net-print/cups-filters/cups-filters-1.0.19.ebuild
+++ b/net-print/cups-filters/cups-filters-1.0.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.19.ebuild,v 1.3 2012/07/27 18:03:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups-filters/cups-filters-1.0.19.ebuild,v 1.4 2012/07/27 18:23:43 dilfridge Exp $
 
 EAPI=4
 
@@ -39,10 +39,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-poppler020.patch" )
-
-# this is an evil temporary hack- dilfridge
-LDFLAGS+=" -ldl"
+PATCHES=(
+	"${FILESDIR}/${P}-poppler020.patch"
+	"${FILESDIR}/${P}-libdl.patch"
+)
 
 src_prepare() {
 	base_src_prepare
diff --git a/net-print/cups-filters/files/cups-filters-1.0.19-libdl.patch b/net-print/cups-filters/files/cups-filters-1.0.19-libdl.patch
new file mode 100644
index 000000000000..ad5852ca1c0b
--- /dev/null
+++ b/net-print/cups-filters/files/cups-filters-1.0.19-libdl.patch
@@ -0,0 +1,34 @@
+diff -ruN cups-filters-1.0.19.vanilla/Makefile.am cups-filters-1.0.19.orig/Makefile.am
+--- cups-filters-1.0.19.vanilla/Makefile.am	2012-06-22 18:11:48.000000000 +0200
++++ cups-filters-1.0.19.orig/Makefile.am	2012-07-27 20:21:06.630910203 +0200
+@@ -329,7 +329,8 @@
+ 	$(FREETYPE_LIBS) \
+ 	$(FONTCONFIG_LIBS) \
+ 	$(LIBPNG_LIBS) \
+-	$(POPPLER_LIBS)
++	$(POPPLER_LIBS) \
++	$(LIBDL_LIBS)
+ 
+ EXTRA_DIST += $(pkgfontconfig_DATA)
+ # ==========
+diff -ruN cups-filters-1.0.19.vanilla/configure.ac cups-filters-1.0.19.orig/configure.ac
+--- cups-filters-1.0.19.vanilla/configure.ac	2012-07-27 20:06:16.697927916 +0200
++++ cups-filters-1.0.19.orig/configure.ac	2012-07-27 20:20:38.368910216 +0200
+@@ -127,6 +127,17 @@
+ AC_CHECK_HEADERS([unistd.h])
+ AC_CHECK_HEADERS([zlib.h])
+ 
++
++# ========================
++# Check for libdl
++# ========================
++AC_CHECK_LIB(dl,dlopen)
++if test x$ac_cv_lib_dl_dlopen != xno; then
++  LIBDL_LIBS=" -ldl"
++else
++  LIBDL_LIBS=""
++fi
++
+ # =============
+ # Image options
+ # =============