Remove duplicate savedconfig.eclass code.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

diff --git a/x11-misc/dmenu/ChangeLog b/x11-misc/dmenu/ChangeLog
index e28c56b7c0735d5a780ae3c09896043d1deb3b5a..4aca27461350d6d6c14a114b0a8e9f4787226a18 100644 (file)
--- a/x11-misc/dmenu/ChangeLog
+++ b/x11-misc/dmenu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/dmenu
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.60 2010/07/17 10:43:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.61 2010/07/17 10:49:21 jer Exp $
+
+  17 Jul 2010; Jeroen Roovers <jer@gentoo.org> dmenu-4.1.1.ebuild:
+  Remove duplicate savedconfig.eclass code.
 
   17 Jul 2010; Jeroen Roovers <jer@gentoo.org> dmenu-4.0.ebuild:
   Stable for HPPA too.

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 151d8c47e529ddb89e848a95cbb3790709655d21..541fa45f59ad2353723009e74e2f35193ff87e4f 100644 (file)
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -3,6 +3,6 @@ DIST dmenu-4.0.tar.gz 8576 RMD160 9292c516397b578a753b1ba6a87ce68135a465b6 SHA1
 DIST dmenu-4.1.1.tar.gz 9351 RMD160 3683f9dc620b16b39dc531e49402d37bec78f123 SHA1 5d41d9cbf68960863623d821962c31cac92d92fc SHA256 9e5f775ae62169520aeb5707f72f8a843552becf776abbd7bcb6ba11fd41e60a
 EBUILD dmenu-3.9.ebuild 1632 RMD160 36debc9080048ce2a639a063594e6adb823027bf SHA1 a50e56e60c0c328fde27b41801e03c567482217c SHA256 950595154c1c9c65ce35b126f5f53d6b5e238447e942a183558477005a2eaa03
 EBUILD dmenu-4.0.ebuild 1634 RMD160 a06aa5868bb24f2f5d7da215ef97e0415e0831ee SHA1 49927170bcba1e51c34406ee4ecfacccaab5e042 SHA256 f11037ef68738d7d1d681c864ff6d7b711314588ed7b921d5ebec4d8f9181c23
-EBUILD dmenu-4.1.1.ebuild 1636 RMD160 c4802711a942c84cefc301f03359af327944cca1 SHA1 5d61f44890c3e6ee604695894a03fed06d5ba468 SHA256 4d9fa2bb085101098372c1e2430f934f133c54cff5635c5493e69e65050a6b56
-MISC ChangeLog 6511 RMD160 803928e94b7fc5e423670048af789e3de7362360 SHA1 f777bf9760cc13e308fb5bf79cf2a9e0b7575d7f SHA256 193ddca66dfe3ddf4045ee1f35fef53c4383b54915e47c3b06e000096acb1cbb
+EBUILD dmenu-4.1.1.ebuild 1591 RMD160 191a3e1e62c3ae86e5010de02093793b8d0067a6 SHA1 ccfafacd51c4654ef2c22439f2149e71fdf66b50 SHA256 76e66b58207de1fec669feafcfd3950b1b5c7a6ceabaa4184b12867e02991f60
+MISC ChangeLog 6623 RMD160 48761d5f1a63361fe0f2ca50b520f925ae082bcc SHA1 80330d675a79140886498e59fea0dbf745689592 SHA256 187ebdb5890489c5345f26595cba18739975d68b4e80bcb4e531a9e93c06ae7d
 MISC metadata.xml 264 RMD160 4a42dacaf8b7d3d015cc213529aeebb4c14c00b1 SHA1 a3102166478c00c9fa25b067d0d6bb6c77b796db SHA256 7c5d86dda58d2fef2a5bbf9eb560745a6c0586224b8d9f941f6eaca9e1552c84

diff --git a/x11-misc/dmenu/dmenu-4.1.1.ebuild b/x11-misc/dmenu/dmenu-4.1.1.ebuild
index ae009466873f21662105aedfa76b81bdac6f183e..da2e2cab461047126cd5126a7b2b7805563ef0c7 100644 (file)
--- a/x11-misc/dmenu/dmenu-4.1.1.ebuild
+++ b/x11-misc/dmenu/dmenu-4.1.1.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-4.1.1.ebuild,v 1.1 2010/07/03 15:23:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-4.1.1.ebuild,v 1.2 2010/07/17 10:49:21 jer Exp $
 
-inherit toolchain-funcs savedconfig
+EAPI="2"
+
+inherit savedconfig toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
 HOMEPAGE="http://www.suckless.org/programs/dmenu.html"
@@ -17,10 +19,7 @@ DEPEND="x11-libs/libX11
        xinerama? ( x11-libs/libXinerama )"
 RDEPEND=${DEPEND}
 
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
+src_prepare() {
        sed -i \
                -e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall -g/" \
                -e "s/LDFLAGS = -s/LDFLAGS += -g/" \
@@ -28,9 +27,7 @@ src_unpack() {
                -e "s/XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
                config.mk || die "sed failed"
 
-       if use savedconfig; then
-               restore_config config.h
-       fi
+       restore_config config.h
 }
 
 src_compile() {