Resurrect 0.10 and p.mask 0.11 as it needs newer dependencies.

Package-Manager: portage-2.1_pre7-r5

6 files changed, 174 insertions, 20 deletions

diff --git a/net-irc/xchat-gnome/ChangeLog b/net-irc/xchat-gnome/ChangeLog
index aee3becaa3bb..7d9884aaf71f 100644
--- a/net-irc/xchat-gnome/ChangeLog
+++ b/net-irc/xchat-gnome/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/xchat-gnome
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.20 2006/04/17 19:51:50 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/ChangeLog,v 1.21 2006/04/20 20:13:43 swegener Exp $
+
+  20 Apr 2006; Sven Wegener <swegener@gentoo.org>
+  +files/0.10-libnotify-libsexy-configure.patch, +xchat-gnome-0.10.ebuild,
+  xchat-gnome-0.11.ebuild:
+  Resurrect 0.10 and p.mask 0.11 as it needs newer dependencies.
 
 *xchat-gnome-0.11 (17 Apr 2006)
 
diff --git a/net-irc/xchat-gnome/Manifest b/net-irc/xchat-gnome/Manifest
index a07aee8697ce..4100b55f3e43 100644
--- a/net-irc/xchat-gnome/Manifest
+++ b/net-irc/xchat-gnome/Manifest
@@ -1,25 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 363ebfc888404aef4a67cf571a871dd7 ChangeLog 3713
-RMD160 59698ff74e0f62b7ba20cf07dbb8d8c03392fcce ChangeLog 3713
-SHA256 d29da26c5b93a094bde6cf4377f35ba66f4cf1fc7612239954e2991f2b82e84e ChangeLog 3713
+MD5 b6c3965e03b3d7341d0cc17dbbbfddc0 ChangeLog 3931
+RMD160 badcf2a3e33d1a6d8102cc34bd2b210e40131b91 ChangeLog 3931
+SHA256 4bec5a07af04dd03324d6858bc6c87fe9df0cb303448d788eae278c4d28582a4 ChangeLog 3931
+MD5 d716befa826af4aff08e7d9177b72760 files/0.10-libnotify-libsexy-configure.patch 2348
+RMD160 0ff5be061f86caafb19ec00752ddb5ac24d4691e files/0.10-libnotify-libsexy-configure.patch 2348
+SHA256 2792e8763b349b6beaff08d34c4567b8646082efae41001a8d9bfcbe9018fada files/0.10-libnotify-libsexy-configure.patch 2348
 MD5 b1ea0b635587713b2f680d6bb6528069 files/0.11-libnotify-libsexy-configure.patch 2400
 RMD160 b928e0d6d20a5dabf80f67f2b714aef8b29678a8 files/0.11-libnotify-libsexy-configure.patch 2400
 SHA256 cb713b86de4418a3bed1c86d54fdea6bdb519cb90519867dda3ce269a8ab0f00 files/0.11-libnotify-libsexy-configure.patch 2400
+MD5 275f90aa5a730301d36aa554d2c16a38 files/digest-xchat-gnome-0.10 256
+RMD160 acdb8478aaa1afb4847b8b03ed27b0d65af351b2 files/digest-xchat-gnome-0.10 256
+SHA256 f9134b37491ce6b515b36689ffeb28062d50ff88b092f7461fd831cbf8109574 files/digest-xchat-gnome-0.10 256
 MD5 3a8ead5daadb18a5bfbc2ba8921c173e files/digest-xchat-gnome-0.11 256
 RMD160 885045d995d8a145f4b23088ef4f75159011fe5e files/digest-xchat-gnome-0.11 256
 SHA256 8491d0d12c03c479b71677f042c04e0e4b87d8f4aefd90090768856661089b3b files/digest-xchat-gnome-0.11 256
 MD5 44c39c6ad372a8e5a5e7ee3311f703a7 metadata.xml 160
 RMD160 279429d1df694561fc2b163cb81c09387b9d940c metadata.xml 160
 SHA256 5e058419199e306612929b80a996e3d16c6b20de674a56bb60558d3d36524fe2 metadata.xml 160
