ipe-7.1.4: get rid of lua patches

diff --git a/media-gfx/ipe/Manifest b/media-gfx/ipe/Manifest
index 8dbb58708b4327b3224991d3bc5ec23df5f8d3b7..22be4477163a3ddfa7233c20c500940c279c9901 100644 (file)
--- a/media-gfx/ipe/Manifest
+++ b/media-gfx/ipe/Manifest
@@ -1,5 +1,3 @@
-AUX 0001-config.mak-use-correct-lua-package-name.patch 543 SHA256 8349b4f1a9dde8ca25bd9c3921115ceeb25ce13cd10f79baefad5589306a7f69 SHA512 2f6b5e0269dd8a9a0397769c4bb24af495761b2821d9d74281aec466d614946348c07a506576a0ab328bb7b831dd6b9d5b8eb02de0ea6a29aac97a4a90a4f31a WHIRLPOOL 222565bd6ca945d8fcecf314c069d1aab8b013b4ecd8eb00bd7c9bfb588bedbd86472d0b2d5619e0665713c73ab798f747a276d823315a6bcb8d9bf04e4d2ba1
-AUX 0002-config.mak-Add-ldl-flag.patch 618 SHA256 b10047785bfa05f2a2cf7ca50b00c10f9ee0a3a0107cd05f4f7f193cefb5f935 SHA512 8a290f1b16c9a4c79cf1cb4a7bc676a0e838962a2a1ff0835e058067d9d798db89d4f40c798e2230e9669d50a03103eb45eddb0cc9b8d2be241fc40719afd386 WHIRLPOOL abd029f33b5e91c0ad6a8ef5fd4c3de62fb51ae8d6060d8740172275122d87ba943af5c46ae24223020c4f5168d395cf54df2f447526f61145daac8db447b180
 AUX ipe-outputprecision.patch 2504 SHA256 142f967987a84d2c45d0ca90d3a4b72360dd720f8d1cfa17d6f66c4500ee7e35 SHA512 13692eb5d0934147195b894f4fc378bf9f8def020cf12066025c6973097a753860f884cc8de6dc686b1bff35603874efaa814fb82838d7695f31f023109c7d83 WHIRLPOOL 8a1f6cf43c458cc47a55f42a98a055ce0c5a2c1b7e368a4d892efb44ed1c821d28489c92e26457541439019f5998b6a89f8712bdb19d0959eb9ea90fe0a5993e
 DIST ipe-7.0.14-src.tar.gz 1322856 SHA256 793d92e407649d7edaba2b98502ae28963d1a375d9fcc2bfc6021b44233cf807 SHA512 8a61205ee9683f7f89bf8ed30430bfc028fa1ba7801fbd1e515a1a0dad61dfb2ebe4b0a01f3a5be79081a4740de1532bd7bdbc7017c2a76670d877f4aa575a90 WHIRLPOOL 2a64df63a36b777d6d93f5ff3b84161ac4d41fc9afe36f0e8f050b69f745f9d952944c9a70cebddf0a43de25d75c908b87174ee2759ee6e7ff3791b2a102717e
 DIST ipe-7.1.0-src.tar.gz 1406988 SHA256 7121979ba19e425e015de9db3622066eeeb722636032a33fdbd5e01727e2ff3a SHA512 416dd82ffa259565f5504d6126c2027709e05d9fd8076604789e3558cf227077002e6e0a18fb3be26120077a8ab11b46efb7f6bb9441d91b7ccba27ca1797a43 WHIRLPOOL 3252e9154efd3ef3770e0dfe7acb2a38c54465d433804c7205d99d4854b909147b32c59ed1d62dfcd685c1ee94ae932cf916e20e1c288b90f42982a9057213d9
@@ -12,4 +10,4 @@ EBUILD ipe-7.1.0.ebuild 2550 SHA256 e7c148a5496287deec5e3ac3d3809285ce58f2f26dc8
 EBUILD ipe-7.1.1.ebuild 2550 SHA256 e7c148a5496287deec5e3ac3d3809285ce58f2f26dc807b0655faee00ea9949b SHA512 6ca7bd40e4c5486d6eec2b90dc01ac4498cc02ccbf30ba27948e31254bbb8db6ca4fff3feb8a26d9f4047ab264d0e7aa4e11aa7302c38151f95d667bebce2b77 WHIRLPOOL 9c64e7987ec58729f6c967895264d87c4373b1fd2b7a3d5bd9062ac507fdd0b14a08da487a8a311e4ad87f034384d9f422b79397665a8f346b1adecab58932df
 EBUILD ipe-7.1.2.ebuild 2351 SHA256 0707173d524e88246ffecb721cd9ec5faefd944e0f8f5166bbc9ead5796ae9cd SHA512 0714d9234e8c358eb2a6cf983e7b9e437e55e583371f052c58777c4f3860b3b304cf6a7023f83d78e1b675b78e95b7f7e7b20cd1f9155ebfcc72037e35869d64 WHIRLPOOL fb7d004c5afe1c9b79561d5e88ac9727ce181e39ccc0d27fd491c96728886f6108c0ab7dc708496d19240f0304e0d13fc2216210b6d4f9a670b8d9cbce9dabf1
 EBUILD ipe-7.1.3.ebuild 2345 SHA256 67b7284d5416e8a2df6d38d6457d050aeb363799f438a5ca58b5a8dfb62e7b54 SHA512 f4f1d8a3c213a55c8f98165e41da6682720b4e9a525f6da27437de94edef9aecde38c537257b27b21e786fd9cabbbfa039494673d73b55e2a22d7bddc5d1232b WHIRLPOOL 2a94bb4c3ecf176ef3fca2e86403a8ab514c2b4217959d34171e80bfe7aa33ec6511ed6ee648cd74e358968b9b0d1017e49ca34b5df81ab92521247bedbf9fad
