diff options
-rw-r--r-- | net-p2p/amule/ChangeLog | 17 | ||||
-rw-r--r-- | net-p2p/amule/Manifest | 12 | ||||
-rw-r--r-- | net-p2p/amule/amule-1.2.8.ebuild | 10 | ||||
-rw-r--r-- | net-p2p/amule/amule-2.0.1.ebuild | 13 | ||||
-rw-r--r-- | net-p2p/amule/amule-2.0.3-r1.ebuild | 14 | ||||
-rw-r--r-- | net-p2p/amule/amule-2.0.3.ebuild | 15 | ||||
-rw-r--r-- | net-p2p/amule/files/amuleweb.initd | 5 |
7 files changed, 29 insertions, 57 deletions
diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog index a3428febdf0f..2ffd381507b1 100644 --- a/net-p2p/amule/ChangeLog +++ b/net-p2p/amule/ChangeLog @@ -1,19 +1,10 @@ # ChangeLog for net-p2p/amule # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.47 2005/09/18 12:25:05 mkay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.48 2005/09/20 09:40:19 mkay Exp $ -*amule-2.0.3-r1 (18 Sep 2005) - - 18 Sep 2005; <mkay@gentoo.org> +amule-2.0.3-r1.ebuild: - Amule uses external crypto++ now. Thanks Andreas Eriksson and others in bug - #66605 - - 18 Sep 2005; <mkay@gentoo.org> files/amuleweb.initd: - Command-line parameters for amuleweb have changed. Fixing init.d script. - This also close bug #105642 - - 18 Sep 2005; <mkay@gentoo.org> amule-2.0.1.ebuild: - Older version has the same problem with symlinks outside sandbox. Fixed + 20 Sep 2005; <mkay@gentoo.org> files/amuleweb.initd, amule-1.2.8.ebuild, + amule-2.0.1.ebuild, amule-2.0.3.ebuild, amule-2.0.3-r1.ebuild: + Removing gtk2 flag 17 Sep 2005; <mkay@gentoo.org> amule-2.0.3.ebuild: Fixing symlinks made to files in live system (sandbox violation) diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest index 83a19c5adfa3..ffeeb7522c4b 100644 --- a/net-p2p/amule/Manifest +++ b/net-p2p/amule/Manifest @@ -1,10 +1,10 @@ -MD5 0cc905fa6ec76088c1f1486a9f2b83c8 ChangeLog 6912 -MD5 85966639c4bc2dba5e2a625d7415a40b amule-1.2.8.ebuild 925 -MD5 9dbf449f81030cb9b239e16363e09a7b amule-2.0.1.ebuild 2229 -MD5 c43816a1fc4d37eccb77992e7b2468b0 amule-2.0.3.ebuild 2228 +MD5 784aa3cf2da68002e01df316c17705f2 ChangeLog 6609 +MD5 222896d38d91d4e32afd3323e717cf8e amule-1.2.8.ebuild 825 +MD5 1a85918d3b0aedf13d115e422ba91be2 amule-2.0.1.ebuild 2164 +MD5 7d764d6f988c39b9ffe5247d505754ec amule-2.0.3.ebuild 2192 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160 -MD5 c4366499965918854a970c8756fd89fd amule-2.0.3-r1.ebuild 2261 -MD5 2cd3c11b25af6a2cab49c5fb08fcc26a files/amuleweb.initd 1158 +MD5 ce03f558dab0517edf644ba681460dc5 amule-2.0.3-r1.ebuild 2195 +MD5 75c780e3a94f217a14a99371aa7e9a56 files/amuleweb.initd 1176 MD5 8cde6982e4b5300f4521da90ab8733d6 files/amule-2.0.0_rc7-wxgtk.patch 1293 MD5 6cfdc1b9b4a65d47e9047a8fed427889 files/amuled.confd 409 MD5 37c7ee8278a02051a68d062beba82fbc files/amuled.initd 1138 diff --git a/net-p2p/amule/amule-1.2.8.ebuild b/net-p2p/amule/amule-1.2.8.ebuild index d93a5d2c6343..2ebca34604ca 100644 --- a/net-p2p/amule/amule-1.2.8.ebuild +++ b/net-p2p/amule/amule-1.2.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.8.ebuild,v 1.5 2005/03/12 15:18:28 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.8.ebuild,v 1.6 2005/09/20 09:40:19 mkay Exp $ inherit wxwidgets @@ -14,7 +14,7 @@ SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 ~amd64" -IUSE="debug nls remote gtk2" +IUSE="debug nls remote gtk" DEPEND=">=x11-libs/wxGTK-2.4.2-r2 >=net-misc/curl-7.11.0 @@ -22,11 +22,7 @@ DEPEND=">=x11-libs/wxGTK-2.4.2-r2 !net-p2p/xmule" src_compile() { - if ! use gtk2 ; then - need-wxwidgets gtk || die "gtk version of wxGTK not found" - else - need-wxwidgets gtk2 || die "gtk2 version of wxGTK not found" - fi + need-wxwidgets gtk || die "gtk version of wxGTK not found" econf `use_enable nls` \ `use_enable remote amulecmd` \ `use_enable debug` || die diff --git a/net-p2p/amule/amule-2.0.1.ebuild b/net-p2p/amule/amule-2.0.1.ebuild index 44d6c03cd289..be1e989ce839 100644 --- a/net-p2p/amule/amule-2.0.1.ebuild +++ b/net-p2p/amule/amule-2.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.1.ebuild,v 1.5 2005/09/18 11:46:17 mkay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.1.ebuild,v 1.6 2005/09/20 09:40:19 mkay Exp $ inherit eutils flag-o-matic wxwidgets @@ -14,7 +14,7 @@ SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~x86 ~amd64 ~ppc ~ppc64 ~sparc ~alpha" -IUSE="amuled debug gtk2 nls remote stats unicode" +IUSE="amuled debug gtk nls remote stats unicode" DEPEND=">=x11-libs/wxGTK-2.6.0 @@ -27,13 +27,8 @@ DEPEND=">=x11-libs/wxGTK-2.6.0 pkg_setup() { export WX_GTK_VER="2.6" - if ! use gtk2; then - need-wxwidgets gtk - elif use unicode; then - need-wxwidgets unicode - else - need-wxwidgets gtk2 - fi + need-wxwidgets gtk + use unicode && need-wxwidgets unicode } src_unpack() { diff --git a/net-p2p/amule/amule-2.0.3-r1.ebuild b/net-p2p/amule/amule-2.0.3-r1.ebuild index 964b99649c91..3a468318ffae 100644 --- a/net-p2p/amule/amule-2.0.3-r1.ebuild +++ b/net-p2p/amule/amule-2.0.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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-r1.ebuild,v 1.1 2005/09/18 12:25:05 mkay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.3-r1.ebuild,v 1.2 2005/09/20 09:40:19 mkay Exp $ inherit eutils flag-o-matic wxwidgets @@ -14,7 +14,7 @@ SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 amd64 ~ppc ~ppc64 ~sparc ~alpha" -IUSE="amuled debug gtk2 nls remote stats unicode" +IUSE="amuled debug gtk nls remote stats unicode" DEPEND=">=x11-libs/wxGTK-2.6.0 @@ -27,14 +27,8 @@ DEPEND=">=x11-libs/wxGTK-2.6.0 pkg_setup() { export WX_GTK_VER="2.6" - if ! use gtk2; then - need-wxwidgets gtk - elif use unicode; then - need-wxwidgets unicode - else - need-wxwidgets gtk2 - fi - + need-wxwidgets gtk + use unicode && need-wxwidgets unicode } src_unpack() { diff --git a/net-p2p/amule/amule-2.0.3.ebuild b/net-p2p/amule/amule-2.0.3.ebuild index 413a0bc9f45a..0b7e96b46a49 100644 --- a/net-p2p/amule/amule-2.0.3.ebuild +++ b/net-p2p/amule/amule-2.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 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.ebuild,v 1.4 2005/09/17 22:26:45 mkay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.3.ebuild,v 1.5 2005/09/20 09:40:19 mkay Exp $ inherit eutils flag-o-matic wxwidgets @@ -14,7 +14,7 @@ SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="x86 amd64 ~ppc ~ppc64 ~sparc ~alpha" -IUSE="amuled debug gtk2 nls remote stats unicode" +IUSE="amuled debug gtk nls remote stats unicode" DEPEND=">=x11-libs/wxGTK-2.6.0 @@ -27,14 +27,8 @@ DEPEND=">=x11-libs/wxGTK-2.6.0 pkg_setup() { export WX_GTK_VER="2.6" - if ! use gtk2; then - need-wxwidgets gtk - elif use unicode; then - need-wxwidgets unicode - else - need-wxwidgets gtk2 - fi - + need-wxwidgets gtk + use unicode && need-wxwidgets unicode } src_unpack() { @@ -52,6 +46,7 @@ src_compile() { --disable-optimize \ --with-wx-config=${WX_CONFIG} \ --with-wxbase-config=${WX_CONFIG} \ + --disable-embedded-crypto \ `use_enable debug` \ `use_enable nls` \ `use_enable remote amulecmd` \ diff --git a/net-p2p/amule/files/amuleweb.initd b/net-p2p/amule/files/amuleweb.initd index 2dd5113728ff..3d5961bafd6e 100644 --- a/net-p2p/amule/files/amuleweb.initd +++ b/net-p2p/amule/files/amuleweb.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuleweb.initd,v 1.3 2005/09/18 11:51:01 mkay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/files/amuleweb.initd,v 1.4 2005/09/20 09:40:20 mkay Exp $ depend() { need net @@ -21,8 +21,9 @@ start() { rm /var/run/amuleweb.pid - OPTIONS="-h ${AMULEHOST} -p ${AMULEPORT} -P ${AMULEPWD}" + OPTIONS="-rh ${AMULEHOST} -p ${AMULEPORT} -pw ${AMULEPWD}" + einfo $OPTIONS ebegin "Starting aMule WebServer" env HOME="${AMULEHOME}" start-stop-daemon --start \ --quiet -b \ |