-MD5 c896fe2285060cd34ebb010348af51ce xchat-gnome-0.11.ebuild 2074
-RMD160 8085795f93b719594ef7ae7a6dbb90190048fdee xchat-gnome-0.11.ebuild 2074
-SHA256 32be6568b02e7bd934ecb45e60a36387cfc832fa50fe931fa738a44866ee0d8d xchat-gnome-0.11.ebuild 2074
+MD5 d793257eddc9919d7320431c907eb63d xchat-gnome-0.10.ebuild 2114
+RMD160 2508473fe302024e62409626aff8f13c99682656 xchat-gnome-0.10.ebuild 2114
+SHA256 60ea03c6c3d3ef4dce0d227a107ee56f37feb427eba3324ecc1ae1b2e0ea1153 xchat-gnome-0.10.ebuild 2114
+MD5 544e1355a54b9b8e3986f34af83041d1 xchat-gnome-0.11.ebuild 2111
+RMD160 4f514dc2fb004810f00166963b3efd3ce40dcfc9 xchat-gnome-0.11.ebuild 2111
+SHA256 9336095fff23940a0efa45259ce91d7bd71d6a00289450480450da015c33e4a4 xchat-gnome-0.11.ebuild 2111
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEQ/HiI1lqEGTUzyQRAj/EAJ9OVexh8h9tpi6KqaVr5NIr6jbKYACdGfvd
-yVC5zVVBDajvvkwY/NuhGNk=
-=5H+0
+iD8DBQFER+uFI1lqEGTUzyQRAqeUAJ9tygpNPvj5vSDbBBN6sIJ+kIH/TQCgsfcc
+rs2+0SGPXYFTvLTP6q+2Zxg=
+=lUz+
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat-gnome/files/0.10-libnotify-libsexy-configure.patch b/net-irc/xchat-gnome/files/0.10-libnotify-libsexy-configure.patch
new file mode 100644
index 000000000000..b4be5330749c
--- /dev/null
+++ b/net-irc/xchat-gnome/files/0.10-libnotify-libsexy-configure.patch
@@ -0,0 +1,55 @@
+diff -Nur xchat-gnome-0.10.orig/configure.ac xchat-gnome-0.10/configure.ac
+--- xchat-gnome-0.10.orig/configure.ac	2006-03-02 21:23:29.268163000 +0000
++++ xchat-gnome-0.10/configure.ac	2006-03-02 21:31:37.000000000 +0000
+@@ -110,24 +110,39 @@
+ 
+ AM_CONDITIONAL([ENABLE_DBUS],[test "x$dbus" = "xyes"])
+ 
++AC_ARG_ENABLE([libsexy],
++	AS_HELP_STRING([--enable-libsexy],[Enable libsexy support]),
++	[enable_libsexy=$enableval libsexy=$enableval],
++	[enable_libsexy=no libsexy=no])
++
+ # libsexy soft dependency
+-PKG_CHECK_MODULES([LIBSEXY], [libsexy >= $LIBSEXY_REQUIRED], libsexy=yes, libsexy=no)
+-AC_SUBST([LIBSEXY_CFLAGS])
+-AC_SUBST([LIBSEXY_LIBS])
++if test "x$enable_libsexy" = "xyes"; then
++	PKG_CHECK_MODULES([LIBSEXY], [libsexy >= $LIBSEXY_REQUIRED], libsexy=yes, libsexy=no)
++	AC_SUBST([LIBSEXY_CFLAGS])
++	AC_SUBST([LIBSEXY_LIBS])
++fi
++
+ AM_CONDITIONAL([ENABLE_LIBSEXY],[test "x$libsexy" = "xyes"])
+-if test "x$libsexy" = xyes; then
+-	AC_DEFINE(HAVE_LIBSEXY, 1, [Enable libsexy])
+-else
+-	AC_MSG_WARN([Library requirements (libsexy >= $LIBSEXY_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])
++
++if test "x$enable_libsexy" = "xyes" && test "x$libsexy" != "xyes"; then
++	AC_MSG_ERROR([libsexy not found])
+ fi
+ 
++AC_ARG_ENABLE([libnotify],
++	AS_HELP_STRING([--enable-libnotify],[Enable libnotify support]),
++	[enable_libnotify=$enableval libnotify=$enableval],
++	[enable_libnotify=no libnotify=no])
++
+ # libnotify soft dependency
+-PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED], libnotify=yes, libnotify=no)
+-AC_SUBST([LIBNOTIFY_CFLAGS])
+-AC_SUBST([LIBNOTIFY_LIBS])
++if test "x$enable_libnotify" = "xyes"; then
++	PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED], libnotify=yes, libnotify=no)
++	AC_SUBST([LIBNOTIFY_CFLAGS])
++	AC_SUBST([LIBNOTIFY_LIBS])
++fi
++
+ AM_CONDITIONAL([ENABLE_LIBNOTIFY],[test "x$libnotify" = "xyes"])
+-if test "x$libnotify" = xyes; then
+-	AC_MSG_WARN([Library requirements (libnotify >= $LIBNOTIFY_REQUIRED) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.])
++if test "x$enable_libnotify" = "xyes" && test "x$libnotify" != "xyes"; then
++	AC_MSG_ERROR([libnotify not found])
+ fi
+ 
+ # GConf
diff --git a/net-irc/xchat-gnome/files/digest-xchat-gnome-0.10 b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.10
new file mode 100644
index 000000000000..70a809859821
--- /dev/null
+++ b/net-irc/xchat-gnome/files/digest-xchat-gnome-0.10
@@ -0,0 +1,3 @@
+MD5 1ff2b7adfc71592951ee843599a8c8f7 xchat-gnome-0.10.tar.bz2 1294339
+RMD160 97fdb6b6222c4a03c7df5a261050ec94ee62bef5 xchat-gnome-0.10.tar.bz2 1294339
+SHA256 042301c1797e1578c6cd655821f41230ce6ac24fcb7f9fc7c44323c76e63b027 xchat-gnome-0.10.tar.bz2 1294339
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.10.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.10.ebuild
new file mode 100644
index 000000000000..82c821a20a66
--- /dev/null
+++ b/net-irc/xchat-gnome/xchat-gnome-0.10.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.10.ebuild,v 1.4 2006/04/20 20:13:43 swegener Exp $
+
+inherit gnome2 eutils autotools
+
+DESCRIPTION="GNOME frontend for the popular X-Chat IRC client"
+HOMEPAGE="http://xchat-gnome.navi.cx/"
+SRC_URI="http://releases.navi.cx/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="perl tcltk python ssl mmx ipv6 nls dbus libsexy libnotify spell"
+
+RDEPEND=">=dev-libs/glib-2.8.0
+	>=gnome-base/libgnome-2
+	>=gnome-base/gconf-2.8.0
+	>=gnome-base/libgnomeui-2.6.0
+	>=gnome-base/libglade-2.3.0
+	>=gnome-base/gnome-vfs-2.9.2
+	>=x11-libs/gtk+-2.8.0
+	spell? ( app-text/gtkspell )
+	ssl? ( >=dev-libs/openssl-0.9.6d )
+	perl? ( >=dev-lang/perl-5.6.1 )
+	python? ( dev-lang/python )
+	tcltk? ( dev-lang/tcl )
+	dbus? ( >=sys-apps/dbus-0.35 )
+	libsexy? ( >=x11-libs/libsexy-0.1.4 )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )"
+
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	>=dev-util/pkgconfig-0.7
+	>=app-text/gnome-doc-utils-0.3.2
+	nls? ( sys-devel/gettext )"
+
+# gnome-base/gnome-common is temporarily needed for re-creating configure
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/0.10-libnotify-libsexy-configure.patch
+
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf \
+		--enable-gnomefe \
+		--enable-shm \
+		--disable-schemas-install \
+		--disable-scrollkeeper \
+		$(use_enable ssl openssl) \
+		$(use_enable perl) \
+		$(use_enable python) \
+		$(use_enable tcltk tcl) \
+		$(use_enable mmx) \
+		$(use_enable ipv6) \
+		$(use_enable dbus) \
+		$(use_enable nls) \
+		$(use_enable libsexy) \
+		$(use_enable libnotify) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	USE_DESTDIR="1" gnome2_src_install || die "gnome2_src_install failed"
+
+	# install plugin development header
+	insinto /usr/include/xchat-gnome
+	doins src/common/xchat-plugin.h || die "doins failed"
+
+	dodoc AUTHORS ChangeLog NEWS || die "dodoc failed"
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_scrollkeeper_update
+}
diff --git a/net-irc/xchat-gnome/xchat-gnome-0.11.ebuild b/net-irc/xchat-gnome/xchat-gnome-0.11.ebuild
index 9f736384da37..0b7cf1541d1a 100644
--- a/net-irc/xchat-gnome/xchat-gnome-0.11.ebuild
+++ b/net-irc/xchat-gnome/xchat-gnome-0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.11.ebuild,v 1.1 2006/04/17 19:51:50 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-gnome/xchat-gnome-0.11.ebuild,v 1.2 2006/04/20 20:13:43 swegener Exp $
 
 inherit gnome2 eutils autotools
 
