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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 28 insertions, 56 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/Manifest b/x11-misc/xpad/Manifest
index b54568b1e9c2..f7699774e375 100644
--- a/x11-misc/xpad/Manifest
+++ b/x11-misc/xpad/Manifest
@@ -1,8 +1,16 @@
-DIST xpad-2.14.tar.bz2 221859 RMD160 60854a2fd8ebb4689560c6037325da1e8ec6d361 SHA1 c4c71216d6834a69df3fae9de14ac3fee19ea27c SHA256 20534234aa4eb448d6b8ae8c296463b259a56c8df2a069e82653fc3b1b8ae89a
-DIST xpad-3.0.tar.bz2 206398 RMD160 2ac278781f46c5163ed2944153297c651df8cbc0 SHA1 b108ff2cf8af9273621368bd486be1b6965930a1 SHA256 3123798c73e0b23aa9c099337786eb44bedaac86deb32f76f5f0c124b178cddd
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST xpad-4.0.tar.bz2 180340 RMD160 f0c571452463f6fcdbd4912e2ce178baa321eca8 SHA1 9d9c7c5ed6feb8aac97fc48bfcd662c3b0dbcba5 SHA256 d75df85777f237b64e9a2248a637e381ee976cb7e8eb91150e8984d099df7796
-EBUILD xpad-2.14.ebuild 685 RMD160 f5cc3f30643eb4f15d231deaf8c658a332dff244 SHA1 24320e82790b9191d6eae537212062ec57047ea1 SHA256 4a7c48a183680c9b918619ee64f4b85bdcc23548937f384fcec72943c723b0b0
-EBUILD xpad-3.0.ebuild 712 RMD160 78814b7c0e5a74a3095fcd0bdbcfb458c9fb0798 SHA1 a590f16e34fa02676aad57c6f1010f3b4f5c5fa9 SHA256 72b7c017afa4ebfdbc5957e5ab810e31a915fdf2ba72256d5bd519270f216acf
-EBUILD xpad-4.0.ebuild 710 RMD160 ddda026121d3a0300f4336ccdfb1d10191dde4a1 SHA1 057e6ab3c3f6d566b78c77902237d09d58766cf6 SHA256 d68c1f34ac998b23e94353f1c9e048a34f2a91529ff5b64f06002369c492b4bb
-MISC ChangeLog 8744 RMD160 a9ec9b051831ba0f0cc9e0ffe52d7f970d5470de SHA1 ec88d324db0818a21b8207011ac38e5b2e2f3436 SHA256 908eb5c2383778c7e48e3256547c56a54a796f9d6946d4a964649327ee7ccc80
+EBUILD xpad-4.0.ebuild 809 RMD160 ca6f040d87f4258e7e041f898d1cc508c5b4fc34 SHA1 f73858c73d721f3b2c06aa6d8f12f03eaa63e597 SHA256 9e4e81c4feb50361791ea8ad437c0f3c9cda20fd3f041c9079f4c5cf72795b11
+MISC ChangeLog 8947 RMD160 f90942a4c88894e44fb9fbaf2dc65a10c034bd24 SHA1 8daac3593d87f4e897a1327b073b081e1bd03f6e SHA256 d8da4af8fba243f6e1f324cab59bce6816473b64a15333b202c2326169261d3c
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkxC4K0ACgkQIiMqcbOVdxS3HwP+NqRYNcVQXvW8CqWfL3VC93jE
+6ByGSmxgix8lWI35cSnjnNv5+AUEcRzzzO1ye0KnryMnL+88/fXA8EwVUvB9ppy6
+Fn9r+63Pst2vaCIm4/laNQ0NbPlwoQOke+ZTs1M/YCbmAnUbjo7DF2KnOe71lGNT
+Y6BIb5cZOnZnwOPaoNg=
+=SVXV
+-----END PGP SIGNATURE-----
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