[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/npgsql/

[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/npgsql/

[Mikhail Pukhlikov]

commit:     ec68c49b7c7dec4836492e230965fbd987cf730b
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Tue Aug 16 10:52:17 2016 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 10:52:17 2016 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=ec68c49b

repoman fixes

 dev-dotnet/npgsql/metadata.xml        | 7 +++----
 dev-dotnet/npgsql/npgsql-3.1.6.ebuild | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dev-dotnet/npgsql/metadata.xml b/dev-dotnet/npgsql/metadata.xml
index 0fb6e95..ab1141e 100644
--- a/dev-dotnet/npgsql/metadata.xml
+++ b/dev-dotnet/npgsql/metadata.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>dotnet</herd>
-	<maintainer> <!-- https://wiki.gentoo.org/wiki/User:Cynede -->
-		<email>cynede@gentoo.org</email>
-		<name>Heather Cynede</name>
+	<maintainer type="project">
+		<email>dotnet@gentoo.org</email>
+		<description>Gentoo Dotnet Project</description>
 	</maintainer>
 	<upstream>
 		<bugs-to>https://github.com/npgsql/npgsql/issues</bugs-to>

diff --git a/dev-dotnet/npgsql/npgsql-3.1.6.ebuild b/dev-dotnet/npgsql/npgsql-3.1.6.ebuild
index dd8c8ea..acd16d4 100644
--- a/dev-dotnet/npgsql/npgsql-3.1.6.ebuild
+++ b/dev-dotnet/npgsql/npgsql-3.1.6.ebuild
@@ -31,9 +31,9 @@ DESCRIPTION="allows any program developed for .NET framework to access a Postgre
 LICENSE="npgsql"
 LICENSE_URL="https://github.com/npgsql/npgsql/blob/develop/LICENSE.txt"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64"
 COMMON_DEPENDENCIES="|| ( >=dev-lang/mono-4.2 <dev-lang/mono-9999 )
-	nupkg? ( dev-util/nunit )
+	nupkg? ( dev-dotnet/nuget )
 "
 RDEPEND="${COMMON_DEPENDENCIES}
 "

[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/npgsql/

[Mikhail Pukhlikov]

commit:     47e8b85f128c98dc593a9ef706e66892a9ba20a7
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Thu Jan 14 14:20:41 2016 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 16:34:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=47e8b85f

more recent version

 dev-dotnet/npgsql/npgsql-3.0.5_p20160114.ebuild | 157 ++++++++++++++++++++++++
 1 file changed, 157 insertions(+)

diff --git a/dev-dotnet/npgsql/npgsql-3.0.5_p20160114.ebuild b/dev-dotnet/npgsql/npgsql-3.0.5_p20160114.ebuild
new file mode 100644
index 0000000..743e299
--- /dev/null
+++ b/dev-dotnet/npgsql/npgsql-3.0.5_p20160114.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# debug = debug configuration (symbols and defines for debugging)
+# developer = generate symbols information (to view line numbers in stack traces, either in debug or release configuration)
+# test = allow NUnit tests to run
+# nupkg = create .nupkg file from .nuspec
+# gac = install into gac
+# pkg-config = register in pkg-config database
+USE_DOTNET="net45"
+IUSE="${USE_DOTNET} debug developer test +nupkg +gac +pkg-config"
+
+inherit nupkg
+
+NAME="npgsql"
+NUSPEC_ID="${NAME}"
+HOMEPAGE="https://github.com/npgsql/${NAME}"
+
+EGIT_COMMIT="5a333df0a48512ccd92f9a4b14ad75aa294d3940"
+SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.zip -> ${P}.zip
+	mirror://gentoo/mono.snk.bz2"
+S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
+
+SLOT="0"
+
+DESCRIPTION="allows any program developed for .NET framework to access a PostgreSQL database"
+LICENSE="npgsql"
+LICENSE_URL="https://github.com/npgsql/npgsql/blob/develop/LICENSE.txt"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+COMMON_DEPENDENCIES="|| ( >=dev-lang/mono-4.2 <dev-lang/mono-9999 )"
+RDEPEND="${COMMON_DEPENDENCIES}
+"
+DEPEND="${COMMON_DEPENDENCIES}
+	>=dev-dotnet/nunit-2.6.4-r201501110:2[nupkg]
+"
+
+METAFILETOBUILD=Npgsql.sln
+
+NUSPEC_FILENAME="npgsql.nuspec"
+COMMIT_DATE_INDEX=$(get_version_component_count ${PV} )
+COMMIT_DATE=$(get_version_component_range $COMMIT_DATE_INDEX ${PV} )
+NUSPEC_VERSION=$(get_version_component_range 1-3)"${COMMIT_DATE//p/.}${PR//r/}"
+
+ICON_FILENAME=postgresql-header.png
+#ICON_URL=http://www.npgsql.org/css/img/postgresql-header.png
+ICON_URL=$(get_nuget_trusted_icons_location)/${NUSPEC_ID}.${NUSPEC_VERSION}.png
+
+src_unpack() {
+	default
+	# Installing 'NLog 3.2.0.0'.
+	# Installing 'AsyncRewriter 0.6.0'.
+	# Installing 'EntityFramework 5.0.0'.
+	# Installing 'EntityFramework 6.1.3'.
+	# Installing 'NUnit 2.6.4'.
+	enuget_download_rogue_binary "NLog" "3.2.0.0"
+	enuget_download_rogue_binary "AsyncRewriter" "0.6.0"
+	enuget_download_rogue_binary "EntityFramework" "5.0.0"
+	enuget_download_rogue_binary "EntityFramework" "6.1.3"
+	#enuget_download_rogue_binary "NUnit" "2.6.4"
+}
+
+src_prepare() {
+	elog "${S}/${NUSPEC_FILENAME}"
+
+	enuget_restore "${METAFILETOBUILD}"
+
+	cp "${FILESDIR}/${NUSPEC_FILENAME}" "${S}/${NUSPEC_FILENAME}" || die
+	patch_nuspec_file "${S}/${NUSPEC_FILENAME}"
+
+	default
+}
+
+src_compile() {
+	exbuild /p:SignAssembly=true "/p:AssemblyOriginatorKeyFile=${WORKDIR}/mono.snk" "${METAFILETOBUILD}"
+
+	NUSPEC_PROPS+="nuget_version=${NUSPEC_VERSION};"
+	NUSPEC_PROPS+="nuget_id=${NUSPEC_ID};"
+	NUSPEC_PROPS+="nuget_projectUrl=${HOMEPAGE};"
+	NUSPEC_PROPS+="nuget_licenseUrl=${LICENSE_URL};"
+	NUSPEC_PROPS+="nuget_description=${DESCRIPTION};"
+	NUSPEC_PROPS+="nuget_iconUrl=file://${ICON_URL}"
+	elog "NUSPEC_PROPS=${NUSPEC_PROPS}"
+	enuspec -Prop "${NUSPEC_PROPS}" "${S}/${NUSPEC_FILENAME}"
+}
+
+src_install() {
+	if use debug; then
+		DIR="Debug"
+	else
+		DIR="Release"
+	fi
+
+	FINAL_DLL=npgsql/bin/${DIR}/Net45/npgsql.dll
+
+	if use gac; then
+		egacinstall "${FINAL_DLL}"
+	fi
+
+	insinto "$(get_nuget_trusted_icons_location)"
+	newins "${FILESDIR}/${ICON_FILENAME}" "${NUSPEC_ID}.${NUSPEC_VERSION}.png"
+
+	enupkg "${WORKDIR}/${NUSPEC_ID}.${NUSPEC_VERSION}.nupkg"
+
+	install_pc_file
+}
+
+patch_nuspec_file()
+{
+	if use nupkg; then
+		if use debug; then
+			DIR="Debug"
+		else
+			DIR="Release"
+		fi
+FILES_STRING=`cat <<-EOF || die "${DIR} files at patch_nuspec_file()"
+	<files> <!-- https://docs.nuget.org/create/nuspec-reference -->
+		<file src="npgsql/bin/${DIR}/Net45/Newtonsoft.Json.*" target="lib\net45\" />
+	</files>
+EOF
+`
+		einfo ${FILES_STRING}
+		replace "</package>" "${FILES_STRING}</package>" -- $1 || die "replace at patch_nuspec_file()"
+	fi
+}
+
+PC_FILE_NAME=${PN}
+
+install_pc_file()
+{
+	if use pkg-config; then
+		dodir /usr/$(get_libdir)/pkgconfig
+		ebegin "Installing ${PC_FILE_NAME}.pc file"
+		sed \
+			-e "s:@LIBDIR@:$(get_libdir):" \
+			-e "s:@PACKAGENAME@:${PC_FILE_NAME}:" \
+			-e "s:@DESCRIPTION@:${DESCRIPTION}:" \
+			-e "s:@VERSION@:${PV}:" \
+			-e 's*@LIBS@*-r:${libdir}'"/mono/${PC_FILE_NAME}/npgsql.dll"'*' \
+			<<\EOF >"${D}/usr/$(get_libdir)/pkgconfig/${PC_FILE_NAME}.pc" || die
+prefix=${pcfiledir}/../..
+exec_prefix=${prefix}
+libdir=${exec_prefix}/@LIBDIR@
+Name: @PACKAGENAME@
+Description: @DESCRIPTION@
+Version: @VERSION@
+Libs: @LIBS@
+EOF
+
+		einfo PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists "${PC_FILE_NAME}"
+		PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists "${PC_FILE_NAME}" || die ".pc file failed to validate."
+		eend $?
+	fi
+}

[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/npgsql/

[Mikhail Pukhlikov]

commit:     dda0897537901090d99238e0b979ed8272811b4d
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Fri Jan 15 04:28:01 2016 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 16:34:01 2016 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=dda08975

use projects instead of sln

 dev-dotnet/npgsql/npgsql-3.0.5_p20160101.ebuild | 9 ++++++++-
 dev-dotnet/npgsql/npgsql-3.0.5_p20160114.ebuild | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/dev-dotnet/npgsql/npgsql-3.0.5_p20160101.ebuild b/dev-dotnet/npgsql/npgsql-3.0.5_p20160101.ebuild
index 436ff04..6b91ae7 100644
--- a/dev-dotnet/npgsql/npgsql-3.0.5_p20160101.ebuild
+++ b/dev-dotnet/npgsql/npgsql-3.0.5_p20160101.ebuild
@@ -38,7 +38,7 @@ DEPEND="${COMMON_DEPENDENCIES}
 	>=dev-dotnet/nunit-2.6.4-r201501110:2[nupkg]
 "
 
-METAFILETOBUILD=Npgsql.sln
+METAFILETOBUILD=src/Npgsql/Npgsql.csproj
 
 NUSPEC_FILENAME="npgsql.nuspec"
 COMMIT_DATE_INDEX=$(get_version_component_count ${PV} )
@@ -76,6 +76,9 @@ src_prepare() {
 
 src_compile() {
 	exbuild /p:SignAssembly=true "/p:AssemblyOriginatorKeyFile=${WORKDIR}/mono.snk" "${METAFILETOBUILD}"
+	if use test; then
+		exbuild /p:SignAssembly=true "/p:AssemblyOriginatorKeyFile=${WORKDIR}/mono.snk" "test\Npgsql.Tests\Npgsql.Tests.csproj"
+	fi
 
 	NUSPEC_PROPS+="nuget_version=${NUSPEC_VERSION};"
 	NUSPEC_PROPS+="nuget_id=${NUSPEC_ID};"
@@ -87,6 +90,10 @@ src_compile() {
 	enuspec -Prop "${NUSPEC_PROPS}" "${S}/${NUSPEC_FILENAME}"
 }
 
+src_test() {
+	default
+}
+
 src_install() {
 	if use debug; then
 		DIR="Debug"

diff --git a/dev-dotnet/npgsql/npgsql-3.0.5_p20160114.ebuild b/dev-dotnet/npgsql/npgsql-3.0.5_p20160114.ebuild
index 743e299..89fed90 100644
--- a/dev-dotnet/npgsql/npgsql-3.0.5_p20160114.ebuild
+++ b/dev-dotnet/npgsql/npgsql-3.0.5_p20160114.ebuild
@@ -38,7 +38,7 @@ DEPEND="${COMMON_DEPENDENCIES}
 	>=dev-dotnet/nunit-2.6.4-r201501110:2[nupkg]
 "
 
-METAFILETOBUILD=Npgsql.sln
+METAFILETOBUILD=src/Npgsql/Npgsql.csproj
 
 NUSPEC_FILENAME="npgsql.nuspec"
 COMMIT_DATE_INDEX=$(get_version_component_count ${PV} )
@@ -76,6 +76,9 @@ src_prepare() {
 
 src_compile() {
 	exbuild /p:SignAssembly=true "/p:AssemblyOriginatorKeyFile=${WORKDIR}/mono.snk" "${METAFILETOBUILD}"
+	if use test; then
+		exbuild /p:SignAssembly=true "/p:AssemblyOriginatorKeyFile=${WORKDIR}/mono.snk" "test\Npgsql.Tests\Npgsql.Tests.csproj"
+	fi
 
 	NUSPEC_PROPS+="nuget_version=${NUSPEC_VERSION};"
 	NUSPEC_PROPS+="nuget_id=${NUSPEC_ID};"
@@ -87,6 +90,10 @@ src_compile() {
 	enuspec -Prop "${NUSPEC_PROPS}" "${S}/${NUSPEC_FILENAME}"
 }
 
+src_test() {
+	default
+}
+
 src_install() {
 	if use debug; then
 		DIR="Debug"