I forgot about rev. bump:| restoring old ebuilds and adding new without gtk2 flag
authorMarcin Kryczek <mkay@gentoo.org>
Tue, 20 Sep 2005 09:59:18 +0000 (09:59 +0000)
committerMarcin Kryczek <mkay@gentoo.org>
Tue, 20 Sep 2005 09:59:18 +0000 (09:59 +0000)
Package-Manager: portage-1.589-cvs

net-p2p/amule/ChangeLog
net-p2p/amule/Manifest
net-p2p/amule/amule-1.2.8-r1.ebuild [new file with mode: 0644]
net-p2p/amule/amule-1.2.8.ebuild
net-p2p/amule/amule-2.0.1-r1.ebuild [new file with mode: 0644]
net-p2p/amule/amule-2.0.1.ebuild
net-p2p/amule/amule-2.0.3-r1.ebuild
net-p2p/amule/amule-2.0.3.ebuild
net-p2p/amule/files/digest-amule-1.2.8-r1 [new file with mode: 0644]
net-p2p/amule/files/digest-amule-2.0.1-r1 [new file with mode: 0644]

index 2ffd381507b12e3d673e611b71a8d98e5bfbc19f..b4b082e6c0f8dda1b362927b1249acac9ad7bbde 100644 (file)
@@ -1,6 +1,15 @@
 # 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.48 2005/09/20 09:40:19 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/ChangeLog,v 1.49 2005/09/20 09:59:18 mkay Exp $
+
+*amule-2.0.1-r1 (20 Sep 2005)
+*amule-1.2.8-r1 (20 Sep 2005)
+
+  20 Sep 2005; <mkay@gentoo.org> amule-1.2.8.ebuild, +amule-1.2.8-r1.ebuild,
+  amule-2.0.1.ebuild, +amule-2.0.1-r1.ebuild, amule-2.0.3.ebuild,
+  amule-2.0.3-r1.ebuild:
+  I forgot about rev. bump:| restoring old ebuilds and adding new without gtk2
+  flag
 
   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:
index ffeeb7522c4b55ca04d550b6c0aa425a1c52a4c7..4513eec29c51ebe3d95e76ac6bec744802d9f22d 100644 (file)
@@ -1,9 +1,11 @@
-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 663e381c3103fa6d9324494a70525148 ChangeLog 6925
+MD5 8089773038f60bec63f9fc87c15aa26e amule-1.2.8.ebuild 922
+MD5 5ff5515bcbef5c070e0356ce1f01aef4 amule-2.0.1.ebuild 2229
+MD5 1abaced287e5f9e1594893fb667a96df amule-2.0.3.ebuild 2258
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 ce03f558dab0517edf644ba681460dc5 amule-2.0.3-r1.ebuild 2195
+MD5 d324135217594945f029bdfc7f5a4ce2 amule-2.0.3-r1.ebuild 2197
+MD5 b3c15e104e1b64f5499fad3b01f9b27d amule-1.2.8-r1.ebuild 829
+MD5 bcdd2b75d6b9bc9030bad15ae7748780 amule-2.0.1-r1.ebuild 2167
 MD5 75c780e3a94f217a14a99371aa7e9a56 files/amuleweb.initd 1176
 MD5 8cde6982e4b5300f4521da90ab8733d6 files/amule-2.0.0_rc7-wxgtk.patch 1293
 MD5 6cfdc1b9b4a65d47e9047a8fed427889 files/amuled.confd 409
@@ -13,3 +15,5 @@ MD5 6222124296125a6909963944434e0291 files/digest-amule-1.2.8 65
 MD5 e875c8bb7caccbc783bbd7238b520a04 files/digest-amule-2.0.1 65
 MD5 393ff0bdafbbb32d292387e1ca196737 files/digest-amule-2.0.3 65
 MD5 393ff0bdafbbb32d292387e1ca196737 files/digest-amule-2.0.3-r1 65
