Treecleaner fixes for bug #159504 and bug #135842.
authorRyan Hill <rhill@gentoo.org>
Mon, 19 Feb 2007 00:50:31 +0000 (00:50 +0000)
committerRyan Hill <rhill@gentoo.org>
Mon, 19 Feb 2007 00:50:31 +0000 (00:50 +0000)
Package-Manager: portage-2.1.2-r9

x11-misc/fluxspace/ChangeLog
x11-misc/fluxspace/Manifest
x11-misc/fluxspace/files/digest-fluxspace-0.0.3 [deleted file]
x11-misc/fluxspace/files/fluxspace-0.0.3-gcc41.patch [new file with mode: 0644]
x11-misc/fluxspace/fluxspace-0.0.3-r1.ebuild
x11-misc/fluxspace/fluxspace-0.0.3.ebuild [deleted file]

index 203376ac37a34845c54b6dfd260d262f3dd172c8..d63567f99593af1582e11e8f0cbc49990a0e3a26 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/fluxspace
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fluxspace/ChangeLog,v 1.9 2007/02/09 06:19:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fluxspace/ChangeLog,v 1.10 2007/02/19 00:50:31 dirtyepic Exp $
+
+  19 Feb 2007; Ryan Hill <dirtyepic@gentoo.org>
+  +files/fluxspace-0.0.3-gcc41.patch, -fluxspace-0.0.3.ebuild,
+  fluxspace-0.0.3-r1.ebuild:
+  Treecleaner fixes for bug #159504 and bug #135842.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
index 228dbe1e919485a47edaaf91c02797b2a33f4b74..8a01481754d04d73b7196ae967f6ea3d85774e8c 100644 (file)
@@ -1,33 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX fluxspace-0.0.3-gcc41.patch 788 RMD160 98dded038429410bde703236159406261550d545 SHA1 be72b799a45ebd2749e414633ac602c7d55b593a SHA256 7f3d65ceee4f632d6ea558d0de427df4915b256ca8b4ffbf38ff67a7d0b68c86
+MD5 ee4ede9570d7a88f3ed3361b92f439ce files/fluxspace-0.0.3-gcc41.patch 788
+RMD160 98dded038429410bde703236159406261550d545 files/fluxspace-0.0.3-gcc41.patch 788
+SHA256 7f3d65ceee4f632d6ea558d0de427df4915b256ca8b4ffbf38ff67a7d0b68c86 files/fluxspace-0.0.3-gcc41.patch 788
 DIST fluxspace-0.0.3.tar.gz 2228750 RMD160 3e8aabdbff63c112037d35b540f85ef045e786b2 SHA1 29ae69384656c104ed202f7124d9bf881524eaf4 SHA256 37ccbb9b22736a2b7fd4e5c50216c513c6fbde2f108769e4796d2c53cedc8430