@@ -13,21 +13,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="perl tcltk python ssl mmx ipv6 nls dbus libsexy libnotify spell"
 
-RDEPEND=">=dev-libs/glib-2.0.3
-	>=gnome-base/libgnome-2
-	>=gnome-base/gconf-2
-	>=gnome-base/libgnomeui-2
-	>=gnome-base/libglade-2
-	>=gnome-base/gnome-vfs-2
-	>=x11-libs/gtk+-2.8
+RDEPEND=">=dev-libs/glib-2.8.0
+	>=gnome-base/libgnome-2.13
+	>=gnome-base/gconf-2.8.0
+	>=gnome-base/libgnomeui-2.6.0
+	>=gnome-base/libglade-2.3.0
+	>=gnome-base/gnome-vfs-2.9.2
+	>=x11-libs/gtk+-2.8.0
 	spell? ( app-text/gtkspell )
 	ssl? ( >=dev-libs/openssl-0.9.6d )
 	perl? ( >=dev-lang/perl-5.6.1 )
 	python? ( dev-lang/python )
 	tcltk? ( dev-lang/tcl )
 	dbus? ( >=sys-apps/dbus-0.35 )
-	libsexy? ( x11-libs/libsexy )
-	libnotify? ( x11-libs/libnotify )"
+	libsexy? ( >=x11-libs/libsexy-0.1.7 )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )"
 
 DEPEND="${RDEPEND}
 	gnome-base/gnome-common