-EBUILD ipe-7.1.4.ebuild 2481 SHA256 7dac0cde0be14cfd6e7ebd1aeb5141257435b60dced19fdb7f515d70e5573115 SHA512 e0e866bd934ac1aff4120f64f9d3840d87247153da1a01a713c11acd8d8025f93a57897bb35ea707b6a3747915876f983a6edabfa08deb41e81e5f09991d64fd WHIRLPOOL 9305e5bc6038268bebe70cacfad8f59cf3cbcea2a4a7b0012fdbbccbda100c53ddb5fe304ead26e34f5f56e50cc67081d0aa2920929c780c71df9cf78a61db33
+EBUILD ipe-7.1.4.ebuild 2371 SHA256 5981f9868b73ab160dd8ed0c395aec0a33e78d6f7972c6a35e0d6f3697547d28 SHA512 053939b5f6693ccabcdb3f209ca79ac1d5ae7e1abc26787599536d1e667086a905f1157f0a183fd328f858582a7dd9bf1d0be6ae146531eae6e0283b3518d33e WHIRLPOOL a4da13bbef6636e32d7f5aa8a530ae11613b1fd1d9060a07b5c1cc310693f3607e59bbbc988d2e45958d6494d8dee7d7dd57f4cd51930a534950bc842c7c2c03

diff --git a/media-gfx/ipe/files/0001-config.mak-use-correct-lua-package-name.patch b/media-gfx/ipe/files/0001-config.mak-use-correct-lua-package-name.patch
deleted file mode 100644 (file)
index 1555f77..0000000
--- a/media-gfx/ipe/files/0001-config.mak-use-correct-lua-package-name.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 85012b8f0b3b15668b377ebdd682ece39b0b9e6a Mon Sep 17 00:00:00 2001
-From: Stefan Huber <shuber@sthu.org>
-Date: Fri, 15 Mar 2013 17:18:32 +0100
-Subject: [PATCH 1/2] config.mak: use correct lua package name
-
----
-diff --git a/src/config.mak b/src/config.mak
-index 5f94cc8..49c54de 100644
---- a/src/config.mak
-+++ b/src/config.mak
-@@ -41,7 +41,7 @@ ifndef MACOS
- #
- # The name of the Lua package (it could be "lua", "lua52", or "lua5.2")
- #
--LUA_PACKAGE   ?= lua5.2
-+LUA_PACKAGE   ?= lua
- #
- ZLIB_CFLAGS   ?=
- ZLIB_LIBS     ?= -lz
--- 
-1.8.1.5
-

diff --git a/media-gfx/ipe/files/0002-config.mak-Add-ldl-flag.patch b/media-gfx/ipe/files/0002-config.mak-Add-ldl-flag.patch
deleted file mode 100644 (file)
index 3f1aeb5..0000000
--- a/media-gfx/ipe/files/0002-config.mak-Add-ldl-flag.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 9ef64ec2238e127861ce8ad8dcb2a6436c1cfd4f Mon Sep 17 00:00:00 2001
-From: Stefan Huber <shuber@sthu.org>
-Date: Fri, 15 Mar 2013 17:19:49 +0100
-Subject: [PATCH 2/2] config.mak: Add -ldl flag
-
----
-diff --git a/src/config.mak b/src/config.mak
-index 49c54de..d4e7a99 100644
---- a/src/config.mak
-+++ b/src/config.mak
-@@ -44,7 +44,7 @@ ifndef MACOS
- LUA_PACKAGE   ?= lua
- #
- ZLIB_CFLAGS   ?=
--ZLIB_LIBS     ?= -lz
-+ZLIB_LIBS     ?= -lz -ldl
- FREETYPE_CFLAGS ?= $(shell pkg-config --cflags freetype2)
- FREETYPE_LIBS ?= $(shell pkg-config --libs freetype2)
- CAIRO_CFLAGS  ?= $(shell pkg-config --cflags cairo)
--- 
-1.8.1.5
-

diff --git a/media-gfx/ipe/ipe-7.1.4.ebuild b/media-gfx/ipe/ipe-7.1.4.ebuild
index d97da85783fe386b5d36f04e5a589e3405821a58..c4d1a50bc9fcb2591a249ab78633a40b4f7f1e42 100644 (file)
--- a/media-gfx/ipe/ipe-7.1.4.ebuild
+++ b/media-gfx/ipe/ipe-7.1.4.ebuild
@@ -53,8 +53,6 @@ src_prepare() {
                einfo "Adding patch for higher output precision"
                epatch "${FILESDIR}"/${PN}-outputprecision.patch
        fi
-       epatch "${FILESDIR}"/0001-config.mak-use-correct-lua-package-name.patch
-       epatch "${FILESDIR}"/0002-config.mak-Add-ldl-flag.patch
 }
 
 pkg_setup() {
@@ -70,7 +68,8 @@ src_compile() {
        emake \
                CXX=$(tc-getCXX) \
                IPEPREFIX="${EPREFIX}/usr" \
-               IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html"
+               IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html" \
+               LUA_PACKAGE=lua
 }
 
 src_install() {