diff options
author | Peter Alfredsen <loki_val@gentoo.org> | 2009-01-07 12:47:38 +0000 |
---|---|---|
committer | Peter Alfredsen <loki_val@gentoo.org> | 2009-01-07 12:47:38 +0000 |
commit | c3fb73f90e6683c152dab33fc4ca36f728551650 (patch) | |
tree | d4d6859db33542da3284267f3e5adf6b7469ad26 /dev-dotnet/nini | |
parent | Version bump. (diff) | |
download | gentoo-2-c3fb73f90e6683c152dab33fc4ca36f728551650.tar.gz gentoo-2-c3fb73f90e6683c152dab33fc4ca36f728551650.tar.bz2 gentoo-2-c3fb73f90e6683c152dab33fc4ca36f728551650.zip |
Fix dll not being strongnamed and not being installed into the global assembly cache. Use gmcs, drop nant build files.
(Portage version: 2.2_rc20/cvs/Linux 2.6.28 x86_64)
Diffstat (limited to 'dev-dotnet/nini')
-rw-r--r-- | dev-dotnet/nini/ChangeLog | 13 | ||||
-rw-r--r-- | dev-dotnet/nini/files/Nini.snk.uue | 17 | ||||
-rw-r--r-- | dev-dotnet/nini/files/nini-1.0.0.build | 55 | ||||
-rw-r--r-- | dev-dotnet/nini/files/nini-1.1.0.build | 38 | ||||
-rw-r--r-- | dev-dotnet/nini/nini-1.0.0-r1.ebuild | 57 | ||||
-rw-r--r-- | dev-dotnet/nini/nini-1.0.0.ebuild | 52 | ||||
-rw-r--r-- | dev-dotnet/nini/nini-1.1.0-r1.ebuild | 61 | ||||
-rw-r--r-- | dev-dotnet/nini/nini-1.1.0.ebuild | 57 |
8 files changed, 89 insertions, 261 deletions
diff --git a/dev-dotnet/nini/ChangeLog b/dev-dotnet/nini/ChangeLog index 4f8626c2ef35..470128dcf149 100644 --- a/dev-dotnet/nini/ChangeLog +++ b/dev-dotnet/nini/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-dotnet/nini -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nini/ChangeLog,v 1.5 2007/02/21 23:11:12 peper Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nini/ChangeLog,v 1.6 2009/01/07 12:47:38 loki_val Exp $ + +*nini-1.1.0-r1 (07 Jan 2009) + + 07 Jan 2009; Peter Alfredsen <loki_val@gentoo.org> + -files/nini-1.0.0.build, -files/nini-1.1.0.build, +files/Nini.snk.uue, + -nini-1.0.0.ebuild, -nini-1.0.0-r1.ebuild, -nini-1.1.0.ebuild, + +nini-1.1.0-r1.ebuild: + Fix dll not being strongnamed and not being installed into the global + assembly cache. Use gmcs, drop nant build files. 21 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog: Transition to Manifest2. diff --git a/dev-dotnet/nini/files/Nini.snk.uue b/dev-dotnet/nini/files/Nini.snk.uue new file mode 100644 index 000000000000..7fd27217fd0d --- /dev/null +++ b/dev-dotnet/nini/files/Nini.snk.uue @@ -0,0 +1,17 @@ +begin 600 Nini.snk +M!P(````D``!24T$R``0``!$```"M"VY;.)&'^47#V1XRZK&L!JH`'DGLG<\[ +M"LBOVSTV7G<+?3._7#3<#<UD1G:^SPX+#QT9C(:EN&/V]%74"X8U@0^1:LPO +M[!_])"\ZN=.W4Z$N1BHMX3Q_R6JS06D[^I!O(H_X"0B]ZR\@`_DNS9`3L1L3 +M^)'=V#/-C?;_\X4WLE'E(.!R%+0Y2E5<S*65.#.=]TX,8_1YT[`A:@*>$J^I +M6I7[PU8Z^8E45^O#O&2R=,*B1&VB>*-@/LL)[M3E.N&=F?2=E`!H>2PR%AUB +M_19@,5N<$$5LZ<,)#6)&"9`M5EFVQ]*I9'$>?'%-V++-]&KUJ!"%VNKS]RH/ +M9,KW9Y#*H14L+S@_^4$%#^A*D@M02R&`&$<Y;CY@]ED2\Q*VUK,$P*%A']G, +MB#MZHG"(_C.CNJU:48^(V^L8=]ND?W^[QO7SH-?BI?TQ]%]%5QDLOE04K8N[ +M9_]!Y^6,57>IE>6,Z!TTP!C/3-#G6YC@A2>_X#?K%8+AC8+/+_?LZ4>C:%,P +M+FN11TL5R&W@WFV_%],I,RVA@Y_AP,[J&VLW)61KI/9"<G"3ZL<_;<TM2]^A +MC$])X,@/#MOD=-^KL6$-MZDQ<?M7Q:_/H]_7QQA*JBE^JZ8:F;6B&!+R\>%' +MS=!__IA5!Z@7NQ27&^=L4;E!9"%R-?L<3=\<A+A58HU4%3,#"&FRLTB98Z1T +MT'C,$2!RIOFB8M`B%E]N#L0J_1?``[_13`VCO8_WYH4VSS[Z<2%93`I3IB9I ++I\$YY9)26C)0Q)(` +` +end diff --git a/dev-dotnet/nini/files/nini-1.0.0.build b/dev-dotnet/nini/files/nini-1.0.0.build deleted file mode 100644 index 5933831580c6..000000000000 --- a/dev-dotnet/nini/files/nini-1.0.0.build +++ /dev/null @@ -1,55 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<project name="Nini" default="compile" basedir="."> - <description>.NET Configuration Library</description> - - <property name="debug" value="false" overwrite="false"/> - <property name="project.name" value="Nini"/> - - <property name="build" value="build"/> - <property name="src" value="Source"/> - - <target name="init"> - <mkdir dir="${build}" if="${not directory::exists(build)}"/> - </target> - - <target name="compile" depends="init"> - <csc target="library" output="${build}/${project.name}.dll" debug="${debug}"> - <references> - <include name="System.dll"/> - <include name="System.Xml.dll"/> - </references> - - <sources> - <include name="${src}/AssemblyInfo.cs"/> - - <include name="${src}/Ini/IniDocument.cs"/> - <include name="${src}/Ini/IniReader.cs"/> - <include name="${src}/Ini/IniWriter.cs"/> - <include name="${src}/Ini/IniException.cs"/> - <include name="${src}/Ini/IniSectionCollection.cs"/> - <include name="${src}/Ini/IniSection.cs"/> - <include name="${src}/Ini/IniItem.cs"/> - - <include name="${src}/Config/ArgvConfigSource.cs"/> - <include name="${src}/Config/ConfigBase.cs"/> - <include name="${src}/Config/ConfigSourceBase.cs"/> - <include name="${src}/Config/IniConfigSource.cs"/> - <include name="${src}/Config/DotNetConfigSource.cs"/> - <include name="${src}/Config/XmlConfigSource.cs"/> - <include name="${src}/Config/AliasText.cs"/> - <include name="${src}/Config/IConfig.cs"/> - <include name="${src}/Config/IConfigSource.cs"/> - <include name="${src}/Config/ConfigCollection.cs"/> - - <include name="${src}/Util/ArgvParser.cs"/> - <include name="${src}/Util/OrderedList.cs"/> - <include name="${src}/Util/OrderedListEnumerator.cs"/> - </sources> - </csc> - </target> - - <target name="clean"> - <delete dir="${build}" if="${directory::exists(build)}"/> - </target> -</project> diff --git a/dev-dotnet/nini/files/nini-1.1.0.build b/dev-dotnet/nini/files/nini-1.1.0.build deleted file mode 100644 index 542192ec4d29..000000000000 --- a/dev-dotnet/nini/files/nini-1.1.0.build +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<project name="Nini" default="compile" basedir="."> - <description>.NET Configuration Library</description> - - <property name="debug" value="false" overwrite="false"/> - <property name="project.name" value="Nini"/> - - <property name="build" value="build"/> - <property name="src" value="Source"/> - - <!-- Switch to .NET 2.0 Framework --> - <property name="nant.settings.currentframework" value="mono-2.0"/> - - <target name="init"> - <mkdir dir="${build}" if="${not directory::exists(build)}"/> - </target> - - <target name="compile" depends="init"> - <csc target="library" output="${build}/${project.name}.dll" debug="${debug}"> - <references> - <include name="System.dll"/> - <include name="System.Xml.dll"/> - </references> - - <sources> - <include name="${src}/*.cs"/> - <include name="${src}/Ini/*.cs"/> - <include name="${src}/Util/*.cs"/> - <include name="${src}/Config/*.cs"/> - </sources> - </csc> - </target> - - <target name="clean"> - <delete dir="${build}" if="${directory::exists(build)}"/> - </target> -</project> diff --git a/dev-dotnet/nini/nini-1.0.0-r1.ebuild b/dev-dotnet/nini/nini-1.0.0-r1.ebuild deleted file mode 100644 index b907b5665c7a..000000000000 --- a/dev-dotnet/nini/nini-1.0.0-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nini/nini-1.0.0-r1.ebuild,v 1.2 2006/02/01 21:47:38 metalgod Exp $ - -inherit mono multilib - -DESCRIPTION="Nini - A configuration library for .NET" -HOMEPAGE="http://nini.sourceforge.net" -SRC_URI="mirror://sourceforge/nini/Nini-${PV}.zip" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND=">=dev-lang/mono-1.1.8" -DEPEND="${RDEPEND} - app-arch/unzip - dev-dotnet/nant - dev-util/pkgconfig - sys-apps/sed" - -S=${WORKDIR}/Nini - -src_unpack() { - unpack ${A} || die "Unable to extract sources" - - cp ${FILESDIR}/nini-${PV}.build ${S}/nini.build - cp ${FILESDIR}/nini.pc.in ${S} -} - -src_compile() { - local myconf="" - use debug && myconf="-D:debug=true" - - nant ${myconf} || die "Failed to build" - - sed -e "s|@prefix@|/usr|" \ - -e 's|@exec_prefix@|${prefix}|' \ - -e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/nini|" \ - -e "s|@libs@|-r:\$\{libdir\}/Nini.dll|" \ - -e "s|@VERSION@|${PV}|" \ - ${S}/nini.pc.in > ${S}/nini.pc -} - -src_install() { - dodir /usr/$(get_libdir)/nini/ - - insinto /usr/$(get_libdir)/nini/ - doins ${S}/build/Nini.dll - use debug && doins ${S}/build/Nini.dll.mdb - - insinto /usr/$(get_libdir)/pkgconfig/ - doins ${S}/nini.pc - - dodoc ${S}/CHANGELOG.txt ${S}/README.txt -} diff --git a/dev-dotnet/nini/nini-1.0.0.ebuild b/dev-dotnet/nini/nini-1.0.0.ebuild deleted file mode 100644 index 364d30e0b75e..000000000000 --- a/dev-dotnet/nini/nini-1.0.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nini/nini-1.0.0.ebuild,v 1.1 2005/11/08 06:00:05 compnerd Exp $ - -inherit mono multilib - -DESCRIPTION="Nini - A configuration library for .NET" -HOMEPAGE="http://nini.sourceforge.net" -SRC_URI="mirror://sourceforge/nini/Nini-${PV}.zip" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~x86" -IUSE="" - -RDEPEND=">=dev-lang/mono-1.1.8" -DEPEND="${RDEPEND} - app-arch/unzip - dev-dotnet/nant - dev-util/pkgconfig - sys-apps/sed" - -S=${WORKDIR}/Nini - -src_unpack() { - unpack ${A} || die "Unable to extract sources" - - cp ${FILESDIR}/nini-${PV}.build ${S}/nini.build - cp ${FILESDIR}/nini.pc.in ${S} -} - -src_compile() { - nant || die "Failed to build" - - sed -e "s|@prefix@|/usr|" \ - -e 's|@exec_prefix@|${prefix}|' \ - -e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/nini|" \ - -e "s|@libs@|-r:\$\{libdir\}/Nini.dll|" \ - -e "s|@VERSION@|${PV}|" \ - ${S}/nini.pc.in > ${S}/nini.pc -} - -src_install() { - dodir /usr/$(get_libdir)/nini/ - insinto /usr/$(get_libdir)/nini/ - doins ${S}/build/Nini.dll - - insinto /usr/$(get_libdir)/pkgconfig/ - doins ${S}/nini.pc - - dodoc ${S}/CHANGELOG.txt ${S}/README.txt -} diff --git a/dev-dotnet/nini/nini-1.1.0-r1.ebuild b/dev-dotnet/nini/nini-1.1.0-r1.ebuild new file mode 100644 index 000000000000..a57f18a2fc5e --- /dev/null +++ b/dev-dotnet/nini/nini-1.1.0-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nini/nini-1.1.0-r1.ebuild,v 1.1 2009/01/07 12:47:38 loki_val Exp $ + +EAPI=2 + +inherit mono multilib + +DESCRIPTION="Nini - A configuration library for .NET" +HOMEPAGE="http://nini.sourceforge.net" +SRC_URI="mirror://sourceforge/nini/Nini-${PV}.zip" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug" + +RDEPEND=">=dev-lang/mono-2" +DEPEND="${RDEPEND} + app-arch/sharutils + sys-apps/sed" + +S=${WORKDIR}/Nini/Source + +src_prepare() { + uudecode -o Nini.snk "${FILESDIR}"/Nini.snk.uue +} + +src_configure() { + use debug&&DEBUG="-debug" +} + +src_compile() { + #See nini in Debian for info + gmcs ${DEBUG} \ + -nowarn:1616 \ + -target:library \ + -out:Nini.dll \ + -define:STRONG \ + -r:System.dll \ + -r:System.Xml.dll \ + -keyfile:Nini.snk \ + AssemblyInfo.cs Config/*.cs Ini/*.cs Util/*.cs \ + || die "Compilation failed" + + + sed \ + -e 's|@prefix@|${pcfiledir}/../..|' \ + -e 's|@exec_prefix@|${prefix}|' \ + -e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)|" \ + -e "s|@libs@|-r:\$\{libdir\}/mono/Nini/Nini.dll|" \ + -e "s|@VERSION@|${PV}|" \ + "${FILESDIR}"/nini.pc.in > "${S}"/nini.pc +} + +src_install() { + egacinstall Nini.dll Nini + insinto /usr/$(get_libdir)/pkgconfig + doins "${S}"/nini.pc + dodoc "${S}"/../CHANGELOG.txt "${S}"/../README.txt +} diff --git a/dev-dotnet/nini/nini-1.1.0.ebuild b/dev-dotnet/nini/nini-1.1.0.ebuild deleted file mode 100644 index 693474feee01..000000000000 --- a/dev-dotnet/nini/nini-1.1.0.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/nini/nini-1.1.0.ebuild,v 1.1 2006/08/27 21:50:41 compnerd Exp $ - -inherit mono multilib - -DESCRIPTION="Nini - A configuration library for .NET" -HOMEPAGE="http://nini.sourceforge.net" -SRC_URI="mirror://sourceforge/nini/Nini-${PV}.zip" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug" - -RDEPEND=">=dev-lang/mono-1.1.8" -DEPEND="${RDEPEND} - app-arch/unzip - dev-dotnet/nant - dev-util/pkgconfig - sys-apps/sed" - -S=${WORKDIR}/Nini - -src_unpack() { - unpack ${A} || die "Unable to extract sources" - - cp ${FILESDIR}/nini-${PV}.build ${S}/nini.build - cp ${FILESDIR}/nini.pc.in ${S} -} - -src_compile() { - local myconf="" - use debug && myconf="-D:debug=true" - - nant ${myconf} || die "Failed to build" - - sed -e "s|@prefix@|/usr|" \ - -e 's|@exec_prefix@|${prefix}|' \ - -e "s|@libdir@|\$\{exec_prefix\}/$(get_libdir)/nini|" \ - -e "s|@libs@|-r:\$\{libdir\}/Nini.dll|" \ - -e "s|@VERSION@|${PV}|" \ - ${S}/nini.pc.in > ${S}/nini.pc -} - -src_install() { - dodir /usr/$(get_libdir)/nini/ - - insinto /usr/$(get_libdir)/nini/ - doins ${S}/build/Nini.dll - use debug && doins ${S}/build/Nini.dll.mdb - - insinto /usr/$(get_libdir)/pkgconfig/ - doins ${S}/nini.pc - - dodoc ${S}/CHANGELOG.txt ${S}/README.txt -} |