[gentoo-commits] repo/gentoo:master commit in: net-im/ejabberd/, net-im/ejabberd/files/, dev-erlang/p1_pam/, dev-erlang/epam/, ...

[Amadeusz Piotr Żołnowski]

commit:     9571494a273d4a9f6947a9530d7963077a673e7a
Author:     Amadeusz Żołnowski <aidecoe <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 12:06:41 2017 +0000
Commit:     Amadeusz Piotr Żołnowski <aidecoe <AT> gentoo <DOT> org>
CommitDate: Sat May 27 13:03:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9571494a

dev-erlang/p1_pam: Move to dev-erlang/epam

Upstream has eventually decided on the name and it's "epam" rather than
"p1_pam".

 dev-erlang/epam/Manifest                                         | 1 +
 .../{p1_pam/p1_pam-1.0.0.ebuild => epam/epam-1.0.0.ebuild}       | 9 +++------
 dev-erlang/{p1_pam => epam}/metadata.xml                         | 0
 dev-erlang/p1_pam/Manifest                                       | 1 -
 net-im/ejabberd/ejabberd-16.04-r1.ebuild                         | 2 +-
 net-im/ejabberd/ejabberd-16.04.ebuild                            | 2 +-
 net-im/ejabberd/ejabberd-16.08.ebuild                            | 2 +-
 net-im/ejabberd/ejabberd-16.09.ebuild                            | 2 +-
 net-im/ejabberd/ejabberd-17.01.ebuild                            | 2 +-
 net-im/ejabberd/files/epam-wrapper                               | 6 +++---
 profiles/updates/2Q-2017                                         | 1 +
 11 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/dev-erlang/epam/Manifest b/dev-erlang/epam/Manifest
new file mode 100644
index 00000000000..6c75e7daf00
--- /dev/null
+++ b/dev-erlang/epam/Manifest
@@ -0,0 +1 @@
+DIST epam-1.0.0.tar.gz 44008 SHA256 0febab627700f9570bfafd1a93499a5f43de74d85c7a5bdfda8067c6b75f8f4f SHA512 c0b1fbdc1e910f24b2f39ea34cf6fd5859f3ab0cf762a16cf9ef71b1e49129c8238001151dd9031046049967f31fd2cb3d0c06a7d8bdd46e49f19862c143f374 WHIRLPOOL 9037a749657ea55024a355f2f6f96b906118175be6a68ef8cc0d78a379da1181b01114d739c2d5fc8cee61775d710ac84903a8f5e59ce82bdd9b7bbb5fd405c0

diff --git a/dev-erlang/p1_pam/p1_pam-1.0.0.ebuild b/dev-erlang/epam/epam-1.0.0.ebuild
similarity index 76%
rename from dev-erlang/p1_pam/p1_pam-1.0.0.ebuild
rename to dev-erlang/epam/epam-1.0.0.ebuild
index e2f14d11244..eacf6aecb14 100644
--- a/dev-erlang/p1_pam/p1_pam-1.0.0.ebuild
+++ b/dev-erlang/epam/epam-1.0.0.ebuild
@@ -3,14 +3,13 @@
 
 EAPI=6
 
-inherit rebar
+REBAR_APP_SRC=src/p1_pam.app.src
 
-MY_PN="epam"
-MY_P="${MY_PN}-${PV}"
+inherit rebar
 
 DESCRIPTION="epam for ejabberd to help with PAM authentication support"
 HOMEPAGE="https://github.com/processone/epam"
-SRC_URI="https://github.com/processone/${MY_PN}/archive/${PV}.tar.gz
+SRC_URI="https://github.com/processone/epam/archive/${PV}.tar.gz
 	-> ${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -22,5 +21,3 @@ DEPEND=">=dev-lang/erlang-17.1
 RDEPEND="${DEPEND}"
 
 DOCS=( README.md )
-
-S="${WORKDIR}/${MY_P}"

diff --git a/dev-erlang/p1_pam/metadata.xml b/dev-erlang/epam/metadata.xml
similarity index 100%
rename from dev-erlang/p1_pam/metadata.xml
rename to dev-erlang/epam/metadata.xml

diff --git a/dev-erlang/p1_pam/Manifest b/dev-erlang/p1_pam/Manifest
deleted file mode 100644
index 882d529664d..00000000000
--- a/dev-erlang/p1_pam/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST p1_pam-1.0.0.tar.gz 44008 SHA256 0febab627700f9570bfafd1a93499a5f43de74d85c7a5bdfda8067c6b75f8f4f SHA512 c0b1fbdc1e910f24b2f39ea34cf6fd5859f3ab0cf762a16cf9ef71b1e49129c8238001151dd9031046049967f31fd2cb3d0c06a7d8bdd46e49f19862c143f374 WHIRLPOOL 9037a749657ea55024a355f2f6f96b906118175be6a68ef8cc0d78a379da1181b01114d739c2d5fc8cee61775d710ac84903a8f5e59ce82bdd9b7bbb5fd405c0

diff --git a/net-im/ejabberd/ejabberd-16.04-r1.ebuild b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
index 0c2d9fcb628..a7ed3a18ef7 100644
--- a/net-im/ejabberd/ejabberd-16.04-r1.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04-r1.ebuild
@@ -48,7 +48,7 @@ CDEPEND="
 	mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
 	nls? ( >=dev-erlang/iconv-1.0.0 )
 	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/p1_pam-1.0.0 )
