From a3a45bb6e966b8fc045626b06e825f52f39dd9eb Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Fri, 15 Mar 2013 17:06:12 +0100 Subject: [PATCH] adding ipe-7.1.4, fixing older ipe ebuilds --- media-gfx/ipe/Manifest | 8 +- ...fig.mak-use-correct-lua-package-name.patch | 22 +++++ .../files/0002-config.mak-Add-ldl-flag.patch | 22 +++++ media-gfx/ipe/ipe-7.1.2.ebuild | 11 +-- media-gfx/ipe/ipe-7.1.3.ebuild | 11 +-- media-gfx/ipe/ipe-7.1.4.ebuild | 97 +++++++++++++++++++ 6 files changed, 155 insertions(+), 16 deletions(-) create mode 100644 media-gfx/ipe/files/0001-config.mak-use-correct-lua-package-name.patch create mode 100644 media-gfx/ipe/files/0002-config.mak-Add-ldl-flag.patch create mode 100644 media-gfx/ipe/ipe-7.1.4.ebuild diff --git a/media-gfx/ipe/Manifest b/media-gfx/ipe/Manifest index 40a3d14..8dbb587 100644 --- a/media-gfx/ipe/Manifest +++ b/media-gfx/ipe/Manifest @@ -1,11 +1,15 @@ +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 DIST ipe-7.1.1-src.tar.gz 1283803 SHA256 749d916c0d9f2af9f92d09e2a9b79cba8f6e262ebb7ce8c806ddc0549ef2fdde SHA512 bf9a9c63ac79df6fbb749be421c162ee95c3afe79f7fe46a61cd8b1798a32062dad5f912e5fbe14ee090a4b707d332ec595dfd6437571d1e5b9aedd747903804 WHIRLPOOL 19a0482f5092e2b317765f12b21e485b06bef3956086136af7c12eb781ae13455ddc3a8d9ef9f7e4d73acbdd55b687615cb00320ba637113d456bf109f34c58a DIST ipe-7.1.2-src.tar.gz 1416404 SHA256 3390de67ee22b2de74acfab2e9fb29bcfd6fe180688086febb758dc8a82eda11 SHA512 9d49c5f116a6271fce5a5a6c77cad64e348b17b9b02d1be8bece341231ebc15f642d6af49e73958e4d26814eafc52be38855e4d24e8cf44488da6a752151a189 WHIRLPOOL 80770369cf07fa9bdf2f3d40fe88e2e312d65c9b075f3eae44822ede2e38cc5f378c8078ab21e14a25a604977578b3be71978dd71844c7877abc50ba0f7f8f4c DIST ipe-7.1.3-src.tar.gz 1497624 SHA256 4b3c537aeb9720e74ee5e63d50e1ec1f760f90b3896ffb9acc8c20353f60b8e9 SHA512 eea85ed6f4bc23e746222e01f4cdfd101c9c18aeb19fcba9abff565a65614a2a5e6630ddf9f7b024cac225582a34238a22f6fc5cf7dcc3733b8281ce844ef23d WHIRLPOOL a1b46452fb3b2d5da72a411eca48a2e24331416727b4013cecebad962817d3029c63a972ae7ee743b35cfe9adc4dc3c59d04572e9b472fdf774ad67202b0b264 +DIST ipe-7.1.4-src.tar.gz 1502198 SHA256 50ccd74064595a7bbaa93ef8f8a9988fd4be31fd545ce9c6e85c604e0c8a44eb SHA512 bec286ad3a4a1119efc3140c5b3141a9b217189436845185c597447735eaee9298ef6371e6cae1ed4c7bb8bbdf5ece1d3a5f54b2ae8ae5df199a6cc49ad860c8 WHIRLPOOL daa682ca20d131dc8290d357682998f42d45794d1e19e20bb495f518c5578c9ee40d57568518c78145c0d34f67d7f6464223b8281a13a17545447fb997c38a87 EBUILD ipe-7.0.14.ebuild 2568 SHA256 a2c93051a772cc1dfa89c9046c03172b81c33793295679693efb817105df4f6d SHA512 b25da43eddf9d4ebab11c2116b3dd6dbf23cea97ff1493d1e8c3d8bbc74fa20269318c6c820bdc979519731291781579df059141764aaca373ff8e07b583b5de WHIRLPOOL 2c498f7118c1ca184dd50ace3ea0613396104a7e58bef25156100195832608b53ed516fa0680f77faf4ced3f866cb397ca7f57b2d600835e665f56f247208fbe EBUILD ipe-7.1.0.ebuild 2550 SHA256 e7c148a5496287deec5e3ac3d3809285ce58f2f26dc807b0655faee00ea9949b SHA512 6ca7bd40e4c5486d6eec2b90dc01ac4498cc02ccbf30ba27948e31254bbb8db6ca4fff3feb8a26d9f4047ab264d0e7aa4e11aa7302c38151f95d667bebce2b77 WHIRLPOOL 9c64e7987ec58729f6c967895264d87c4373b1fd2b7a3d5bd9062ac507fdd0b14a08da487a8a311e4ad87f034384d9f422b79397665a8f346b1adecab58932df EBUILD ipe-7.1.1.ebuild 2550 SHA256 e7c148a5496287deec5e3ac3d3809285ce58f2f26dc807b0655faee00ea9949b SHA512 6ca7bd40e4c5486d6eec2b90dc01ac4498cc02ccbf30ba27948e31254bbb8db6ca4fff3feb8a26d9f4047ab264d0e7aa4e11aa7302c38151f95d667bebce2b77 WHIRLPOOL 9c64e7987ec58729f6c967895264d87c4373b1fd2b7a3d5bd9062ac507fdd0b14a08da487a8a311e4ad87f034384d9f422b79397665a8f346b1adecab58932df -EBUILD ipe-7.1.2.ebuild 2370 SHA256 931d2fac037c93018dc9b0a23e97d6966dc3ae727095f638d1dd55f243cd31d3 SHA512 147b385e0c1f260761a897490780e68399d0642b050594d388212a70a2cdc3ba050de32752abe153db01197a10132d959337029a85c441b92e95b48f262b9bc9 WHIRLPOOL c3290c78d4881d989e7988592646e55e931c8db21fe9dfdc541ee62e2068ad28f3535eb4b37e166b1ee2780c2e34395543dd6ce2ad3ba34c3a969e5b1ab6bb84 -EBUILD ipe-7.1.3.ebuild 2364 SHA256 759737bafbfa81574cc9701b9be744bab6e8210c4439db476235dcc8291ce869 SHA512 2f98786bf40892a69e46761a38975ff012bef772662c80e69ebf07a723939b2a22e8290000c4671ced203d718ad03cba89981f13808860b6bd82043fe2590357 WHIRLPOOL 72e19805720c4093dadfbf31de791fa9f978acfeaa3fbb19e6c7d1984426c9a266f78518c025b3127b68445943802ef46f91c5e02b307fa6d7aee417c9d5568c +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 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 new file mode 100644 index 0000000..1555f77 --- /dev/null +++ b/media-gfx/ipe/files/0001-config.mak-use-correct-lua-package-name.patch @@ -0,0 +1,22 @@ +From 85012b8f0b3b15668b377ebdd682ece39b0b9e6a Mon Sep 17 00:00:00 2001 +From: Stefan Huber +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 new file mode 100644 index 0000000..3f1aeb5 --- /dev/null +++ b/media-gfx/ipe/files/0002-config.mak-Add-ldl-flag.patch @@ -0,0 +1,22 @@ +From 9ef64ec2238e127861ce8ad8dcb2a6436c1cfd4f Mon Sep 17 00:00:00 2001 +From: Stefan Huber +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.2.ebuild b/media-gfx/ipe/ipe-7.1.2.ebuild index 9e39b24..88fd1ab 100644 --- a/media-gfx/ipe/ipe-7.1.2.ebuild +++ b/media-gfx/ipe/ipe-7.1.2.ebuild @@ -41,13 +41,6 @@ search_urw_fonts() { return 1 } -src_prepare() { - if use highprec; then - einfo "Adding patch for higher output precision" - epatch "${FILESDIR}"/${PN}-outputprecision.patch - fi -} - pkg_setup() { if search_urw_fonts; then einfo "URW fonts found in ${URWFONTDIR}" @@ -65,6 +58,10 @@ src_prepare() { config.mak || die sed -i -e 's/install -s/install/' common.mak || die + if use highprec; then + einfo "Adding patch for higher output precision" + epatch "${FILESDIR}"/${PN}-outputprecision.patch + fi } src_compile() { diff --git a/media-gfx/ipe/ipe-7.1.3.ebuild b/media-gfx/ipe/ipe-7.1.3.ebuild index b5c33ae..4c3a575 100644 --- a/media-gfx/ipe/ipe-7.1.3.ebuild +++ b/media-gfx/ipe/ipe-7.1.3.ebuild @@ -41,13 +41,6 @@ search_urw_fonts() { return 1 } -src_prepare() { - if use highprec; then - einfo "Adding patch for higher output precision" - epatch "${FILESDIR}"/${PN}-outputprecision.patch - fi -} - pkg_setup() { if search_urw_fonts; then einfo "URW fonts found in ${URWFONTDIR}" @@ -65,6 +58,10 @@ src_prepare() { config.mak || die sed -i -e 's/install -s/install/' common.mak || die + if use highprec; then + einfo "Adding patch for higher output precision" + epatch "${FILESDIR}"/${PN}-outputprecision.patch + fi } src_compile() { diff --git a/media-gfx/ipe/ipe-7.1.4.ebuild b/media-gfx/ipe/ipe-7.1.4.ebuild new file mode 100644 index 0000000..d97da85 --- /dev/null +++ b/media-gfx/ipe/ipe-7.1.4.ebuild @@ -0,0 +1,97 @@ +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=4 +inherit eutils toolchain-funcs qt4-r2 + +DESCRIPTION="Drawing editor for creating figures in PDF or PS formats" +HOMEPAGE="http://ipe7.sourceforge.net/" +SRC_URI="mirror://sourceforge/ipe7/${PN}/7.1.0/${P}-src.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="highprec" + +RDEPEND="app-text/texlive-core + >=dev-lang/lua-5.2 + media-libs/freetype:2 + x11-libs/cairo + dev-qt/qtcore:4 + dev-qt/qtgui:4" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +S="${WORKDIR}/${P}/src" +COMMONDIR=/usr/share/ipe/common + +search_urw_fonts() { + # colon-separated list of paths + local texmfdist="$(kpsewhich -var-value=TEXMFDIST)" + # according to TeX directory structure + local urwdir=fonts/type1/urw + # add colon as field separator + local IFS="${IFS}:" dir + for dir in ${texmfdist}; do + if [[ -d ${dir}/${urwdir} ]]; then + URWFONTDIR="${dir}/${urwdir}" + return 0 + fi + done + return 1 +} + +src_prepare() { + sed -i \ + -e 's/fpic/fPIC/' \ + -e 's/moc-qt4/moc/' \ + -e "s:\$(IPEPREFIX)/lib:\$(IPEPREFIX)/$(get_libdir):g" \ + config.mak || die + sed -i -e 's/install -s/install/' common.mak || die + + if use highprec; then + 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() { + if search_urw_fonts; then + einfo "URW fonts found in ${URWFONTDIR}" + else + ewarn "Could not find directory containing URW fonts" + ewarn "Ipe will not function properly without them." + fi +} + +src_compile() { + emake \ + CXX=$(tc-getCXX) \ + IPEPREFIX="${EPREFIX}/usr" \ + IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html" +} + +src_install() { + emake install \ + IPEPREFIX="${EPREFIX}/usr" \ + IPEDOCDIR="${EPREFIX}/usr/share/doc/${PF}/html" \ + INSTALL_ROOT="${ED}" + dodoc ../{news,readme}.txt + doicon ipe/icons/ipe.png + make_desktop_entry ipe Ipe ipe + # Link style sheets + if [ -d $COMMONDIR/styles ]; then + einfo "Linking common style sheets from $COMMONDIR" + for f in $COMMONDIR/styles/*; do + einfo " Linking ${f##*/}" + dosym $f usr/share/ipe/${PV}/styles/${f##*/} + done + + elog "Style sheets from $COMMONDIR/styles have been symlinked to" + elog "the style sheet directory of ${P}. If you add additional" + elog "style sheets later to $COMMONDIR/styles you may symlink" + elog "them by hand to '/usr/share/ipe/${PV}/styles/'." + fi +} -- 2.39.5