Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/milkytracker/files/, media-sound/milkytracker/
Date: Sun, 07 May 2017 09:04:34
Message-Id: 1494147853.d0b5cca4baed1671d32c58481ba5de9015464757.soap@gentoo
1 commit: d0b5cca4baed1671d32c58481ba5de9015464757
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 7 09:02:09 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun May 7 09:04:13 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0b5cca4
7
8 media-sound/milkytracker: Version bump to 1.0.0
9
10 * EAPI 6
11 Bug: https://bugs.gentoo.org/show_bug.cgi?id=599678
12 Package-Manager: Portage-2.3.5, Repoman-2.3.2
13
14 media-sound/milkytracker/Manifest | 1 +
15 .../files/milkytracker-1.0.0-docdir.patch | 71 ++++++++++++++++++++++
16 media-sound/milkytracker/milkytracker-1.0.0.ebuild | 43 +++++++++++++
17 3 files changed, 115 insertions(+)
18
19 diff --git a/media-sound/milkytracker/Manifest b/media-sound/milkytracker/Manifest
20 index 95f5a45c441..3b3a5da9eb6 100644
21 --- a/media-sound/milkytracker/Manifest
22 +++ b/media-sound/milkytracker/Manifest
23 @@ -1 +1,2 @@
24 DIST milkytracker-0.90.86.tar.bz2 2202256 SHA256 eb93000ed4855e198dfb02df54f3e3536dc891084ca47cdd5393121137ba3bed SHA512 8142f0b438e478571db25960d1b31f1d8c7e68feea96bdd238d1b1c1744105d929f18c990a301af6bebfc2d517bad687232410477ced6d8c4bfec8053cfcad8e WHIRLPOOL 3c388cde08c81a73e80ee834e7b1cef90dc32d3e7885de47259cb3b219bd7207f816c240b87fede59335ec5a2561a00e23ab3aa05b5e34f4bbe3ae7866ff5045
25 +DIST milkytracker-1.0.0.tar.gz 3749140 SHA256 7fa982561c297aae7ed8223d2535c1f0a72057da01d002e8665b9223206932dc SHA512 a96e8b015a4e3b38f3ad44756fc79cb062f91ab193b7428a6abde042aa4e51c8fb45757cba0504283410d714eefffdee57d3e3bf42e7991d1f9581ab8d2ab1c4 WHIRLPOOL 859f8604b8b61cfd8467dfe5d72d68800938d1054f69c91abcb129bb8082c549d9791a94f10429aa1c7a7b3e0db097f1f5828213526af6af640ea44b9ead0a34
26
27 diff --git a/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch b/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch
28 new file mode 100644
29 index 00000000000..aeae02af2b0
30 --- /dev/null
31 +++ b/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch
32 @@ -0,0 +1,71 @@
33 +From 56bf091a0e8c5242e160d37f2974f3e1e2525821 Mon Sep 17 00:00:00 2001
34 +From: David Seifert <soap@g.o>
35 +Date: Sun, 7 May 2017 10:49:21 +0200
36 +Subject: [PATCH] Use GNUInstallDirs in order to change installation paths
37 +
38 +* This allows distro-specific modification of directories
39 + to adjust to different FHS layouts.
40 +---
41 + CMakeLists.txt | 5 ++++-
42 + docs/CMakeLists.txt | 2 +-
43 + resources/music/CMakeLists.txt | 2 +-
44 + src/tracker/CMakeLists.txt | 2 +-
45 + 4 files changed, 7 insertions(+), 4 deletions(-)
46 +
47 +diff --git a/CMakeLists.txt b/CMakeLists.txt
48 +index 996e2f0..bac54f3 100644
49 +--- a/CMakeLists.txt
50 ++++ b/CMakeLists.txt
51 +@@ -19,9 +19,12 @@
52 + # along with MilkyTracker. If not, see <http://www.gnu.org/licenses/>.
53 + #
54 +
55 +-cmake_minimum_required(VERSION 2.6)
56 ++cmake_minimum_required(VERSION 2.8.5)
57 + project(MilkyTracker)
58 +
59 ++# Adhere to GNU filesystem layout conventions
60 ++include(GNUInstallDirs)
61 ++
62 + # Force SDL if requested
63 + option(FORCESDL "Force SDL instead of native" OFF)
64 + if(FORCESDL)
65 +diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
66 +index 0aacc60..aca4a61 100644
67 +--- a/docs/CMakeLists.txt
68 ++++ b/docs/CMakeLists.txt
69 +@@ -35,7 +35,7 @@ elseif(WIN32)
70 + set(INSTALL_DEST .)
71 + else()
72 + list(APPEND DOCUMENTS readme_unix)
73 +- set(INSTALL_DEST share/doc/${PROJECT_NAME_LOWER})
74 ++ set(INSTALL_DEST ${CMAKE_INSTALL_DOCDIR})
75 + endif()
76 +
77 + install(FILES ${DOCUMENTS} DESTINATION ${INSTALL_DEST})
78 +diff --git a/resources/music/CMakeLists.txt b/resources/music/CMakeLists.txt
79 +index f918b6e..f29fcd6 100644
80 +--- a/resources/music/CMakeLists.txt
81 ++++ b/resources/music/CMakeLists.txt
82 +@@ -24,7 +24,7 @@ file(GLOB SONGS "*.xm")
83 + if(APPLE OR WIN32)
84 + set(INSTALL_DEST "Example Songs")
85 + else()
86 +- set(INSTALL_DEST share/${PROJECT_NAME_LOWER}/songs)
87 ++ set(INSTALL_DEST ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME_LOWER}/songs)
88 + endif()
89 +
90 + install(FILES ${SONGS} DESTINATION ${INSTALL_DEST})
91 +diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt
92 +index 1e4062e..b7a96a7 100644
93 +--- a/src/tracker/CMakeLists.txt
94 ++++ b/src/tracker/CMakeLists.txt
95 +@@ -399,7 +399,7 @@ target_link_libraries(
96 + if(APPLE OR WIN32)
97 + set(INSTALL_DEST .)
98 + else()
99 +- set(INSTALL_DEST bin)
100 ++ set(INSTALL_DEST ${CMAKE_INSTALL_BINDIR})
101 + endif()
102 +
103 + install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_DEST})
104
105 diff --git a/media-sound/milkytracker/milkytracker-1.0.0.ebuild b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
106 new file mode 100644
107 index 00000000000..c59ff0579dd
108 --- /dev/null
109 +++ b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
110 @@ -0,0 +1,43 @@
111 +# Copyright 1999-2017 Gentoo Foundation
112 +# Distributed under the terms of the GNU General Public License v2
113 +
114 +EAPI=6
115 +
116 +inherit cmake-utils eutils vcs-snapshot
117 +
118 +DESCRIPTION="FastTracker 2 inspired music tracker"
119 +HOMEPAGE="http://milkytracker.titandemo.org/"
120 +SRC_URI="https://github.com/milkytracker/MilkyTracker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
121 +
122 +LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT"
123 +SLOT="0"
124 +KEYWORDS="~amd64 ~x86"
125 +IUSE="alsa jack"
126 +
127 +RDEPEND="
128 + dev-libs/zziplib
129 + media-libs/libsdl2[X]
130 + sys-libs/zlib
131 + alsa? ( media-libs/alsa-lib )
132 + jack? ( media-sound/jack-audio-connection-kit )"
133 +DEPEND="${RDEPEND}"
134 +
135 +PATCHES=( "${FILESDIR}"/${PN}-1.0.0-docdir.patch )
136 +HTML_DOCS=( docs/{ChangeLog,FAQ,MilkyTracker}.html )
137 +
138 +src_configure() {
139 + local mycmakeargs=(
140 + -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
141 + $(cmake-utils_use_find_package alsa ALSA)
142 + $(cmake-utils_use_find_package jack JACK)
143 + )
144 + cmake-utils_src_configure
145 +}
146 +
147 +src_install() {
148 + cmake-utils_src_install
149 +
150 + newicon resources/pictures/carton.png ${PN}.png
151 + make_desktop_entry ${PN} MilkyTracker ${PN} \
152 + "AudioVideo;Audio;Sequencer"
153 +}