+MD5 6222124296125a6909963944434e0291 files/digest-amule-1.2.8-r1 65
+MD5 e875c8bb7caccbc783bbd7238b520a04 files/digest-amule-2.0.1-r1 65
diff --git a/net-p2p/amule/amule-1.2.8-r1.ebuild b/net-p2p/amule/amule-1.2.8-r1.ebuild
new file mode 100644 (file)
index 0000000..b0e8390
--- /dev/null
@@ -0,0 +1,35 @@
+# 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-r1.ebuild,v 1.1 2005/09/20 09:59:18 mkay Exp $
+
+inherit wxwidgets
+
+MY_P=${P/m/M}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="aMule, the all-platform eMule p2p client"
+HOMEPAGE="http://www.amule.org"
+SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="debug nls remote gtk"
+
+DEPEND=">=x11-libs/wxGTK-2.4.2-r2
+       >=net-misc/curl-7.11.0
+       >=sys-libs/zlib-1.2.1
+       !net-p2p/xmule"
+
+src_compile() {
+       need-wxwidgets gtk || die "gtk version of wxGTK not found"
+       econf `use_enable nls` \
+       `use_enable remote amulecmd` \
+       `use_enable debug` || die
+
+       emake -j1 || die
+}
+
+src_install() {
+       make DESTDIR=${D} install || die
+}
index 2ebca34604caca37366e75aa96a2a2190aece524..b3d974472f98dca6e381a5dd205758e7bbaf0264 100644 (file)
@@ -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.6 2005/09/20 09:40:19 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-1.2.8.ebuild,v 1.7 2005/09/20 09:59:18 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 gtk"
+IUSE="debug nls remote gtk2"
 
 DEPEND=">=x11-libs/wxGTK-2.4.2-r2
        >=net-misc/curl-7.11.0
@@ -22,7 +22,11 @@ DEPEND=">=x11-libs/wxGTK-2.4.2-r2
        !net-p2p/xmule"
 
 src_compile() {
-       need-wxwidgets gtk || die "gtk version of wxGTK not found"
+       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
        econf `use_enable nls` \
        `use_enable remote amulecmd` \
        `use_enable debug` || die
diff --git a/net-p2p/amule/amule-2.0.1-r1.ebuild b/net-p2p/amule/amule-2.0.1-r1.ebuild
new file mode 100644 (file)
index 0000000..4393526
--- /dev/null
@@ -0,0 +1,86 @@
+# 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-r1.ebuild,v 1.1 2005/09/20 09:59:18 mkay Exp $
+
+inherit eutils flag-o-matic wxwidgets
+
+MY_P=${P/m/M}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="aMule, the all-platform eMule p2p client"
+HOMEPAGE="http://www.amule.org/"
+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 gtk nls remote stats unicode"
+
+
+DEPEND=">=x11-libs/wxGTK-2.6.0
+       >=sys-libs/zlib-1.2.2
+       nls? ( sys-devel/gettext )
+       remote? ( >=media-libs/libpng-1.2.8 )
+       stats? ( >=media-libs/gd-2.0.32 )
+       !net-p2p/xmule
+       sys-apps/sed"
+
+pkg_setup() {
+       export WX_GTK_VER="2.6"
+       need-wxwidgets gtk
+       use unicode && need-wxwidgets unicode
+}
+
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       sed -i -r "s:\\$\\(LN_S\\) (.*):\$\(LN_S\) ${D}/\1:g" docs/man/Makefile.in
+}
+
+src_compile() {
+       if use amuled; then
+               EXTRA_ECONF="--enable-amule-daemon --enable-amule-gui"
+       fi
+
+       econf \
+               --disable-optimize \
+               --with-wx-config=${WX_CONFIG} \
+               --with-wxbase-config=${WX_CONFIG} \
+               `use_enable debug` \
+               `use_enable nls` \
+               `use_enable remote amulecmd` \
+               `use_enable remote amulecmdgui` \
+               `use_enable remote webserver` \
+               `use_enable remote webservergui` \
+               `use_enable stats cas` \
+               `use_enable stats wxcas` \
+               `use_enable stats alc` \
+               `use_enable stats alcc` \
+               || die
+       # we filter ssp until bug #74457 is closed to build on hardened
+       if has_hardened; then
+       filter-flags -fstack-protector -fstack-protector-all
+       fi
+       emake -j1 || die
+}
+
+src_install() {
+       make DESTDIR=${D} install || die
+
+       if use amuled || use remote; then
+               if ! id p2p >/dev/null; then
+                       enewgroup p2p
+                       enewuser p2p -1 -1 /home/p2p p2p
+               fi
+       fi
+
+       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
+}
index be1e989ce839f55f5454ca793e392a3e6724b3f6..60c2abb5779df9bb5ec1d9c2d349ccfcf90fc022 100644 (file)
@@ -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.6 2005/09/20 09:40:19 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.1.ebuild,v 1.7 2005/09/20 09:59:18 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 gtk nls remote stats unicode"
+IUSE="amuled debug gtk2 nls remote stats unicode"
 
 
 DEPEND=">=x11-libs/wxGTK-2.6.0
