media-libs/libXcm: 0.5.4 version bump, EAPI 6, git-r3

Project moved to github.

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/3068

4 files changed, 87 insertions, 17 deletions

diff --git a/media-libs/libXcm/Manifest b/media-libs/libXcm/Manifest
index 93d3f4cfee6c..1226ff20bc3e 100644
--- a/media-libs/libXcm/Manifest
+++ b/media-libs/libXcm/Manifest
@@ -1,2 +1,3 @@
 DIST libXcm-0.5.2.tar.bz2 301813 SHA256 1ed2750e55dd3c8c9e1597de577bdc3a72d37e976979926d973ea9e3583afcd5 SHA512 4d67218206ba319cb768c055c44a0537468232c12fa463525993c578b5a5a8ee82fc55463ef5e34e85dda221facd2517372bc1920bd025e951337fa84c72f6ab WHIRLPOOL 72ebdb1883065d4c42ed4caee6ad018df7f43f03aab241af576e8e8b91d6a8b03b082da94179f35508b720ff4660ebd533dc5bfc243b8c86faa6766905444790
 DIST libXcm-0.5.3.tar.bz2 303829 SHA256 04bda6aa4e8b1ef61815ebfc7760277856a5fd3b347948e0d99cf0ec78b03050 SHA512 af5ccb3d6834ceb34b25a6ec0362a0d111e5fde91fe41f7ff8ea3000d2031573f477f1074eada1bc67a2fe920d7d63f272996b3ad3678a010e0d0092351ea5e4 WHIRLPOOL 259367e279c53bbc91c468046a7e5c8a646739f3499b91834082167af82fc134658f6826cf2ef94c775a1c36b7eec2b30386d0e23a8b70b33ab966aaf92f68c5
+DIST libXcm-0.5.4.tar.gz 397552 SHA256 7d97f168be4f87a5118417d7be764e35a1eb94eac5020003c005f3a97a521cc1 SHA512 96d279aff907bbbe4e38d099b79ebbc3b3beaf242be296d10a16e36e721669086ae0b5252f5abc629cc1fd65e595e2eec70bb890ea6ca4bbd08e8ce91cb05b53 WHIRLPOOL 9fce987267cede78af9c5d9b2a81464d35e2fd021be57f9cd9fa2f9e8011d3288c1d98e4d4e33daf2a449e7caa73ba8f6167337d4980cf1eda7e48bb8bbcd001
diff --git a/media-libs/libXcm/libXcm-0.5.4.ebuild b/media-libs/libXcm/libXcm-0.5.4.ebuild
new file mode 100644
index 000000000000..5d7c28e002d8
--- /dev/null
+++ b/media-libs/libXcm/libXcm-0.5.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} = *9999 ]]; then
+	GITECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/oyranos-cms/libxcm.git"
+fi
+inherit autotools multilib-minimal ${GITECLASS}
+unset GITECLASS
+
+DESCRIPTION="Reference implementation of the X Color Management specification"
+HOMEPAGE="http://www.oyranos.org/libxcm/"
+[[ ${PV} != *9999 ]] && \
+SRC_URI="https://github.com/oyranos-cms/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="static-libs X"
+
+RDEPEND="
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXmu[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
+
+[[ ${PV} != *9999 ]] && S="${WORKDIR}/${P,,}"
+
+src_prepare() {
+	default
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with X x11)
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libXcm/libXcm-9999.ebuild b/media-libs/libXcm/libXcm-9999.ebuild
index 4c70f928984b..3583f5a0ef53 100644
--- a/media-libs/libXcm/libXcm-9999.ebuild
+++ b/media-libs/libXcm/libXcm-9999.ebuild
@@ -1,31 +1,50 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit autotools-multilib git-2
+if [[ ${PV} = *9999 ]]; then
+	GITECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/oyranos-cms/libxcm.git"
+fi
+inherit autotools multilib-minimal ${GITECLASS}
+unset GITECLASS
 
-DESCRIPTION="reference implementation of the net-color spec"
+DESCRIPTION="Reference implementation of the X Color Management specification"
 HOMEPAGE="http://www.oyranos.org/libxcm/"
-EGIT_REPO_URI="git://www.oyranos.org/git/xcolor"
+[[ ${PV} != *9999 ]] && \
+SRC_URI="https://github.com/oyranos-cms/${PN,,}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="X static-libs"
+IUSE="static-libs X"
 
-RDEPEND="X? ( >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )"
+RDEPEND="
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		x11-libs/libXmu[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+	)
+"
 DEPEND="${RDEPEND}"
 
-src_configure() {
-	local myeconfargs=(
-		--disable-silent-rules
+[[ ${PV} != *9999 ]] && S="${WORKDIR}/${P,,}"
+
+src_prepare() {
+	default
+	eautoreconf
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		$(use_enable static-libs static) \
 		$(use_with X x11)
-		$(use_enable static-libs static)
-	)
-	autotools-multilib_src_configure
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/media-libs/libXcm/metadata.xml b/media-libs/libXcm/metadata.xml
index 06c252130081..c49bb4b3d599 100644
--- a/media-libs/libXcm/metadata.xml
+++ b/media-libs/libXcm/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Michael Weber</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="sourceforge">oyranos</remote-id>
+		<remote-id type="github">oyranos-cms/libXcm</remote-id>
 	</upstream>
 </pkgmetadata>