-EBUILD fluxspace-0.0.3-r1.ebuild 2001 RMD160 ee1c5956647a6e559b43cac81da453acbda21572 SHA1 0711efdac764025e6ec714c2e3202cdb9e9209c5 SHA256 41c8fe8d94fdb0ec81b8481588e9fe286f2d54e204c5bf37c532c594eb1852ef
-MD5 eff4c198be369b79d3f2e255a30ecc5a fluxspace-0.0.3-r1.ebuild 2001
-RMD160 ee1c5956647a6e559b43cac81da453acbda21572 fluxspace-0.0.3-r1.ebuild 2001
-SHA256 41c8fe8d94fdb0ec81b8481588e9fe286f2d54e204c5bf37c532c594eb1852ef fluxspace-0.0.3-r1.ebuild 2001
-EBUILD fluxspace-0.0.3.ebuild 1640 RMD160 0baae9d21c656f4e656577781daa5b9a22f45074 SHA1 72f4a4219d50a8d2b5e567c3e4d394ac99ec3c21 SHA256 c56d3263536203a114d881840268d3bc7d00602e0fde3612172bdf0e1b890a26
-MD5 8713151c3db41b691f8a46b6d71cdad1 fluxspace-0.0.3.ebuild 1640
-RMD160 0baae9d21c656f4e656577781daa5b9a22f45074 fluxspace-0.0.3.ebuild 1640
-SHA256 c56d3263536203a114d881840268d3bc7d00602e0fde3612172bdf0e1b890a26 fluxspace-0.0.3.ebuild 1640
-MISC ChangeLog 1749 RMD160 d9eabf9a8a7a4a2552eef38b88f3a3a66042357d SHA1 3211092a8388b48577cc65a4d2b60af4c7ca2d17 SHA256 6a53ce30d13db90cf4402e92563c7283f8544f51083abe06e956cdce88baf2c0
-MD5 3997ff23285d687a28c0ea801fea7ed4 ChangeLog 1749
-RMD160 d9eabf9a8a7a4a2552eef38b88f3a3a66042357d ChangeLog 1749
-SHA256 6a53ce30d13db90cf4402e92563c7283f8544f51083abe06e956cdce88baf2c0 ChangeLog 1749
+EBUILD fluxspace-0.0.3-r1.ebuild 1801 RMD160 0b50064b1048cd0f75b955a42f41e75393c8ed00 SHA1 eb7f718feb13c0bb91752e0834b6d65240ad84f5 SHA256 fd676b98d067a2af7cc7d9e8ac3e0d7460e4f784cd989a51ea672aa503069158
+MD5 199a7073f6a7ebc777f6d77b04f20422 fluxspace-0.0.3-r1.ebuild 1801
+RMD160 0b50064b1048cd0f75b955a42f41e75393c8ed00 fluxspace-0.0.3-r1.ebuild 1801
+SHA256 fd676b98d067a2af7cc7d9e8ac3e0d7460e4f784cd989a51ea672aa503069158 fluxspace-0.0.3-r1.ebuild 1801
+MISC ChangeLog 1944 RMD160 d10e1b748b3a03b2c84967eafd95cf96a82c7ea4 SHA1 b449499f950552af5160d5b0041d79d801735d8b SHA256 792c6dc668a6392b3c638119d2f044149bafd7189e07602142fb5de2c11e2f07
+MD5 f082276b4c55f677b9f611e011165048 ChangeLog 1944
+RMD160 d10e1b748b3a03b2c84967eafd95cf96a82c7ea4 ChangeLog 1944
+SHA256 792c6dc668a6392b3c638119d2f044149bafd7189e07602142fb5de2c11e2f07 ChangeLog 1944
 MISC metadata.xml 261 RMD160 1e207b28ded6366191914889a5902d36096722ee SHA1 44b1bc5d40e3330c7fb7976c91068b445b3bab0c SHA256 5ef94f395aec5a480f4fc26ac1365cee6393fd726505e4b394c35b226294f4f7
 MD5 38284a90537cf6233bcd9057bfb476bf metadata.xml 261
 RMD160 1e207b28ded6366191914889a5902d36096722ee metadata.xml 261
 SHA256 5ef94f395aec5a480f4fc26ac1365cee6393fd726505e4b394c35b226294f4f7 metadata.xml 261
-MD5 db398c6d44b2f291ebe68d7c38389ef1 files/digest-fluxspace-0.0.3 250
-RMD160 f6569300b91a572755ee23b44448caeab37490d8 files/digest-fluxspace-0.0.3 250
-SHA256 bcd0d5890e4ad8753cf19144cddcdf9b2ea114a80aec32b2ad993244e2310fc1 files/digest-fluxspace-0.0.3 250
 MD5 db398c6d44b2f291ebe68d7c38389ef1 files/digest-fluxspace-0.0.3-r1 250
 RMD160 f6569300b91a572755ee23b44448caeab37490d8 files/digest-fluxspace-0.0.3-r1 250
 SHA256 bcd0d5890e4ad8753cf19144cddcdf9b2ea114a80aec32b2ad993244e2310fc1 files/digest-fluxspace-0.0.3-r1 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFzBJbAiZjviIA2XgRAo8gAJ4xCFjOHuxy+TieQdu3lcyvww4XNgCdHa/v