+	pam? ( >=dev-erlang/epam-1.0.0 )
 	postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
 	redis? ( >=dev-erlang/eredis-1.0.8 )
 	riak? (

diff --git a/net-im/ejabberd/ejabberd-16.04.ebuild b/net-im/ejabberd/ejabberd-16.04.ebuild
index f80f234023a..55352509f72 100644
--- a/net-im/ejabberd/ejabberd-16.04.ebuild
+++ b/net-im/ejabberd/ejabberd-16.04.ebuild
@@ -48,7 +48,7 @@ CDEPEND="
 	mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
 	nls? ( >=dev-erlang/iconv-1.0.0 )
 	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/p1_pam-1.0.0 )
+	pam? ( >=dev-erlang/epam-1.0.0 )
 	postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
 	redis? ( >=dev-erlang/eredis-1.0.8 )
 	riak? (

diff --git a/net-im/ejabberd/ejabberd-16.08.ebuild b/net-im/ejabberd/ejabberd-16.08.ebuild
index 6c3e31acaf7..bb40fdee440 100644
--- a/net-im/ejabberd/ejabberd-16.08.ebuild
+++ b/net-im/ejabberd/ejabberd-16.08.ebuild
@@ -47,7 +47,7 @@ CDEPEND="
 	mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
 	nls? ( >=dev-erlang/iconv-1.0.1 )
 	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/p1_pam-1.0.0 )
+	pam? ( >=dev-erlang/epam-1.0.0 )
 	postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
 	redis? ( >=dev-erlang/eredis-1.0.8 )
 	riak? (

diff --git a/net-im/ejabberd/ejabberd-16.09.ebuild b/net-im/ejabberd/ejabberd-16.09.ebuild
index 5c38212a5f7..656bc3857ff 100644
--- a/net-im/ejabberd/ejabberd-16.09.ebuild
+++ b/net-im/ejabberd/ejabberd-16.09.ebuild
@@ -46,7 +46,7 @@ CDEPEND="
 	mysql? ( >=dev-erlang/p1_mysql-1.0.1 )
 	nls? ( >=dev-erlang/iconv-1.0.2 )
 	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/p1_pam-1.0.0 )
+	pam? ( >=dev-erlang/epam-1.0.0 )
 	postgres? ( >=dev-erlang/p1_pgsql-1.1.0 )
 	redis? ( >=dev-erlang/eredis-1.0.8 )
 	riak? (

diff --git a/net-im/ejabberd/ejabberd-17.01.ebuild b/net-im/ejabberd/ejabberd-17.01.ebuild
index 1f355ef0e52..8c252b2799d 100644
--- a/net-im/ejabberd/ejabberd-17.01.ebuild
+++ b/net-im/ejabberd/ejabberd-17.01.ebuild
@@ -47,7 +47,7 @@ CDEPEND="
 	mysql? ( >=dev-erlang/p1_mysql-1.0.2 )
 	nls? ( >=dev-erlang/iconv-1.0.3 )
 	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/p1_pam-1.0.0 )
+	pam? ( >=dev-erlang/epam-1.0.0 )
 	postgres? ( >=dev-erlang/p1_pgsql-1.1.2 )
 	redis? ( >=dev-erlang/eredis-1.0.8 )
 	riak? (

diff --git a/net-im/ejabberd/files/epam-wrapper b/net-im/ejabberd/files/epam-wrapper
index a22793c86c0..9fb0466cf22 100644
--- a/net-im/ejabberd/files/epam-wrapper
+++ b/net-im/ejabberd/files/epam-wrapper
@@ -2,19 +2,19 @@
 
 ERL_LIBS=/usr/lib/erlang/lib
 
-for bin in "$ERL_LIBS"/p1_pam-*/priv/bin/epam; do
+for bin in "$ERL_LIBS"/epam-*/priv/bin/epam; do
 	if [ -x "$bin" ]; then
 		if [ -z "$epam" ]; then
 			epam="$bin"
 		else
-			echo "Multiple p1_pam libraries - don't know what to do" >&2
+			echo "Multiple epam libraries - don't know what to do" >&2
 			exit 1
 		fi
 	fi
 done
 
 if [ -z "$epam" ]; then
-	echo "Couldn't find p1_pam package" >&2
+	echo "Couldn't find epam package" >&2
 	exit 1
 fi
 

diff --git a/profiles/updates/2Q-2017 b/profiles/updates/2Q-2017
index f87928b51b7..810856e0ee2 100644
--- a/profiles/updates/2Q-2017
+++ b/profiles/updates/2Q-2017
@@ -1,2 +1,3 @@
 move kde-misc/kio_gopher kde-misc/kio-gopher
 move dev-python/pyconstruct dev-python/construct
+move dev-erlang/p1_pam dev-erlang/epam