Fix bug 326713. Thanks to sap@ausdruckswelt.de for the report and patch. Remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

4 files changed, 14 insertions, 50 deletions

diff --git a/x11-misc/xpad/ChangeLog b/x11-misc/xpad/ChangeLog
index aa6712ccb134..55c8936dfd6b 100644
--- a/x11-misc/xpad/ChangeLog
+++ b/x11-misc/xpad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/xpad
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xpad/ChangeLog,v 1.68 2009/10/10 16:24:22 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xpad/ChangeLog,v 1.69 2010/07/18 11:08:19 xarthisius Exp $
+
+  18 Jul 2010; Kacper Kowalik <xarthisius@gentoo.org> -xpad-2.14.ebuild,
+  -xpad-3.0.ebuild, xpad-4.0.ebuild:
+  Fix bug 326713. Thanks to sap@ausdruckswelt.de for the report and patch.
+  Remove old.
 
   10 Oct 2009; Raúl Porcel <armin76@gentoo.org> xpad-4.0.ebuild:
   sparc stable wrt #282313
diff --git a/x11-misc/xpad/xpad-2.14.ebuild b/x11-misc/xpad/xpad-2.14.ebuild
deleted file mode 100644
index 9c4fc0085489..000000000000
--- a/x11-misc/xpad/xpad-2.14.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xpad/xpad-2.14.ebuild,v 1.6 2009/03/21 17:05:58 armin76 Exp $
-
-DESCRIPTION="A GTK+ 2.0 based 'post-it' note system."
-HOMEPAGE="http://xpad.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.12"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.31
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
diff --git a/x11-misc/xpad/xpad-3.0.ebuild b/x11-misc/xpad/xpad-3.0.ebuild
deleted file mode 100644
index c19af054f80b..000000000000
--- a/x11-misc/xpad/xpad-3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xpad/xpad-3.0.ebuild,v 1.3 2009/03/18 19:52:35 gentoofan23 Exp $
-
-DESCRIPTION="A GTK+ 2.0 based 'post-it' note system."
-HOMEPAGE="http://mterry.name/xpad"
-SRC_URI="http://launchpad.net/${PN}/stable/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-libs/gtk+-2.12"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.31
-	dev-util/pkgconfig
-	sys-devel/gettext"
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
-}
diff --git a/x11-misc/xpad/xpad-4.0.ebuild b/x11-misc/xpad/xpad-4.0.ebuild
index 87cd31cf35df..e5a3bb0c075a 100644
--- a/x11-misc/xpad/xpad-4.0.ebuild
+++ b/x11-misc/xpad/xpad-4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xpad/xpad-4.0.ebuild,v 1.5 2009/10/10 16:24:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xpad/xpad-4.0.ebuild,v 1.6 2010/07/18 11:08:19 xarthisius Exp $
 
 EAPI=2
 
@@ -19,6 +19,11 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
+src_prepare() {
+	# bug 326713
+	sed -i '/"type", GTK_WINDOW_TOPLEVEL/d' src/xpad-pad.c || die
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README THANKS TODO