-DDFQ/OKpGmg4fQYzv/jksKU=
-=4EXH
------END PGP SIGNATURE-----
diff --git a/x11-misc/fluxspace/files/digest-fluxspace-0.0.3 b/x11-misc/fluxspace/files/digest-fluxspace-0.0.3
deleted file mode 100644 (file)
index dedd974..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 70dd33a04aff85c25b5a7c30881cf026 fluxspace-0.0.3.tar.gz 2228750
-RMD160 3e8aabdbff63c112037d35b540f85ef045e786b2 fluxspace-0.0.3.tar.gz 2228750
-SHA256 37ccbb9b22736a2b7fd4e5c50216c513c6fbde2f108769e4796d2c53cedc8430 fluxspace-0.0.3.tar.gz 2228750
diff --git a/x11-misc/fluxspace/files/fluxspace-0.0.3-gcc41.patch b/x11-misc/fluxspace/files/fluxspace-0.0.3-gcc41.patch
new file mode 100644 (file)
index 0000000..4bfcd2d
--- /dev/null
@@ -0,0 +1,21 @@
+diff -Naur fluxspace-0.0.3-orig/src/PythonInterface.cc fluxspace-0.0.3/src/PythonInterface.cc
+--- fluxspace-0.0.3-orig/src/PythonInterface.cc        2002-11-22 00:24:42.000000000 -0600
++++ fluxspace-0.0.3/src/PythonInterface.cc     2007-02-18 18:22:35.000000000 -0600
+@@ -256,7 +256,7 @@
+ class PythonInterfaceModule
+ {
+   public:
+-    PythonInterfaceModule::PythonInterfaceModule(const string& name_, PyObject* config_)
++    PythonInterfaceModule(const string& name_, PyObject* config_)
+       : name(name_),
+         next(NULL),
+         module(name_),
+@@ -266,7 +266,7 @@
+         FSInitialize = new MyPyFunctionPtr(module.dict.GetItemString("fluxlet_main"));
+     }
+-    PythonInterfaceModule::~PythonInterfaceModule()
++    ~PythonInterfaceModule()
+     {
+         delete FSInitialize;
+     }
index e8f3951854b75ff1687a166bba1b82d82163d45c..f305465047b829a40644a929ec5d5abed99487cf 100644 (file)
@@ -1,6 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fluxspace/fluxspace-0.0.3-r1.ebuild,v 1.8 2005/09/03 22:06:26 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fluxspace/fluxspace-0.0.3-r1.ebuild,v 1.9 2007/02/19 00:50:31 dirtyepic Exp $
+
+inherit eutils
 
 IUSE=""
 DESCRIPTION="Enhancements for workspace management within Fluxbox."
@@ -16,11 +18,15 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ppc ~sparc x86"
 
-myconf="--prefix=/usr"
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch "${FILESDIR}"/${P}-gcc41.patch
+}
 
 src_compile() {
-       export LDFLAGS="-lstdc++"
-       econf ${myconf} || die "Configure failed"
+       econf || die "Configure failed"
        emake || die "Compile failed"
 }
 
