diff options
| -rw-r--r-- | x11-misc/bmpanel/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/bmpanel/Manifest | 6 | ||||
| -rw-r--r-- | x11-misc/bmpanel/bmpanel-0.9.27-r1.ebuild (renamed from x11-misc/bmpanel/bmpanel-0.9.27.ebuild) | 25 | ||||
| -rw-r--r-- | x11-misc/bmpanel/files/Makefile-no-strip.patch | 12 | ||||
| -rw-r--r-- | x11-misc/bmpanel/files/Makefile.patch | 14 |
5 files changed, 34 insertions, 32 deletions
diff --git a/x11-misc/bmpanel/ChangeLog b/x11-misc/bmpanel/ChangeLog index 0ec11eb9d..12a2eed1b 100644 --- a/x11-misc/bmpanel/ChangeLog +++ b/x11-misc/bmpanel/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for x11-misc/bmpanel -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 15 Feb 2009; Christian Ruppert (idl0r) <spooky85@gmail.com> + -bmpanel-0.9.27.ebuild, +bmpanel-0.9.27-r1.ebuild, +files/Makefile.patch, + -files/Makefile-no-strip.patch: + revision bump, added as-needed fix (merged together with the no-strip + patch), added missing die statements, do not force one of the libev* + packages (event loop from glibc would be default) + 27 Oct 2008; Mounir Lamouri (volkmar) <mounir.lamouri@gmail.com> bmpanel-0.9.27.ebuild: Add ~ppc keyword diff --git a/x11-misc/bmpanel/Manifest b/x11-misc/bmpanel/Manifest index b25f13c1c..f431564b9 100644 --- a/x11-misc/bmpanel/Manifest +++ b/x11-misc/bmpanel/Manifest @@ -1,5 +1,5 @@ -AUX Makefile-no-strip.patch 326 RMD160 2930f6e468be1bc9e0fddc85f0822a031be1a133 SHA1 8037d1dd8d597d442f3c6b249041a5357e3337cb SHA256 49f8e25e6549d37dbc110ead7e3d601bb1e95cde2da2aaf273401f33bc808aa7 +AUX Makefile.patch 393 RMD160 f096153259031381ce65d9b15cd55c3bbcf4263e SHA1 c2ae5efa7f3edb89e7b813cc6bb7c907eec4b6ac SHA256 f02cfbad60f03cd8e0e638c71276184767167191a620db393dbb79337489d523 DIST bmpanel-0.9.27.tar.gz 30638 RMD160 97198480c6c9084cb2b32d05c3ca021811353134 SHA1 c048fbea3eb4f3f70f1086e23c338cdee2dec0b6 SHA256 a6976d024800b878117161174cc6ca57b21b2462666e75111cdd32eea8464557 -EBUILD bmpanel-0.9.27.ebuild 1481 RMD160 a6a909c35062196761e7beb1a9ce89148c7d9b7a SHA1 a09cea300e1e681ffe33aef8e76604ff925d5ff4 SHA256 7827f8b162727850ab6a5908e0453e5d5a61900558d035f50c71553d9b81e9f8 -MISC ChangeLog 536 RMD160 d634bf0ef5abcf650e3829293e9d5479da8da2db SHA1 06bd9b60742451915f2939c2a61f87bbe030e534 SHA256 472e89d1af4a3f2e8559176726bb6ac4d0fc954c29ccd15ee64357694806618a +EBUILD bmpanel-0.9.27-r1.ebuild 1304 RMD160 3749dea3442f017aa9de2d42d177a8b05fc29585 SHA1 72d88f153a6164673201ec96ff99e4e09a70c09c SHA256 a41487edf5dfa1566a94522e35223f0483ba2b8bb72c8ca6509470be7c2f4162 +MISC ChangeLog 904 RMD160 6cef680591f0103fdefbc1db84d8d4c7e3979375 SHA1 502f9fb554850f01336144e062a6dd179f626160 SHA256 906cd4038b66c3dbf6e7fa7389b3d0f18d1bfa7e6b9c50d0c08a0d2f2571cd4f MISC metadata.xml 318 RMD160 3c2ef6651b1c4a1bf23c445ddb0072e602baaaa5 SHA1 b596897d814c18a09420ee5662189b39be68f86e SHA256 4c9b660e1620b770980130fe40148b41c62f1d9886a3a8c6ef468034dd21b273 diff --git a/x11-misc/bmpanel/bmpanel-0.9.27.ebuild b/x11-misc/bmpanel/bmpanel-0.9.27-r1.ebuild index 68df46ed5..94fee0ebc 100644 --- a/x11-misc/bmpanel/bmpanel-0.9.27.ebuild +++ b/x11-misc/bmpanel/bmpanel-0.9.27-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ @@ -6,7 +6,7 @@ EAPI="1" inherit eutils -DESCRIPTION="BMPanel (BitMap Panel) is a lightweight, NETWM compliant panel for +DESCRIPTION="a lightweight, NETWM compliant panel for X11 Window System." HOMEPAGE="http://nsf.110mb.com/bmpanel" SRC_URI="http://nsf.110mb.com/${PN}/${P}.tar.gz" @@ -23,42 +23,35 @@ RDEPEND=">=media-libs/imlib2-1.4.0 x11-libs/libXcomposite x11-libs/libXfixes media-libs/fontconfig - libev? ( dev-libs/libev ) + libev? ( dev-libs/libev ) libevent? ( dev-libs/libevent )" DEPEND="${RDEPEND} dev-util/pkgconfig" -pkg_setup() { - # event loop stuff in glibc-2.8_p20080602 seems to be broken - if ! use libev && ! use libevent ; then - eerror "you need at least the libev or libevent useflag" - die "no libev or libevent useflag defined" - fi -} - src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/Makefile-no-strip.patch" + epatch "${FILESDIR}/Makefile.patch" } src_compile() { # the provided configure script is broken. - # it doesn't provide --disable-foo etc. so we can't use econf here. + # it doesn't provide --disable-foo, --host etc. so we can't use econf here. local myconf="--prefix=/usr --ugly" use debug && myconf="${myconf} --debug" use libev && myconf="${myconf} --with-ev" use libevent && myconf="${myconf} --with-event" - ./configure ${myconf} || die "configure failed" - + einfo "./configure ${myconf}" + ./configure ${myconf} emake || die "emake failed" } src_install() { emake install DESTDIR="${D}" || die "emake install failed" - dodoc AUTHORS README + # INSTALL contains some useful informations + dodoc AUTHORS INSTALL README || die "dodoc failed" } diff --git a/x11-misc/bmpanel/files/Makefile-no-strip.patch b/x11-misc/bmpanel/files/Makefile-no-strip.patch deleted file mode 100644 index 6bcce37fb..000000000 --- a/x11-misc/bmpanel/files/Makefile-no-strip.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- src/Makefile.old 2008-10-20 19:11:34.000000000 +0200 -+++ src/Makefile 2008-10-20 19:11:41.000000000 +0200 -@@ -13,9 +13,6 @@ endif - - $(APP): $(OBJS) - $(V_L)$(LD) $(LIBS) -o $@ $(OBJS) --ifeq ($(DEBUG),0) -- $(V_S)strip -s $(APP) --endif - - $(BUILDDIR)/src/%.o: src/%.c .mk/config.mk - $(V_C)$(CC) -c -MMD $(CFLAGS) $< -o $@ diff --git a/x11-misc/bmpanel/files/Makefile.patch b/x11-misc/bmpanel/files/Makefile.patch new file mode 100644 index 000000000..d9cdc8308 --- /dev/null +++ b/x11-misc/bmpanel/files/Makefile.patch @@ -0,0 +1,14 @@ +--- src/Makefile.old 2009-02-15 16:12:16.750885874 +0100 ++++ src/Makefile 2009-02-15 16:16:24.560106442 +0100 +@@ -12,10 +12,7 @@ ifneq ($(UGLY),1) + endif + + $(APP): $(OBJS) +- $(V_L)$(LD) $(LIBS) -o $@ $(OBJS) +-ifeq ($(DEBUG),0) +- $(V_S)strip -s $(APP) +-endif ++ $(V_L)$(LD) $(LDFLAGS) -o $@ $(OBJS) $(LIBS) + + $(BUILDDIR)/src/%.o: src/%.c .mk/config.mk + $(V_C)$(CC) -c -MMD $(CFLAGS) $< -o $@ |