aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2018-03-27 18:30:10 +0200
committerMarkus Meier <maekke@gentoo.org>2018-03-27 18:30:10 +0200
commit44df119ae335f18c7929286a122d6fde6354572c (patch)
tree165e810d9053f4bf6dbb20dd4df56c7480f12627
parentmedia-libs/libpano13: version bump (diff)
downloadmaekke-44df119ae335f18c7929286a122d6fde6354572c.tar.gz
maekke-44df119ae335f18c7929286a122d6fde6354572c.tar.bz2
maekke-44df119ae335f18c7929286a122d6fde6354572c.zip
media-libs/libpano13: switch to CMake
Package-Manager: Portage-2.3.24, Repoman-2.3.6 Manifest-Sign-Key: 0x363AF1F7765A9D02
-rw-r--r--media-libs/libpano13/Manifest28
-rw-r--r--media-libs/libpano13/libpano13-2.9.20_rc1.ebuild26
2 files changed, 27 insertions, 27 deletions
diff --git a/media-libs/libpano13/Manifest b/media-libs/libpano13/Manifest
index 8c50575..5fce567 100644
--- a/media-libs/libpano13/Manifest
+++ b/media-libs/libpano13/Manifest
@@ -6,24 +6,24 @@ DIST libpano13-2.9.19.tar.gz 3527845 BLAKE2B 59d6b46b75de60a3230eb46e42bbb0f7b88
DIST libpano13-2.9.20_rc1.tar.gz 3563251 BLAKE2B 9c964e89c97e0608c4a7ddfcf40f02185dec6fb27406913328af783ca04d723f5372b6677bef34dca5462c960d040f001dc10cc9984f31d0f7969bbaaad4c1c5 SHA512 dd2a1c532051220846c094f003300798e596c173adf5a80263c7c5d2bc7ce329d70c206c66630dcdeeca3bb5d97573c6fa060bb5062d4a2f7c8a796fed50a464
EBUILD libpano13-2.9.18.ebuild 1059 BLAKE2B d31a2e9fb6eb0d63f9834f087ee9878ca2106ea0cc3f62ea589d192098372567fd538ed24b95bdc920b31ef7e63dc59987a5765523c360412a4074ab6a8e80e6 SHA512 3d63f29f5f30234aa575e8bcaf3487add6c7d59926c225f308f60864ac6abb95685bd3dc69a0aaf5bcbff81e31e237a29d6f3674def60208a987508968d0d330
EBUILD libpano13-2.9.19.ebuild 895 BLAKE2B abaa6c5d502cb6509d7f476fe951fb253212859eb2f82ca453fe9e4e43df4367ca833ca9eef76c53df3e580a6a4624b2db7deafd0edf3935cf6b105d2503d634 SHA512 16958b8e2619185bdf4f446ec462143bcbf449448fc458b2e4eb7dacb28004adbefbfc1ba34b32416189c7766dc84447b30e8b0ee40481ba25db68cda64c77a8
-EBUILD libpano13-2.9.20_rc1.ebuild 897 BLAKE2B 52b0872a5c7b0a59c6f8636acddbc93df854f7300c38391ed6c8b650a226427d7bee518e900cd5227a7bff537680407dbc86517045002c408547d92766e1062a SHA512 7892a5f10b84c6297f214151af191bdbfb532049e51c80c10f2773db32c1490f0c8d2b93e7eb9e6d19ce5b4805c36f3db80ec2c4f56dc7b85de21323c0df748d
+EBUILD libpano13-2.9.20_rc1.ebuild 903 BLAKE2B 6bd45174fd8773b1fd1948464da4b1dd570e76dc7508120212461cb438d0ac5958be63ef1a2b13c0168a96687e3590027c10d366f6735880b9ffab2482aac999 SHA512 b57e1bbcf19c1f6d6561dc543edf5fa441951f0933136b889956b1d7c4d38a3c0fd44ee2a8bf60ec56d1c5ac0f05e122db28b8c4693c55ccd0fe7a645b7d10a9
MISC metadata.xml 338 BLAKE2B 1ec5e22829216634d2abd6a1053661d8c226a7b852aa5725146d4ac2300c2ca308b2771a71c85cfce761a3c74eb70d10ee8bfc7fee9316d237bb80f298ca05ba SHA512 0797dff4c92d3f6a18f7d8244d39079e718e381ab04620c6f3b165ef1ae1e0357c9d56216e50290bf0f91d2803720a3e67ae7224c9f6f7097dbed2e33dd47929
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQKTBAEBCAB9FiEEII6LnI7JmhU7S7c3e+duwlV7RDwFAlq3i+NfFIAAAAAALgAo
+iQKTBAEBCAB9FiEEII6LnI7JmhU7S7c3e+duwlV7RDwFAlq6cYxfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDIw
OEU4QjlDOEVDOTlBMTUzQjRCQjczNzdCRTc2RUMyNTU3QjQ0M0MACgkQe+duwlV7
-RDzVgxAApkxgTddgDsvxKTDfHClxrdi1x/1C4Hx8o7e7zXecmIcT8ZkhC3YkQeBK
-rBW5BOtvl4//OlHIrCgyzOSoCQ0GBm9cL90xfw+87Fs8Zx8QSk1VpUJkGzu8lU01
-buojMBrqtgbbxGM0jCqKz/yx8IrvOORySV3RGFQ5Iz4bFg4ZdIqTqeYj7FEHka2s
-EXA9G6ipKIKRP/bA1FuGxcevmgPABlcLScGsEXnSlK+9itgxFTogFAjKfOFsFWu6
-0WksMZSZ+T5U+q5/tH8YiMrYZgR4zO1mCB89vpsP0ZIhrMRR2ahUd28+guIQAolg
-y9me8nbbyHJGwkKRhTBYynTY8Zkf3wH4Zv8lO8NOlxSK5DAM4v3k011u2k/m2XIb
-C4PaPKt3zTmTHDUgfXuiF4yP2JB7hkraUYcJRobuzNOc7FFTS1R/HgZF8PcnLAdB
-alqq1mI8ZQJDXR4q5+wMzimjk2tQaWuRS3lp20DoyJHAKcfsZgkEHHxEPgs+KoaW
-n7YCM9DpT15H1TCL2wBT5lK9JLjXPbBKl4RPnV8Xmhcxf4eAlUMoUNIeT57FTYyr
-GsjiToVTe5JW8sF0o+l6qRhkFC8pKm4I8aBK6gtTU+5f8det/dOhmjXJc7jEX3ki
-CNhslvX2Tg9y78JHFuo2Lh4+QVFyyVzwJW9aD9il1k06IiqJ7f8=
-=8x5G
+RDxV5Q/+MqSlEKsCVYDn3WNJQntFCdXUyCh3rQulaerLnfm10NLTHaYzZMopnf3j
+6CBBNeykd0/B2AJBYehm957oFvS07q4/XGyMwBQFuqu/pONGS/AaKyvTB6SSIWO6
+IGQ116AF+lNgetV2tLdgEE4LESOTr+qQfAGmVPkQn/GiNrvE1Sc/9luPqrn3RHbM
+g2SmOw4ghOyprTeHRrI82li5mLBEp40l3LzFNoUwE5nObQqaRgm812V/FeoXebQm
+pQ4/vUp1cnKJbVMez+jhtitoXKVNB3TuYOok5QMjLgnsan1OYZXlfVswUAG1sBRb
+PzCggEb+Lq79lvUFd4kciDfYCex1OH1s1YqxZgSZ/nxGNvWfJF4JMW6bKtVuqoOD
+bzyMi3aEfRg2ulV9hbyNf7LJkFJ/1W3wVSwV70elieKApU55+16eRIz0KfBb778I
+09UBra82zyEGvIjQHOnr51hcfHZgHF5bKdX+oLYGudp2wz9IUm5F6Ihekv5xkW5S
+wygwGw1Ya5qZg30XDSUJ9yMRtW49mRZ0MGexbUoocGO6XdEaCbz6BPJfMOvM7nGi
+0Kl3U9cSuBl5oo/fTZ7fWMQfeVjrz1lbfk+PtUaZpYFN+z1qwPuHVBNkSRVZ/Me/
+RdZqquVNcr+byPZyuC34qg/Bz0Ya2N02AQF7YDDy7JKo6bzfHDc=
+=wvLJ
-----END PGP SIGNATURE-----
diff --git a/media-libs/libpano13/libpano13-2.9.20_rc1.ebuild b/media-libs/libpano13/libpano13-2.9.20_rc1.ebuild
index 037e3c1..e34dd29 100644
--- a/media-libs/libpano13/libpano13-2.9.20_rc1.ebuild
+++ b/media-libs/libpano13/libpano13-2.9.20_rc1.ebuild
@@ -3,7 +3,8 @@
EAPI="6"
-inherit versionator java-pkg-opt-2 eutils
+# inherit versionator java-pkg-opt-2 eutils
+inherit versionator cmake-utils
DESCRIPTION="Helmut Dersch's panorama toolbox library"
HOMEPAGE="http://panotools.sourceforge.net/"
@@ -12,7 +13,8 @@ SRC_URI="mirror://sourceforge/panotools/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/3"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="java static-libs"
+#IUSE="java static-libs"
+IUSE="java"
DEPEND="media-libs/libpng:0=
media-libs/tiff:0
@@ -23,17 +25,15 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
-src_configure() {
- LIBS="-lm" econf \
- $(use_with java java ${JAVA_HOME}) \
- $(use_enable static-libs static)
+src_prepare() {
+ sed -i -e "s:share/pano13/doc:share/doc/${PF}:g" \
+ CMakeLists.txt || die
+ cmake-utils_src_prepare
}
-src_install() {
- emake DESTDIR="${D}" install
- dodoc README README.linux AUTHORS NEWS doc/*.txt
-
- if ! use static-libs ; then
- prune_libtool_files
- fi
+src_configure() {
+ local mycmakeargs=(
+ $(usex java SUPPORT_JAVA_PROGRAMS)
+ )
+ cmake-utils_src_configure
}