From d6baa114c226e0fcc85cb59dd08d764f71e58490 Mon Sep 17 00:00:00 2001 From: Raúl Porcel Date: Sun, 22 Apr 2007 11:48:32 +0000 Subject: Use doconfd and doinitd, #174266 and version bump (Portage version: 2.1.2.4) --- net-p2p/amule/ChangeLog | 9 +- net-p2p/amule/amule-2.0.3-r4.ebuild | 12 +-- net-p2p/amule/amule-2.1.3.ebuild | 10 +- net-p2p/amule/amule-2.2.0_pre20070404.ebuild | 113 --------------------- net-p2p/amule/amule-2.2.0_pre20070422.ebuild | 113 +++++++++++++++++++++ net-p2p/amule/files/digest-amule-2.2.0_pre20070404 | 3 - net-p2p/amule/files/digest-amule-2.2.0_pre20070422 | 3 + 7 files changed, 135 insertions(+), 128 deletions(-) delete mode 100644 net-p2p/amule/amule-2.2.0_pre20070404.ebuild create mode 100644 net-p2p/amule/amule-2.2.0_pre20070422.ebuild delete mode 100644 net-p2p/amule/files/digest-amule-2.2.0_pre20070404 create mode 100644 net-p2p/amule/files/digest-amule-2.2.0_pre20070422 (limited to 'net-p2p/amule') diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog index 34ddd4ea74f8..b7a81d24c189 100644 --- a/net-p2p/amule/ChangeLog +++ b/net-p2p/amule/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-p2p/amule # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.89 2007/04/08 11:35:13 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.90 2007/04/22 11:48:32 armin76 Exp $ + +*amule-2.2.0_pre20070422 (22 Apr 2007) + + 22 Apr 2007; Raúl Porcel amule-2.0.3-r4.ebuild, + amule-2.1.3.ebuild, -amule-2.2.0_pre20070404.ebuild, + +amule-2.2.0_pre20070422.ebuild: + Use doconfd and doinitd, #174266 and version bump 08 Apr 2007; Raúl Porcel amule-2.2.0_pre20070404.ebuild: diff --git a/net-p2p/amule/amule-2.0.3-r4.ebuild b/net-p2p/amule/amule-2.0.3-r4.ebuild index aaadadc37cd1..d5eba4547a5f 100644 --- a/net-p2p/amule/amule-2.0.3-r4.ebuild +++ b/net-p2p/amule/amule-2.0.3-r4.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.3-r4.ebuild,v 1.11 2006/09/07 22:29:35 sekretarz Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.3-r4.ebuild,v 1.12 2007/04/22 11:48:32 armin76 Exp $ inherit eutils flag-o-matic wxwidgets @@ -101,12 +101,12 @@ src_install() { make DESTDIR=${D} install || die if use amuled; then - insinto /etc/conf.d; newins ${FILESDIR}/amuled.confd amuled - exeinto /etc/init.d; newexe ${FILESDIR}/amuled.initd amuled + newconfd ${FILESDIR}/amuled.confd amuled + newinitd ${FILESDIR}/amuled.initd amuled fi if use remote; then - insinto /etc/conf.d; newins ${FILESDIR}/amuleweb.confd amuleweb - exeinto /etc/init.d; newexe ${FILESDIR}/amuleweb.initd amuleweb + newconfd ${FILESDIR}/amuleweb.confd amuleweb + newinitd ${FILESDIR}/amuleweb.initd amuleweb fi } diff --git a/net-p2p/amule/amule-2.1.3.ebuild b/net-p2p/amule/amule-2.1.3.ebuild index db28333f413d..530fff62322e 100644 --- a/net-p2p/amule/amule-2.1.3.ebuild +++ b/net-p2p/amule/amule-2.1.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.3.ebuild,v 1.11 2007/02/24 17:53:14 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.1.3.ebuild,v 1.12 2007/04/22 11:48:32 armin76 Exp $ inherit eutils flag-o-matic wxwidgets @@ -105,12 +105,12 @@ src_install() { make DESTDIR=${D} install || die if use amuled; then - insinto /etc/conf.d; newins ${FILESDIR}/amuled.confd amuled - exeinto /etc/init.d; newexe ${FILESDIR}/amuled.initd amuled + newconfd ${FILESDIR}/amuled.confd amuled + newinitd ${FILESDIR}/amuled.initd amuled fi if use remote; then - insinto /etc/conf.d; newins ${FILESDIR}/amuleweb.confd amuleweb - exeinto /etc/init.d; newexe ${FILESDIR}/amuleweb.initd amuleweb + newconfd ${FILESDIR}/amuleweb.confd amuleweb + newinitd ${FILESDIR}/amuleweb.initd amuleweb fi } diff --git a/net-p2p/amule/amule-2.2.0_pre20070404.ebuild b/net-p2p/amule/amule-2.2.0_pre20070404.ebuild deleted file mode 100644 index 4762002e82f2..000000000000 --- a/net-p2p/amule/amule-2.2.0_pre20070404.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20070404.ebuild,v 1.3 2007/04/08 11:35:13 armin76 Exp $ - -inherit eutils flag-o-matic wxwidgets - -MY_P=${PN/m/M}-CVS-${PV/2.2.0_pre/} -S="${WORKDIR}/${PN}-cvs" - -DESCRIPTION="aMule, the all-platform eMule p2p client" -HOMEPAGE="http://www.amule.org/" -SRC_URI="http://www.hirnriss.net/files/cvs/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" -IUSE="amuled debug gtk nls remote stats unicode" - -DEPEND=">=x11-libs/wxGTK-2.6.0 - >=sys-libs/zlib-1.2.1 - stats? ( >=media-libs/gd-2.0.26 ) - remote? ( >=media-libs/libpng-1.2.0 - unicode? ( >=media-libs/gd-2.0.26 ) )" - -pkg_setup() { - export WX_GTK_VER="2.6" - - if ! use gtk && ! use remote && ! use amuled; then - eerror "" - eerror "You have to specify at least one of gtk, remote or amuled" - eerror "USE flag to build amule." - eerror "" - die "Invalid USE flag set" - fi - - if use gtk; then - einfo "wxGTK with gtk2 and unicode support will be used" - need-wxwidgets unicode - elif use unicode; then - einfo "wxGTK with unicode and without X support will be used" - need-wxwidgets base-unicode - else - einfo "wxGTK without X support will be used" - need-wxwidgets base - fi - - if use stats && ! use gtk; then - einfo "Note: You would need both the gtk and stats USE flags" - einfo "to compile aMule Statistics GUI." - einfo "I will now compile console versions only." - fi - - if use stats && ! built_with_use media-libs/gd jpeg; then - die "media-libs/gd should be compiled with the jpeg use flag when you have the stats use flag set" - fi -} - -pkg_preinst() { - if use amuled || use remote; then - enewgroup p2p - enewuser p2p -1 -1 /home/p2p p2p - fi -} - -src_compile() { - local myconf="" - - if use gtk ; then - use stats && myconf="${myconf} - --enable-wxcas - --enable-alc" - use remote && myconf="${myconf} - --enable-amule-gui" - else - myconf=" - --disable-monolithic - --disable-amule-gui - --disable-wxcas - --disable-alc" - fi - - econf \ - --with-wx-config=${WX_CONFIG} \ - --with-wxbase-config=${WX_CONFIG} \ - --enable-amulecmd \ - `use_enable debug` \ - `use_enable !debug optimize` \ - `use_enable amuled amule-daemon` \ - `use_enable nls` \ - `use_enable remote webserver` \ - `use_enable stats cas` \ - `use_enable stats alcc` \ - ${myconf} || die - - # we filter ssp until bug #74457 is closed to build on hardened - filter-flags -fstack-protector -fstack-protector-all - - emake -j1 || die -} - -src_install() { - make DESTDIR=${D} install || die - - if use amuled; then - insinto /etc/conf.d; newins ${FILESDIR}/amuled.confd amuled - exeinto /etc/init.d; newexe ${FILESDIR}/amuled.initd amuled - fi - - if use remote; then - insinto /etc/conf.d; newins ${FILESDIR}/amuleweb.confd amuleweb - exeinto /etc/init.d; newexe ${FILESDIR}/amuleweb.initd amuleweb - fi -} diff --git a/net-p2p/amule/amule-2.2.0_pre20070422.ebuild b/net-p2p/amule/amule-2.2.0_pre20070422.ebuild new file mode 100644 index 000000000000..30e0a3ec94cd --- /dev/null +++ b/net-p2p/amule/amule-2.2.0_pre20070422.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.2.0_pre20070422.ebuild,v 1.1 2007/04/22 11:48:32 armin76 Exp $ + +inherit eutils flag-o-matic wxwidgets + +MY_P=${PN/m/M}-CVS-${PV/2.2.0_pre/} +S="${WORKDIR}/${PN}-cvs" + +DESCRIPTION="aMule, the all-platform eMule p2p client" +HOMEPAGE="http://www.amule.org/" +SRC_URI="http://www.hirnriss.net/files/cvs/${MY_P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +IUSE="amuled debug gtk nls remote stats unicode" + +DEPEND=">=x11-libs/wxGTK-2.6.0 + >=sys-libs/zlib-1.2.1 + stats? ( >=media-libs/gd-2.0.26 ) + remote? ( >=media-libs/libpng-1.2.0 + unicode? ( >=media-libs/gd-2.0.26 ) )" + +pkg_setup() { + export WX_GTK_VER="2.6" + + if ! use gtk && ! use remote && ! use amuled; then + eerror "" + eerror "You have to specify at least one of gtk, remote or amuled" + eerror "USE flag to build amule." + eerror "" + die "Invalid USE flag set" + fi + + if use gtk; then + einfo "wxGTK with gtk2 and unicode support will be used" + need-wxwidgets unicode + elif use unicode; then + einfo "wxGTK with unicode and without X support will be used" + need-wxwidgets base-unicode + else + einfo "wxGTK without X support will be used" + need-wxwidgets base + fi + + if use stats && ! use gtk; then + einfo "Note: You would need both the gtk and stats USE flags" + einfo "to compile aMule Statistics GUI." + einfo "I will now compile console versions only." + fi + + if use stats && ! built_with_use media-libs/gd jpeg; then + die "media-libs/gd should be compiled with the jpeg use flag when you have the stats use flag set" + fi +} + +pkg_preinst() { + if use amuled || use remote; then + enewgroup p2p + enewuser p2p -1 -1 /home/p2p p2p + fi +} + +src_compile() { + local myconf="" + + if use gtk ; then + use stats && myconf="${myconf} + --enable-wxcas + --enable-alc" + use remote && myconf="${myconf} + --enable-amule-gui" + else + myconf=" + --disable-monolithic + --disable-amule-gui + --disable-wxcas + --disable-alc" + fi + + econf \ + --with-wx-config=${WX_CONFIG} \ + --with-wxbase-config=${WX_CONFIG} \ + --enable-amulecmd \ + `use_enable debug` \ + `use_enable !debug optimize` \ + `use_enable amuled amule-daemon` \ + `use_enable nls` \ + `use_enable remote webserver` \ + `use_enable stats cas` \ + `use_enable stats alcc` \ + ${myconf} || die + + # we filter ssp until bug #74457 is closed to build on hardened + filter-flags -fstack-protector -fstack-protector-all + + emake -j1 || die +} + +src_install() { + make DESTDIR=${D} install || die + + if use amuled; then + newconfd ${FILESDIR}/amuled.confd amuled + newinitd ${FILESDIR}/amuled.initd amuled + fi + + if use remote; then + newconfd ${FILESDIR}/amuleweb.confd amuleweb + newinitd ${FILESDIR}/amuleweb.initd amuleweb + fi +} diff --git a/net-p2p/amule/files/digest-amule-2.2.0_pre20070404 b/net-p2p/amule/files/digest-amule-2.2.0_pre20070404 deleted file mode 100644 index d9dddf543f24..000000000000 --- a/net-p2p/amule/files/digest-amule-2.2.0_pre20070404 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 3ed504c5c999c751535511e26f12d9e4 aMule-CVS-20070404.tar.bz2 3384612 -RMD160 915cf15e592e278d80a63f370f60552f0adb5e2b aMule-CVS-20070404.tar.bz2 3384612 -SHA256 1155e5409be5c324e2097a5ca9ca4533e0b37179b95a293039473a01afe7037e aMule-CVS-20070404.tar.bz2 3384612 diff --git a/net-p2p/amule/files/digest-amule-2.2.0_pre20070422 b/net-p2p/amule/files/digest-amule-2.2.0_pre20070422 new file mode 100644 index 000000000000..d27ebffa9c8b --- /dev/null +++ b/net-p2p/amule/files/digest-amule-2.2.0_pre20070422 @@ -0,0 +1,3 @@ +MD5 13b42294a42dc8ae44e1157c2a2423c1 aMule-CVS-20070422.tar.bz2 3406102 +RMD160 ab2912e5e07c6690a854682373107c532715faea aMule-CVS-20070422.tar.bz2 3406102 +SHA256 f5a532da419a6a78238144588bb420c4cbd7b1113ea05000abf8a29b3202ac1a aMule-CVS-20070422.tar.bz2 3406102 -- cgit v1.2.3-65-gdbad