@@ -27,8 +27,13 @@ DEPEND=">=x11-libs/wxGTK-2.6.0
 
 pkg_setup() {
        export WX_GTK_VER="2.6"
-       need-wxwidgets gtk
-       use unicode && need-wxwidgets unicode
+       if ! use gtk2; then
+               need-wxwidgets gtk
+       elif use unicode; then
+               need-wxwidgets unicode
+       else
+               need-wxwidgets gtk2
+       fi
 }
 
 src_unpack() {
index 3a468318ffae4e4adbb7bbfe2a067a4495fe24ce..2131201f0dc8353105879021bd1ab4d548e3a143 100644 (file)
@@ -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.2 2005/09/20 09:40:19 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.3-r1.ebuild,v 1.3 2005/09/20 09:59:18 mkay Exp $
 
 inherit eutils flag-o-matic wxwidgets
 
@@ -13,7 +13,7 @@ SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 amd64 ~ppc ~ppc64 ~sparc ~alpha"
+KEYWORDS="~x86 ~amd64 ~ppc ~ppc64 ~sparc ~alpha"
 IUSE="amuled debug gtk nls remote stats unicode"
 
 
index 0b7e96b46a4978352ab311a71db09e45b37299fb..2229234851289b4f13a8c293069a4a83657810dd 100644 (file)
@@ -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.5 2005/09/20 09:40:19 mkay Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/amule/amule-2.0.3.ebuild,v 1.6 2005/09/20 09:59:18 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 gtk nls remote stats unicode"
+IUSE="amuled debug gtk2 nls remote stats unicode"
 
 
 DEPEND=">=x11-libs/wxGTK-2.6.0
@@ -27,8 +27,14 @@ DEPEND=">=x11-libs/wxGTK-2.6.0
 
 pkg_setup() {
        export WX_GTK_VER="2.6"
-       need-wxwidgets gtk
-       use unicode && need-wxwidgets unicode
+       if ! use gtk2; then
+               need-wxwidgets gtk
+       elif use unicode; then
+               need-wxwidgets unicode
+       else
+               need-wxwidgets gtk2
+       fi
+
 }
 
 src_unpack() {
diff --git a/net-p2p/amule/files/digest-amule-1.2.8-r1 b/net-p2p/amule/files/digest-amule-1.2.8-r1
new file mode 100644 (file)
index 0000000..777f9e2
--- /dev/null
@@ -0,0 +1 @@
+MD5 a6fe7157000efdc5985dfc8774efbccd aMule-1.2.8.tar.bz2 2039251
diff --git a/net-p2p/amule/files/digest-amule-2.0.1-r1 b/net-p2p/amule/files/digest-amule-2.0.1-r1
new file mode 100644 (file)
index 0000000..dae8df1
--- /dev/null
@@ -0,0 +1 @@
+MD5 8c4a6cae058ac248bfcb9a57a18fca61 aMule-2.0.1.tar.bz2 2119387