summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-01-14 16:22:48 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-01-14 16:22:48 +0000
commite5ed003eb510ffa31eac972cde0c6e914982d47f (patch)
tree06ff11026dcbb96ee8a7ead93d697022831866db /x11-misc
parentMarking rspec-1.3.0 ~ppc for bug 300739 (diff)
downloadhistorical-e5ed003eb510ffa31eac972cde0c6e914982d47f.tar.gz
historical-e5ed003eb510ffa31eac972cde0c6e914982d47f.tar.bz2
historical-e5ed003eb510ffa31eac972cde0c6e914982d47f.zip
Fix building with -Wl,--as-needed wrt #248577, thanks to Kacper Kowalik for patch.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/peksystray/ChangeLog9
-rw-r--r--x11-misc/peksystray/Manifest8
-rw-r--r--x11-misc/peksystray/files/peksystray-0.4.0-asneeded.patch36
-rw-r--r--x11-misc/peksystray/files/peksystray-0.4.0-ldadd.patch30
-rw-r--r--x11-misc/peksystray/peksystray-0.3.0.ebuild30
-rw-r--r--x11-misc/peksystray/peksystray-0.4.0.ebuild20
6 files changed, 55 insertions, 78 deletions
diff --git a/x11-misc/peksystray/ChangeLog b/x11-misc/peksystray/ChangeLog
index f260557f85ec..c3e9a8aeac30 100644
--- a/x11-misc/peksystray/ChangeLog
+++ b/x11-misc/peksystray/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-misc/peksystray
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/ChangeLog,v 1.18 2007/08/08 10:08:17 omp Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/ChangeLog,v 1.19 2010/01/14 16:22:47 ssuominen Exp $
+
+ 14 Jan 2010; Samuli Suominen <ssuominen@gentoo.org>
+ peksystray-0.4.0.ebuild, +files/peksystray-0.4.0-asneeded.patch:
+ Fix building with -Wl,--as-needed wrt #248577, thanks to Kacper Kowalik
+ for patch.
08 Aug 2007; David Shakaryan <omp@gentoo.org>
+files/peksystray-0.4.0-ldadd.patch, peksystray-0.4.0.ebuild:
diff --git a/x11-misc/peksystray/Manifest b/x11-misc/peksystray/Manifest
index 4909b5e67abf..df8de4aaed23 100644
--- a/x11-misc/peksystray/Manifest
+++ b/x11-misc/peksystray/Manifest
@@ -1,9 +1,7 @@
-AUX peksystray-0.4.0-ldadd.patch 1133 RMD160 aed32513480cf2dbe91df1dcd08d901f2bd796dd SHA1 5efa02304f457618a96c761b252d689ccaf923a3 SHA256 4da272398f6e1276a296b216aa092c68a589f94fdcbbdb8443fd5c373f964fe3
+AUX peksystray-0.4.0-asneeded.patch 790 RMD160 a72a2bbbabec3012da6758e1c1ecae47ea73c5c1 SHA1 1e72eacef5eb534ae3eab17a211280a40f6177e4 SHA256 e0e7d4101dccf80f081ccdda3d64a4a77de36be49a06dc6b68e02b6fdcc4b13b
DIST peksystray-0.2.1.tar.gz 70261 RMD160 938ac6b50b28a2f9a85d620093dbef2c7fcbe38d SHA1 df681afc484ed7e00cedfa57a3d989af9010967d SHA256 1642322c50c893467c0e48ed0ced258e17e0df5c2f0415d6dcf4fe906f530793
-DIST peksystray-0.3.0.tar.gz 71344 RMD160 3293cacb5f2e901892556710064ac808b9c72ab6 SHA1 976ae9e7331fe203eb3d2f1744f93f6c52899d65 SHA256 89a1fdabee7ae9fdc079b0aee79ecade2d41438d2f41a321f1df5492d6e22ee5
DIST peksystray-0.4.0.tar.bz2 73810 RMD160 da5184ae963ece837545cb2e37352902890adda6 SHA1 560ed191a37c89ca2f1eab6859f159ee38acc4e7 SHA256 30733b349bc7919171a6fa31023c8704eaae9158084a5210d49aa3210123a778
EBUILD peksystray-0.2.1.ebuild 713 RMD160 b75c217a962a08914aac95b4b5fa304a1fcbd1ba SHA1 3c0aeebae615cdbefd81a3fc9d2e7bcc2a6f2948 SHA256 98079b3bd98122bdb61d22e9bdf00b35ac891e5ebc0dac85272fe2bcf29953ce
-EBUILD peksystray-0.3.0.ebuild 744 RMD160 089dae5fe44c23502118b23f8867f69892581002 SHA1 439c5dd442fa3315c51c4d70c1ffc946230d2923 SHA256 b9548d9f5074208ab341f42b8ce2851762081f3ccc30d77c07bdd9c087402070
-EBUILD peksystray-0.4.0.ebuild 719 RMD160 2dd873b3368b4716495312aa01eed4b85a31fd58 SHA1 72cd402ec91f9b72cd4acf5b4a84947f6bb1122b SHA256 6b7ce77a9a98df20b514a2a182a9a8b9a6514920626aacf0c0d33937ae7e0008
-MISC ChangeLog 2487 RMD160 693a74f275a7988307885169a7b88949b16fe935 SHA1 9c1d437b89d5065f9b94f0f7e134c02edf749c14 SHA256 e68ca44882ae79800133fda966cc6e41c4dd0c71be6acb7b382769e20e04f59a
+EBUILD peksystray-0.4.0.ebuild 720 RMD160 5a03e552ec50d1983bce954245bab5027a4300de SHA1 3250e1fead6bb7f51439a968fa14feeaf358ad37 SHA256 37d894abe7d33eccd47abf3cbacf1481deb0c2bf594799ba7b096fbe618294a0
+MISC ChangeLog 2702 RMD160 4e456bd261174196a27967d272452d42d4411cb4 SHA1 cb85be0c1e5dc835d81c33399a94b9542780e605 SHA256 8ebeb37ae9ff17d5a606c1580da0a3787bae2626c7635326dce7d11b0b12e0f2
MISC metadata.xml 163 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 SHA1 8be4981b79174c7879a386bd8e0fd4609ad9d41f SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797
diff --git a/x11-misc/peksystray/files/peksystray-0.4.0-asneeded.patch b/x11-misc/peksystray/files/peksystray-0.4.0-asneeded.patch
new file mode 100644
index 000000000000..1fc376a8ac92
--- /dev/null
+++ b/x11-misc/peksystray/files/peksystray-0.4.0-asneeded.patch
@@ -0,0 +1,36 @@
+--- configure.in
++++ configure.in
+@@ -4,6 +4,7 @@
+ AM_INIT_AUTOMAKE(peksystray, 0.4.0)
+
+ AC_PROG_CC
++AC_PATH_X
+ AC_PATH_XTRA
+
+ dnl Are we going to enable the debugging output ??
+@@ -19,13 +20,7 @@
+ AC_DEFINE(DEBUG,,[Enable verbose debugging output])
+ fi
+
+-CFLAGS="$CFLAGS $X_CFLAGS"
+-#x_includes="-I$x_includes"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+-#x_libraries="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
+-
+-AC_SUBST(x_includes)
+-AC_SUBST(x_libraries)
++AC_CHECK_LIB([X11], [XOpenDisplay])
+
+ AC_OUTPUT([
+ Makefile
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -1,7 +1,4 @@
+ bin_PROGRAMS = peksystray
+
+-INCLUDES = @x_includes@
+-
+-peksystray_LDADD = @x_libraries@
+-
+ peksystray_SOURCES = peksystray.c
++peksystray_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
diff --git a/x11-misc/peksystray/files/peksystray-0.4.0-ldadd.patch b/x11-misc/peksystray/files/peksystray-0.4.0-ldadd.patch
deleted file mode 100644
index 4f867d36fe1d..000000000000
--- a/x11-misc/peksystray/files/peksystray-0.4.0-ldadd.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -u -Nr peksystray-0.4.0.orig/src/Makefile.am peksystray-0.4.0/src/Makefile.am
---- peksystray-0.4.0.orig/src/Makefile.am 2003-06-13 22:06:23.000000000 -0400
-+++ peksystray-0.4.0/src/Makefile.am 2007-08-05 15:06:47.000000000 -0400
-@@ -2,6 +2,4 @@
-
- INCLUDES = @x_includes@
-
--peksystray_LDADD = @x_libraries@
--
- peksystray_SOURCES = peksystray.c
-diff -u -Nr peksystray-0.4.0.orig/src/Makefile.in peksystray-0.4.0/src/Makefile.in
---- peksystray-0.4.0.orig/src/Makefile.in 2007-01-05 18:16:38.000000000 -0500
-+++ peksystray-0.4.0/src/Makefile.in 2007-08-05 15:07:02.000000000 -0400
-@@ -146,7 +146,6 @@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
- INCLUDES = @x_includes@
--peksystray_LDADD = @x_libraries@
- peksystray_SOURCES = peksystray.c
- all: all-am
-
-@@ -206,7 +205,7 @@
- -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
- peksystray$(EXEEXT): $(peksystray_OBJECTS) $(peksystray_DEPENDENCIES)
- @rm -f peksystray$(EXEEXT)
-- $(LINK) $(peksystray_LDFLAGS) $(peksystray_OBJECTS) $(peksystray_LDADD) $(LIBS)
-+ $(LINK) $(peksystray_LDFLAGS) $(peksystray_OBJECTS) $(LIBS)
-
- mostlyclean-compile:
- -rm -f *.$(OBJEXT)
diff --git a/x11-misc/peksystray/peksystray-0.3.0.ebuild b/x11-misc/peksystray/peksystray-0.3.0.ebuild
deleted file mode 100644
index bc14d6d5e8c3..000000000000
--- a/x11-misc/peksystray/peksystray-0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/peksystray-0.3.0.ebuild,v 1.4 2007/07/22 03:52:10 omp Exp $
-
-inherit multilib
-
-DESCRIPTION="A system tray dockapp for window managers supporting docking"
-HOMEPAGE="http://sourceforge.net/projects/peksystray/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
- x11-libs/libXt"
-DEPEND="${RDEPEND}"
-
-src_compile() {
- econf --x-libraries=/usr/$(get_libdir) || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
-
- dobin src/peksystray
- dodoc AUTHORS NEWS README THANKS TODO
-
-}
diff --git a/x11-misc/peksystray/peksystray-0.4.0.ebuild b/x11-misc/peksystray/peksystray-0.4.0.ebuild
index d40454f787a4..3a6c23c5f800 100644
--- a/x11-misc/peksystray/peksystray-0.4.0.ebuild
+++ b/x11-misc/peksystray/peksystray-0.4.0.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2007 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/peksystray/peksystray-0.4.0.ebuild,v 1.2 2007/08/08 10:08:17 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/peksystray/peksystray-0.4.0.ebuild,v 1.3 2010/01/14 16:22:47 ssuominen Exp $
-inherit eutils
+EAPI=2
+inherit autotools eutils
DESCRIPTION="A system tray dockapp for window managers supporting docking"
HOMEPAGE="http://peksystray.sourceforge.net/"
@@ -13,18 +14,15 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~ppc ~x86"
IUSE=""
-RDEPEND="x11-libs/libX11
+DEPEND="x11-libs/libX11
x11-libs/libXt"
-DEPEND="${RDEPEND}"
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-ldadd.patch"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-asneeded.patch
+ eautoreconf
}
src_install() {
- dobin src/peksystray
+ dobin src/peksystray || die
dodoc AUTHORS ChangeLog NEWS README REFS THANKS TODO
}