public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/dotnet:master commit in: dev-dotnet/monotorrent/
@ 2015-10-29  7:21 Heather Cynede
  0 siblings, 0 replies; 4+ messages in thread
From: Heather Cynede @ 2015-10-29  7:21 UTC (permalink / raw
  To: gentoo-commits

commit:     9bcdd50ace36f6eb7a20b044c5c5a07cd45fa5ef
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Wed Oct 28 16:44:55 2015 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 16:44:55 2015 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=9bcdd50a

change ebuild version

 .../{monotorrent-0.80.ebuild => monotorrent-1.0.0-r201510130.ebuild}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-dotnet/monotorrent/monotorrent-0.80.ebuild b/dev-dotnet/monotorrent/monotorrent-1.0.0-r201510130.ebuild
similarity index 100%
rename from dev-dotnet/monotorrent/monotorrent-0.80.ebuild
rename to dev-dotnet/monotorrent/monotorrent-1.0.0-r201510130.ebuild


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/dotnet:master commit in: dev-dotnet/monotorrent/
@ 2015-10-29 11:15 Heather Cynede
  0 siblings, 0 replies; 4+ messages in thread
From: Heather Cynede @ 2015-10-29 11:15 UTC (permalink / raw
  To: gentoo-commits

commit:     e5eb6348045ed19435945ea9aa972dfa2e110abc
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Thu Oct 29 07:04:27 2015 +0000
Commit:     Heather Cynede <cynede <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 07:04:27 2015 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=e5eb6348

|| die added into .pc file install

 .../monotorrent-1.0.0-r201510130.ebuild            | 42 +++++++++-------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/dev-dotnet/monotorrent/monotorrent-1.0.0-r201510130.ebuild b/dev-dotnet/monotorrent/monotorrent-1.0.0-r201510130.ebuild
index 61cf473..fd15cb0 100644
--- a/dev-dotnet/monotorrent/monotorrent-1.0.0-r201510130.ebuild
+++ b/dev-dotnet/monotorrent/monotorrent-1.0.0-r201510130.ebuild
@@ -4,15 +4,14 @@
 
 EAPI=5
 
-# mono-env
-inherit  dotnet nupkg
+inherit nupkg
 
 HOMEPAGE="http://projects.qnetp.net/projects/show/monotorrent"
 DESCRIPTION="Monotorrent is an open source C# bittorrent library"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="net45 +gac +nupkg pkg-config debug developer"
+IUSE="net45 +gac +nupkg +pkg-config debug developer"
 USE_DOTNET="net45"
 
 COMMON_DEPEND=">=dev-lang/mono-4.0.2.5
@@ -25,18 +24,16 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
-NAME="monotorrent"
+NAME="MonoTorrent"
 REPOSITORY="https://github.com/ArsenShnurkov/${NAME}"
 LICENSE_URL="${REPOSITORY}/blob/master/src/LICENSE"
 ICONMETA="https://openclipart.org/detail/198771/mono-torrent"
 ICON_URL="https://openclipart.org/download/198771/mono-torrent.svg"
 
-# monotorrent-1.0.0-r201510130
 EGIT_BRANCH="master"
 EGIT_COMMIT="a76e4cd552d0fff51e47a25fe050efff672f34b2"
 SRC_URI="${REPOSITORY}/archive/${EGIT_BRANCH}/${EGIT_COMMIT}.zip -> ${PF}.zip
 	mirror://gentoo/mono.snk.bz2"
-#S="${WORKDIR}/${NAME}-${EGIT_COMMIT}"
 S="${WORKDIR}/${NAME}-${EGIT_BRANCH}"
 
 # The hack we do to get the dll installed in the GAC makes the unit-tests
@@ -45,12 +42,8 @@ RESTRICT="test"
 
 FILE_TO_BUILD=./src/MonoTorrent.sln
 
-#METAFILETOBUILD="${S}/${FILE_TO_BUILD}"
-#gives Reference 'AlphaFS, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4d31a58f7d7ad5c9, processorArchitecture=MSIL' not resolved
-
 METAFILETOBUILD="src/MonoTorrent/MonoTorrent.csproj"
 
-# leafpad /var/lib/layman/dotnet/eclass/nupkg.eclass &
 NUGET_VERSION="${PVR//-r/.}"
 
 src_prepare() {
@@ -72,7 +65,6 @@ src_configure() {
 }
 
 src_compile() {
-	# emake -j1 ASSEMBLY_COMPILER_COMMAND="/usr/bin/gmcs" -keyfile:${WORKDIR}/mono.snk
 	exbuild /p:SignAssembly=true "/p:AssemblyOriginatorKeyFile=${WORKDIR}/mono.snk" "${METAFILETOBUILD}"
 
 	# run nuget_pack
@@ -84,9 +76,7 @@ src_install() {
 
 	enupkg "${WORKDIR}/monotorrent.${NUGET_VERSION}.nupkg"
 
-	if use pkg-config; then
-		install_pc_file
-	fi
+	install_pc_file
 }
 
 create_nuspec_file()
@@ -122,15 +112,17 @@ EOF
 
 install_pc_file()
 {
-	dodir /usr/$(get_libdir)/pkgconfig
-	ebegin "Installing .pc file"
-	sed  \
-		-e "s:@LIBDIR@:$(get_libdir):" \
-		-e "s:@PACKAGENAME@:${PN}:" \
-		-e "s:@DESCRIPTION@:${DESCRIPTION}:" \
-		-e "s:@VERSION@:${PV}:" \
-		-e 's;@LIBS@;-r:${libdir}/mono/monotorrent/MonoTorrent.dll;' \
-		"${FILESDIR}"/${PN}.pc.in > "${D}"/usr/$(get_libdir)/pkgconfig/${PN}.pc
-	PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists monotorrent || die ".pc file failed to validate."
-	eend $?
+	if use pkg-config; then
+		dodir /usr/$(get_libdir)/pkgconfig
+		ebegin "Installing .pc file"
+		sed  \
+			-e "s:@LIBDIR@:$(get_libdir):" \
+			-e "s:@PACKAGENAME@:${PN}:" \
+			-e "s:@DESCRIPTION@:${DESCRIPTION}:" \
+			-e "s:@VERSION@:${PV}:" \
+			-e 's;@LIBS@;-r:${libdir}/mono/monotorrent/MonoTorrent.dll;' \
+			"${FILESDIR}"/${PN}.pc.in > "${D}"/usr/$(get_libdir)/pkgconfig/${PN}.pc || die
+		PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists monotorrent || die ".pc file failed to validate."
+		eend $?
+	fi
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/dotnet:master commit in: dev-dotnet/monotorrent/
@ 2016-11-13 14:14 Mikhail Pukhlikov
  0 siblings, 0 replies; 4+ messages in thread
From: Mikhail Pukhlikov @ 2016-11-13 14:14 UTC (permalink / raw
  To: gentoo-commits

commit:     03c264fea40099fe74e5f7cdb593574f472de96f
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Sun Nov 13 10:11:41 2016 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 10:11:41 2016 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=03c264fe

ebuild name fixed

 ...rrent-1.0.0-r201510130.ebuild => monotorrent-1.0.0_p2015101302.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-dotnet/monotorrent/monotorrent-1.0.0-r201510130.ebuild b/dev-dotnet/monotorrent/monotorrent-1.0.0_p2015101302.ebuild
similarity index 100%
rename from dev-dotnet/monotorrent/monotorrent-1.0.0-r201510130.ebuild
rename to dev-dotnet/monotorrent/monotorrent-1.0.0_p2015101302.ebuild


^ permalink raw reply	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/dotnet:master commit in: dev-dotnet/monotorrent/
@ 2016-11-13 14:14 Mikhail Pukhlikov
  0 siblings, 0 replies; 4+ messages in thread
From: Mikhail Pukhlikov @ 2016-11-13 14:14 UTC (permalink / raw
  To: gentoo-commits

commit:     687c49aedefcfc127f8ea1a4686b7ea831373df3
Author:     ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Sun Nov 13 10:26:34 2016 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 10:26:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=687c49ae

passing version through noget -Properties parameter

 .../monotorrent-1.0.0_p2015101302.ebuild           | 30 +++++++++++++---------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/dev-dotnet/monotorrent/monotorrent-1.0.0_p2015101302.ebuild b/dev-dotnet/monotorrent/monotorrent-1.0.0_p2015101302.ebuild
index 575a8cf..2155cf6 100644
--- a/dev-dotnet/monotorrent/monotorrent-1.0.0_p2015101302.ebuild
+++ b/dev-dotnet/monotorrent/monotorrent-1.0.0_p2015101302.ebuild
@@ -4,15 +4,18 @@
 
 EAPI=6
 
-inherit nupkg gac
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror"
+USE_DOTNET="net45"
+IUSE="+${USE_DOTNET} +gac +nupkg +pkg-config debug developer"
+
+inherit dotnet gac nupkg
+
+SLOT="0"
 
 HOMEPAGE="http://projects.qnetp.net/projects/show/monotorrent"
 DESCRIPTION="Monotorrent is an open source C# bittorrent library"
 LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="net45 +gac +nupkg +pkg-config debug developer"
-USE_DOTNET="net45"
 
 COMMON_DEPEND=">=dev-lang/mono-4.0.2.5
 "
@@ -38,13 +41,15 @@ S="${WORKDIR}/${NAME}-${EGIT_BRANCH}"
 
 # The hack we do to get the dll installed in the GAC makes the unit-tests
 # defunct.
-RESTRICT="test"
+#RESTRICT+="test"
 
 FILE_TO_BUILD=./src/MonoTorrent.sln
 
 METAFILETOBUILD="src/MonoTorrent/MonoTorrent.csproj"
 
-NUGET_VERSION="${PVR//-r/.}"
+COMMIT_DATE_INDEX="$(get_version_component_count ${PV} )"
+COMMIT_DATEANDSEQ="$(get_version_component_range $COMMIT_DATE_INDEX ${PV} )"
+NUSPEC_VERSION=$(get_version_component_range 1-3)"${COMMIT_DATEANDSEQ//p/.}"
 
 src_prepare() {
 	sed -i	\
@@ -56,7 +61,7 @@ src_prepare() {
 
 	enuget_restore "${METAFILETOBUILD}"
 
-	# leafpad /var/tmp/portage/dev-dotnet/monotorrent-1.0.0-r201510130/work/monotorrent-master/monotorrent.nuspec &
+	# leafpad /var/tmp/portage/dev-dotnet/monotorrent-1.0.0_p2015101302/work/MonoTorrent-master/monotorrent.nuspec &
 	create_nuspec_file "${S}/${PN}.nuspec"
 	eapply_user
 }
@@ -69,13 +74,14 @@ src_compile() {
 	exbuild /p:SignAssembly=true "/p:AssemblyOriginatorKeyFile=${WORKDIR}/mono.snk" "${METAFILETOBUILD}"
 
 	# run nuget_pack
-	enuspec -Prop version=${NUGET_VERSION} ./${PN}.nuspec
+	NUSPEC_PROPERTIES="id=${PN};version=${NUSPEC_VERSION}"
+	enuspec ./${PN}.nuspec
 }
 
 src_install() {
 	egacinstall $(find . -name "MonoTorrent.dll")
 
-	enupkg "${WORKDIR}/monotorrent.${NUGET_VERSION}.nupkg"
+	enupkg "${WORKDIR}/monotorrent.${NUSPEC_VERSION}.nupkg"
 
 	einstall_pc_file "${PN}" "1.0" "MonoTorrent"
 }
@@ -92,8 +98,8 @@ create_nuspec_file()
 		<?xml version="1.0"?>
 		<package>
 		  <metadata>
-		    <id>${PN}</id>
-		    <version>${NUGET_VERSION}</version>
+		    <id>\$id\$</id>
+		    <version>\$version\$</version>
 		    <authors>unknown</authors>
 		    <owners>unknown</owners>
 		    <licenseUrl>${LICENSE_URL}</licenseUrl>


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-11-13 14:14 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-13 14:14 [gentoo-commits] proj/dotnet:master commit in: dev-dotnet/monotorrent/ Mikhail Pukhlikov
  -- strict thread matches above, loose matches on Subject: below --
2016-11-13 14:14 Mikhail Pukhlikov
2015-10-29 11:15 Heather Cynede
2015-10-29  7:21 Heather Cynede

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox