Gentoo Archives: gentoo-commits

From: Johannes Huber <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/lasi/files/, media-libs/lasi/
Date: Wed, 29 Mar 2017 18:18:26
Message-Id: 1490811487.fce827e40361fa114e728e848799523b5c1e3ae9.johu@gentoo
1 commit: fce827e40361fa114e728e848799523b5c1e3ae9
2 Author: Johannes Huber <johu <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 29 18:18:07 2017 +0000
4 Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 29 18:18:07 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce827e4
7
8 media-libs/lasi: Remove 1.1.1
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 media-libs/lasi/Manifest | 1 -
13 media-libs/lasi/files/lasi-1.1.1-freetype251.patch | 63 ----------------------
14 media-libs/lasi/lasi-1.1.1.ebuild | 56 -------------------
15 3 files changed, 120 deletions(-)
16
17 diff --git a/media-libs/lasi/Manifest b/media-libs/lasi/Manifest
18 index ce5a854f3b4..87fe12e0877 100644
19 --- a/media-libs/lasi/Manifest
20 +++ b/media-libs/lasi/Manifest
21 @@ -1,2 +1 @@
22 -DIST libLASi-1.1.1.tar.gz 223589 SHA256 175964cb4fec347737899f9fa0b8d7441864ae20f439e013432d9b9072ab3723 SHA512 b6a0aa180baebab5f7817186b443d828169b7493e2436190b9f98ef6f6769f546e05772a02dc705f68adf899f7e51878e580818ea0ce5258943de2273672dc77 WHIRLPOOL e49c63b7d2a6f611ca78b6f6fbef4dc1286bc42b217a870a0d79a9089bc7ad5ba8d902f78aa2ed8e33a9b02a3a400a18a60d459b5ef6fb758cbd88ecb199cefb
23 DIST libLASi-1.1.2.tar.gz 260948 SHA256 448c6e52263a1e88ac2a157f775c393aa8b6cd3f17d81fc51e718f18fdff5121 SHA512 5a03890b822946805025157497ce5f29fdfbcf5f2941bcd07841d9865cac9653697dbbba426f8527528affd4157e49d0f31a6dad79abdd52222dfcccf135ac91 WHIRLPOOL 1e293bd82e287c10b27476a84778924ab8007e9cf673bc2d9c2f4f1461abccf5cd36a914000fabe1b81cb433c58b70733716bc9010f6b7771e11f6ae582b778a
24
25 diff --git a/media-libs/lasi/files/lasi-1.1.1-freetype251.patch b/media-libs/lasi/files/lasi-1.1.1-freetype251.patch
26 deleted file mode 100644
27 index 515b159208f..00000000000
28 --- a/media-libs/lasi/files/lasi-1.1.1-freetype251.patch
29 +++ /dev/null
30 @@ -1,63 +0,0 @@
31 -Add compatibility for >=freetype-2.5.1
32 -
33 -Signed-off-by: Lars Wendler <polynomial-c@g.o>
34 -
35 ---- libLASi-1.1.1/include/LASi.h
36 -+++ libLASi-1.1.1/include/LASi.h
37 -@@ -11,7 +11,8 @@
38 - #include <sstream>
39 - #include <map>
40 - #include <pango/pango.h>
41 --#include <freetype/ftglyph.h>
42 -+#include <ft2build.h>
43 -+#include FT_GLYPH_H
44 -
45 - class FreetypeGlyphMgr;
46 - class ContextMgr;
47 ---- libLASi-1.1.1/src/drawGlyph.cpp
48 -+++ libLASi-1.1.1/src/drawGlyph.cpp
49 -@@ -6,7 +6,8 @@
50 - */
51 -
52 - #include <ostream>
53 --#include <freetype/ftoutln.h>
54 -+#include <ft2build.h>
55 -+#include FT_OUTLINE_H
56 - #include <algorithm>
57 - #include <LASi.h>
58 - #include <config.h>
59 ---- libLASi-1.1.1/src/glyphMgr.cpp
60 -+++ libLASi-1.1.1/src/glyphMgr.cpp
61 -@@ -10,8 +10,7 @@
62 -
63 - #include <ft2build.h>
64 - #include FT_FREETYPE_H
65 --
66 --#include <freetype/ftglyph.h>
67 -+#include FT_GLYPH_H
68 -
69 - #include <cassert>
70 - #include "util.h"
71 ---- libLASi-1.1.1/src/glyphMgr.h
72 -+++ libLASi-1.1.1/src/glyphMgr.h
73 -@@ -15,8 +15,8 @@
74 -
75 - #include <ft2build.h>
76 - #include FT_FREETYPE_H
77 -+#include FT_GLYPH_H
78 -
79 --#include <freetype/ftglyph.h>
80 -
81 - /** Manage FT_Glyph by insuring that FT_Glyph is handled correctly.
82 - */
83 ---- libLASi-1.1.1/src/util.h
84 -+++ libLASi-1.1.1/src/util.h
85 -@@ -18,7 +18,7 @@
86 -
87 - #include <ft2build.h>
88 - #include FT_FREETYPE_H
89 --#include <freetype/ftglyph.h>
90 -+#include FT_GLYPH_H
91 -
92 - std::ostream& operator<<(std::ostream&, const FT_Library);
93 - std::ostream& operator<<(std::ostream&, const FT_Face);
94
95 diff --git a/media-libs/lasi/lasi-1.1.1.ebuild b/media-libs/lasi/lasi-1.1.1.ebuild
96 deleted file mode 100644
97 index 2ec54a39393..00000000000
98 --- a/media-libs/lasi/lasi-1.1.1.ebuild
99 +++ /dev/null
100 @@ -1,56 +0,0 @@
101 -# Copyright 1999-2014 Gentoo Foundation
102 -# Distributed under the terms of the GNU General Public License v2
103 -
104 -EAPI=4
105 -
106 -inherit cmake-utils eutils multilib
107 -
108 -MY_PN=libLASi
109 -MY_P=${MY_PN}-${PV}
110 -
111 -DESCRIPTION="C++ library for postscript stream output"
112 -HOMEPAGE="http://www.unifont.org/lasi/"
113 -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
114 -
115 -LICENSE="GPL-2"
116 -SLOT="0"
117 -KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
118 -IUSE="doc examples"
119 -
120 -RDEPEND="
121 - media-libs/freetype:2
122 - x11-libs/pango"
123 -DEPEND="${RDEPEND}
124 - virtual/pkgconfig
125 - doc? ( app-doc/doxygen )"
126 -
127 -S=${WORKDIR}/${MY_P}
128 -
129 -PATCHES=(
130 - "${FILESDIR}"/${PN}-1.1.0-cmake.patch
131 - "${FILESDIR}"/${PN}-1.1.0-pkgconfig.patch
132 - "${FILESDIR}"/${PN}-1.1.1-freetype251.patch
133 - )
134 -
135 -src_prepare() {
136 - cmake-utils_src_prepare
137 - sed -i \
138 - -e "s:\/lib$:\/$(get_libdir):" \
139 - -e "s/libLASi-\${VERSION}/${PF}/" \
140 - cmake/modules/instdirs.cmake \
141 - || die "Failed to fix cmake module"
142 - sed -i \
143 - -e "s:\${DATA_DIR}/examples:/usr/share/doc/${PF}/examples:" \
144 - examples/CMakeLists.txt || die
145 -
146 - use examples || sed -i -e '/add_subdirectory(examples)/d' CMakeLists.txt
147 -}
148 -
149 -src_configure() {
150 - CMAKE_BUILD_TYPE=None
151 - local mycmakeargs=(
152 - -DCMAKE_INSTALL_LIBDIR="${EPREFIX}"/usr/$(get_libdir)
153 - )
154 - use doc || mycmakeargs+=( -DDOXYGEN_EXECUTABLE= )
155 - cmake-utils_src_configure
156 -}