Merge remote-tracking branch 'github/master'

* github/master: Remove git user from github.com URIs Use the ${P} variable for filling in URL path. Fixes orphaned Java HDF5 source link in ebuild. neuro/sci: media-libs/avbin-bin build fixed -- moved source directory determination to pkg_setup neuro/sci: media-libs/avbin-bin build fixed -- package S (source directory) depends on architecture
gentoo · Jul 29, 2015 · 73b6874 · 73b6874
2 parents 7552c8e + 0e4c2d8
commit 73b6874
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 13 deletions.
diff --git a/dev-java/hdf-java/hdf-java-2.9.ebuild b/dev-java/hdf-java/hdf-java-2.9.ebuild
@@ -10,7 +10,7 @@ inherit autotools eutils fdo-mime java-pkg-2
 
 DESCRIPTION="Java interface to the HDF5 library"
 HOMEPAGE="http://www.hdfgroup.org/hdf-java-html/index.html"
-SRC_URI="http://www.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/hdf-java-2.9/src/${P}-src.tar"
+SRC_URI="https://www.hdfgroup.org/ftp/HDF5/releases/HDF-JAVA/${P}/src/${P}-src.tar"
 
 LICENSE="NCSA-HDF"
 SLOT="0"

diff --git a/dev-python/pylibconfig2/pylibconfig2-9999.ebuild b/dev-python/pylibconfig2/pylibconfig2-9999.ebuild
@@ -9,7 +9,7 @@ inherit distutils-r1 git-r3
 
 DESCRIPTION="Pure python library for libconfig syntax"
 HOMEPAGE="https://github.com/heinzK1X/pylibconfig2"
-EGIT_REPO_URI="https://github.com/heinzK1X/${PN}.git git://git@github.com:heinzK1X/${PN}.git"
+EGIT_REPO_URI="https://github.com/heinzK1X/${PN}.git git://github.com/heinzK1X/${PN}.git"
 KEYWORDS=""
 
 LICENSE="BSD"

diff --git a/dev-python/python-ivi/python-ivi-9999.ebuild b/dev-python/python-ivi/python-ivi-9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/python-ivi/python-ivi"
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git git@github.com:${PN}/${PN}.git"
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git git://github.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"

diff --git a/dev-python/python-vxi11/python-vxi11-9999.ebuild b/dev-python/python-vxi11/python-vxi11-9999.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/python-ivi/python-vxi11"
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/python-ivi/${PN}.git git@github.com:python-ivi/${PN}.git"
+	EGIT_REPO_URI="https://github.com/python-ivi/${PN}.git git://github.com/python-ivi/${PN}.git"
 else
 	SRC_URI="https://github.com/python-ivi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"

diff --git a/media-libs/avbin-bin/ChangeLog b/media-libs/avbin-bin/ChangeLog
@@ -1,7 +1,15 @@
 # ChangeLog for media-libs/avbin-bin
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Jun 2015; Alexander Presnyakov <flagist0@gmail.com> avbin-bin-7.ebuild:
+  neuro/sci: media-libs/avbin-bin build fixed -- moved source directory
+  determination to pkg_setup
+
+  09 Jun 2015; Alexander Presnyakov <flagist0@gmail.com> avbin-bin-7.ebuild:
+  neuro/sci: media-libs/avbin-bin build fixed -- package S (source directory)
+  depends on architecture
+
   10 Nov 2014; Justin Lecher <jlec@gentoo.org> avbin-bin-7.ebuild,
   metadata.xml:
   Bump EAPI
@@ -24,4 +32,3 @@
   29 May 2008; Andrey Grozin <grozin@gentoo.org>
   +metadata.xml, +avbin-bin-3.ebuild:
   Initial import, thanks to Thomas Pani, bug #207125
-
diff --git a/media-libs/avbin-bin/Manifest b/media-libs/avbin-bin/Manifest
@@ -1,2 +1,2 @@
 DIST avbin-linux-x86-32-7.tar.gz 1499992 SHA256 218b1f40d54762cd7ad4382faf0c5242a8c18def076b67bd308f62ac34560b2f
-DIST avbin-linux-x86-64-7.tar.gz 1509724 SHA256 d60dd48be45024360cf6fc1fa16110e14057ab5f971d35384a79f49ac156d3f2
+DIST avbin-linux-x86-64-7.tar.gz 1509724 SHA256 d60dd48be45024360cf6fc1fa16110e14057ab5f971d35384a79f49ac156d3f2 SHA512 6e31eaebf0eed1eda7c963e3aa27ac2cad35b36a0d2bce63489e235b1a9cb412002370b1268b28ce8509d75baab17a2424ab7620799305b63228feb4b6d0707b WHIRLPOOL 81bfb76f4531a893357937ace2daa9da9b35089bc094bc7e4690c282a1a592ac4fb60e3fd564f206d42c41cefc0bdb97bd145593c8f2f4372b59415e9654f9de
diff --git a/media-libs/avbin-bin/avbin-bin-7.ebuild b/media-libs/avbin-bin/avbin-bin-7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -15,13 +15,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86 -*"
 IUSE=""
 
-src_install() {
+pkg_setup(){
 	if use amd64; then
-		cd "${WORKDIR}"/avbin-linux-x86-64-${PV} || die
+		S="${WORKDIR}"/avbin-linux-x86-64-${PV}
 	elif use x86; then
-		cd "${WORKDIR}"/avbin-linux-x86-32-${PV} || die
+		S="${WORKDIR}"/avbin-linux-x86-32-${PV}
 	fi
-
+}
+src_install() {
 	ln -s libavbin.so.${PV} libavbin.so || die
 	dolib libavbin.so*
 }
diff --git a/sci-libs/pagmo/pagmo-9999.ebuild b/sci-libs/pagmo/pagmo-9999.ebuild
@@ -11,7 +11,7 @@ inherit cmake-utils git-r3 python-single-r1
 DESCRIPTION="Parallelization engine for optimization problems"
 HOMEPAGE="https://github.com/esa/pagmo"
 SRC_URI=""
-EGIT_REPO_URI="https://github.com/esa/${PN}.git git://git@github.com:esa/${PN}.git"
+EGIT_REPO_URI="https://github.com/esa/${PN}.git git://github.com/esa/${PN}.git"
 
 LICENSE="GPL-3"
 SLOT="0"