@@ -34,26 +40,21 @@ src_install () {
 }
 
 pkg_postinst() {
-       # Fix typo in the config file
-       sed -e "s/no\"\\\/no\"\//g" /usr/share/fluxspace/examples/fluxspace.xml > /tmp/fluxspace.xml
-       cp -f /tmp/fluxspace.xml /usr/share/fluxspace/examples/fluxspace.xml
-       rm -f /tmp/fluxspace.xml
-
-       einfo " NOTES:"
-       einfo
-       einfo " 1. If you want to use the optional features for idesk and rox,"
-       einfo "    you must emerge them separately. (e.g., 'emerge idesk')"
-       einfo
-       einfo " 2. Copy /usr/share/fluxspace/examples/fluxspace.xml to"
-       einfo "    ~/.fluxbox and edit the file.  Change the settings from"
-       einfo "    \"no\" to \"yes\" depending on what features you want enabled."
-       einfo
-       einfo " 3. Edit ~/.fluxbox/init to 'turn on' fluxspace.  Change line:"
-       einfo "        session.screen0.rootCommand:"
-       einfo "    to..."
-       einfo "        session.screen0.rootCommand: fluxspace"
-       einfo
-       einfo " 4. Full documentation is available online at:"
-       einfo "    http://sourceforge.net/docman/display_doc.php?docid=16037&group_id=76737"
-       einfo
+       elog " NOTES:"
+       elog
+       elog " 1. If you want to use the optional features for idesk and rox,"
+       elog "    you must emerge them separately. (e.g., 'emerge idesk')"
+       elog
+       elog " 2. Copy /usr/share/fluxspace/examples/fluxspace.xml to"
+       elog "    ~/.fluxbox and edit the file.  Change the settings from"
+       elog "    \"no\" to \"yes\" depending on what features you want enabled."
+       elog
+       elog " 3. Edit ~/.fluxbox/init to 'turn on' fluxspace.  Change line:"
+       elog "        session.screen0.rootCommand:"
+       elog "    to..."
+       elog "        session.screen0.rootCommand: fluxspace"
+       elog
+       elog " 4. Full documentation is available online at:"
+       elog "    http://sourceforge.net/docman/display_doc.php?docid=16037&group_id=76737"
+       elog
 }
diff --git a/x11-misc/fluxspace/fluxspace-0.0.3.ebuild b/x11-misc/fluxspace/fluxspace-0.0.3.ebuild
deleted file mode 100644 (file)
index 0d854b8..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fluxspace/fluxspace-0.0.3.ebuild,v 1.6 2005/07/09 16:30:55 swegener Exp $
-
-IUSE=""
-DESCRIPTION="Enhancements for workspace management within Fluxbox."
-SRC_URI="http://www.isomedia.com/homes/stevencooper/files/${P}.tar.gz"
-HOMEPAGE="http://www.isomedia.com/homes/stevencooper/"
-DEPEND="x11-wm/fluxbox
-               x11-misc/idesk
-               rox-base/rox
-               media-libs/imlib2
-               dev-lang/python
-               dev-python/pyxml
-               dev-lang/swig"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-
-myconf="--prefix=/usr"
-
-src_compile() {
-       export LDFLAGS="-lstdc++"
-       econf ${myconf} || die
-       emake || die
-}
-
-src_install () {
-       einstall || die
-       dosym /usr/lib/python2.2/site-packages/fluxspace.py /usr/lib/python2.2/site-packages/fluxspace/__init__.py
-       dosym /usr/lib/libfluxspace.so /usr/lib/python2.2/site-packages/_fluxspace.so
-       dodoc README COPYING AUTHORS ChangeLog NEWS README TODO
-}
-
-pkg_postinst() {
-       # there is a typo in the xml file, so i'll fix it =)
-
-       sed -e "s/no\"\\\/no\"\//g" /usr/share/fluxspace/examples/fluxspace.xml > /tmp/fluxspace.xml
-       cp -f /tmp/fluxspace.xml /usr/share/fluxspace/examples/fluxspace.xml
-       rm -f /tmp/fluxspace.xml
-
-       einfo
-       einfo "  Copy /usr/share/fluxspace/examples/fluxspace.xml to your"
-       einfo "  ~/.fluxbox and edit it!"
-       einfo "  (just to make it work change all the \"no\" to \"yes\")"
-       einfo
-       einfo "  In your ~/.fluxbox/init change:"
-       einfo "                       session.screen0.rootCommand:"
-       einfo "  to:"
-       einfo "                       session.screen0.rootCommand:    fluxspace"
-       einfo
-}