commit:     d0b5cca4baed1671d32c58481ba5de9015464757
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun May  7 09:02:09 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun May  7 09:04:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0b5cca4

media-sound/milkytracker: Version bump to 1.0.0

* EAPI 6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=599678
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-sound/milkytracker/Manifest                  |  1 +
 .../files/milkytracker-1.0.0-docdir.patch          | 71 ++++++++++++++++++++++
 media-sound/milkytracker/milkytracker-1.0.0.ebuild | 43 +++++++++++++
 3 files changed, 115 insertions(+)

diff --git a/media-sound/milkytracker/Manifest 
b/media-sound/milkytracker/Manifest
index 95f5a45c441..3b3a5da9eb6 100644
--- a/media-sound/milkytracker/Manifest
+++ b/media-sound/milkytracker/Manifest
@@ -1 +1,2 @@
 DIST milkytracker-0.90.86.tar.bz2 2202256 SHA256 
eb93000ed4855e198dfb02df54f3e3536dc891084ca47cdd5393121137ba3bed SHA512 
8142f0b438e478571db25960d1b31f1d8c7e68feea96bdd238d1b1c1744105d929f18c990a301af6bebfc2d517bad687232410477ced6d8c4bfec8053cfcad8e
 WHIRLPOOL 
3c388cde08c81a73e80ee834e7b1cef90dc32d3e7885de47259cb3b219bd7207f816c240b87fede59335ec5a2561a00e23ab3aa05b5e34f4bbe3ae7866ff5045
+DIST milkytracker-1.0.0.tar.gz 3749140 SHA256 
7fa982561c297aae7ed8223d2535c1f0a72057da01d002e8665b9223206932dc SHA512 
a96e8b015a4e3b38f3ad44756fc79cb062f91ab193b7428a6abde042aa4e51c8fb45757cba0504283410d714eefffdee57d3e3bf42e7991d1f9581ab8d2ab1c4
 WHIRLPOOL 
859f8604b8b61cfd8467dfe5d72d68800938d1054f69c91abcb129bb8082c549d9791a94f10429aa1c7a7b3e0db097f1f5828213526af6af640ea44b9ead0a34

diff --git a/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch 
b/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch
new file mode 100644
index 00000000000..aeae02af2b0
--- /dev/null
+++ b/media-sound/milkytracker/files/milkytracker-1.0.0-docdir.patch
@@ -0,0 +1,71 @@
+From 56bf091a0e8c5242e160d37f2974f3e1e2525821 Mon Sep 17 00:00:00 2001
+From: David Seifert <s...@gentoo.org>
+Date: Sun, 7 May 2017 10:49:21 +0200
+Subject: [PATCH] Use GNUInstallDirs in order to change installation paths
+
+* This allows distro-specific modification of directories
+  to adjust to different FHS layouts.
+---
+ CMakeLists.txt                 | 5 ++++-
+ docs/CMakeLists.txt            | 2 +-
+ resources/music/CMakeLists.txt | 2 +-
+ src/tracker/CMakeLists.txt     | 2 +-
+ 4 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 996e2f0..bac54f3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,9 +19,12 @@
+ #  along with MilkyTracker.  If not, see <http://www.gnu.org/licenses/>.
+ #
+ 
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.8.5)
+ project(MilkyTracker)
+ 
++# Adhere to GNU filesystem layout conventions
++include(GNUInstallDirs)
++
+ # Force SDL if requested
+ option(FORCESDL "Force SDL instead of native" OFF)
+ if(FORCESDL)
+diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+index 0aacc60..aca4a61 100644
+--- a/docs/CMakeLists.txt
++++ b/docs/CMakeLists.txt
+@@ -35,7 +35,7 @@ elseif(WIN32)
+     set(INSTALL_DEST .)
+ else()
+     list(APPEND DOCUMENTS readme_unix)
+-    set(INSTALL_DEST share/doc/${PROJECT_NAME_LOWER})
++    set(INSTALL_DEST ${CMAKE_INSTALL_DOCDIR})
+ endif()
+ 
+ install(FILES ${DOCUMENTS} DESTINATION ${INSTALL_DEST})
+diff --git a/resources/music/CMakeLists.txt b/resources/music/CMakeLists.txt
+index f918b6e..f29fcd6 100644
+--- a/resources/music/CMakeLists.txt
++++ b/resources/music/CMakeLists.txt
+@@ -24,7 +24,7 @@ file(GLOB SONGS "*.xm")
+ if(APPLE OR WIN32)
+     set(INSTALL_DEST "Example Songs")
+ else()
+-    set(INSTALL_DEST share/${PROJECT_NAME_LOWER}/songs)
++    set(INSTALL_DEST ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME_LOWER}/songs)
+ endif()
+ 
+ install(FILES ${SONGS} DESTINATION ${INSTALL_DEST})
+diff --git a/src/tracker/CMakeLists.txt b/src/tracker/CMakeLists.txt
+index 1e4062e..b7a96a7 100644
+--- a/src/tracker/CMakeLists.txt
++++ b/src/tracker/CMakeLists.txt
+@@ -399,7 +399,7 @@ target_link_libraries(
+ if(APPLE OR WIN32)
+     set(INSTALL_DEST .)
+ else()
+-    set(INSTALL_DEST bin)
++    set(INSTALL_DEST ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+ install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_DEST})

diff --git a/media-sound/milkytracker/milkytracker-1.0.0.ebuild 
b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
new file mode 100644
index 00000000000..c59ff0579dd
--- /dev/null
+++ b/media-sound/milkytracker/milkytracker-1.0.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils eutils vcs-snapshot
+
+DESCRIPTION="FastTracker 2 inspired music tracker"
+HOMEPAGE="http://milkytracker.titandemo.org/";
+SRC_URI="https://github.com/milkytracker/MilkyTracker/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="|| ( GPL-3 MPL-1.1 ) AIFFWriter.m BSD GPL-3 GPL-3+ LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack"
+
+RDEPEND="
+       dev-libs/zziplib
+       media-libs/libsdl2[X]
+       sys-libs/zlib
+       alsa? ( media-libs/alsa-lib )
+       jack? ( media-sound/jack-audio-connection-kit )"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.0-docdir.patch )
+HTML_DOCS=( docs/{ChangeLog,FAQ,MilkyTracker}.html )
+
+src_configure() {
+       local mycmakeargs=(
+               -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+               $(cmake-utils_use_find_package alsa ALSA)
+               $(cmake-utils_use_find_package jack JACK)
+       )
+       cmake-utils_src_configure
+}
+
+src_install() {
+       cmake-utils_src_install
+
+       newicon resources/pictures/carton.png ${PN}.png
+       make_desktop_entry ${PN} MilkyTracker ${PN} \
+               "AudioVideo;Audio;Sequencer"
+}

Reply via email to