I forgot about rev. bump:| restoring old ebuilds and adding new without gtk2 flag

(Portage version: 1.589-cvs)

10 files changed, 170 insertions, 19 deletions

diff --git a/net-p2p/amule/ChangeLog b/net-p2p/amule/ChangeLog
index 2ffd381507b1..b4b082e6c0f8 100644
--- a/net-p2p/amule/ChangeLog
+++ b/net-p2p/amule/ChangeLog
@@ -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:
diff --git a/net-p2p/amule/Manifest b/net-p2p/amule/Manifest
index ffeeb7522c4b..a2f64643681f 100644
--- a/net-p2p/amule/Manifest
+++ b/net-p2p/amule/Manifest
@@ -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 90d168ffc0ca2af709d6dfd7d62dfb7c ChangeLog 6925
+MD5 85966639c4bc2dba5e2a625d7415a40b amule-1.2.8.ebuild 925
+MD5 aa2abedcfc830b289467f7172db62eaa amule-2.0.1.ebuild 2234
+MD5 1ed14b241d7641c6b6d3281be0401208 amule-2.0.3.ebuild 2258
 MD5 8aefbc0e49db723ca1ad02d0c409cd49 metadata.xml 160
-MD5 ce03f558dab0517edf644ba681460dc5 amule-2.0.3-r1.ebuild 2195
+MD5 456d05dd0bd8a4cf0e90e646fbd64c6b amule-2.0.3-r1.ebuild 2197
+MD5 a775172987f8def194771a1289b7d2ed amule-1.2.8-r1.ebuild 826
+MD5 1a85918d3b0aedf13d115e422ba91be2 amule-2.0.1-r1.ebuild 2164
 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
index 000000000000..b0e8390a3dc8
--- /dev/null
+++ b/net-p2p/amule/amule-1.2.8-r1.ebuild
@@ -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
+}
diff --git a/net-p2p/amule/amule-1.2.8.ebuild b/net-p2p/amule/amule-1.2.8.ebuild
index 2ebca34604ca..b3d974472f98 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.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
index 000000000000..439352678396
--- /dev/null
+++ b/net-p2p/amule/amule-2.0.1-r1.ebuild
@@ -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
+}
diff --git a/net-p2p/amule/amule-2.0.1.ebuild b/net-p2p/amule/amule-2.0.1.ebuild
index be1e989ce839..60c2abb5779d 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.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() {
diff --git a/net-p2p/amule/amule-2.0.3-r1.ebuild b/net-p2p/amule/amule-2.0.3-r1.ebuild
index 3a468318ffae..2131201f0dc8 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.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"
 
 
diff --git a/net-p2p/amule/amule-2.0.3.ebuild b/net-p2p/amule/amule-2.0.3.ebuild
index 0b7e96b46a49..222923485128 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.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
index 000000000000..777f9e2e2b05
--- /dev/null
+++ b/net-p2p/amule/files/digest-amule-1.2.8-r1
@@ -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
index 000000000000..dae8df18dff9
--- /dev/null
+++ b/net-p2p/amule/files/digest-amule-2.0.1-r1
@@ -0,0 +1 @@
+MD5 8c4a6cae058ac248bfcb9a57a18fca61 aMule-2.0.1.tar.bz2 2119387