Add patches needed for BSD, see bug #150550.

Package-Manager: portage-2.1.2_rc4-r1

diff --git a/app-editors/scite/ChangeLog b/app-editors/scite/ChangeLog
index d6580c2ad8674d042a55199ebd1be606b7b4bd5c..469e65000a011fef7ac99b8b1e5fb6c206f2afee 100644 (file)
--- a/app-editors/scite/ChangeLog
+++ b/app-editors/scite/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/scite
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.57 2006/11/04 19:03:07 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/ChangeLog,v 1.58 2006/12/27 10:58:57 nelchael Exp $
+
+  27 Dec 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/scite-1.71-install.patch, scite-1.71.ebuild:
+  Add patches needed for BSD, see bug #150550.
 
   04 Nov 2006; Krzysiek Pawlik <nelchael@gentoo.org> -scite-1.70.ebuild:
   Remove old version.

diff --git a/app-editors/scite/Manifest b/app-editors/scite/Manifest
index 82f742e38ad9b8a87cb1c1a0f8efca2bc5ddec35..6ab081a0a7356395ca0deeec533a2cfbf371b952 100644 (file)
--- a/app-editors/scite/Manifest
+++ b/app-editors/scite/Manifest
@@ -1,19 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX scite-1.71-install.patch 796 RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b SHA1 4867e253ae7831fdae2e0425441fee24c176d694 SHA256 c8e2a3ea36c43ffb9c3f8f7175f79f8a2e3f1eccef4323ba22571d198ebe2294
+MD5 95ea30a65640fb6a0149413208179d45 files/scite-1.71-install.patch 796
+RMD160 54e598b9ed974bcd24e8fe4ef46bf6f5c037356b files/scite-1.71-install.patch 796
+SHA256 c8e2a3ea36c43ffb9c3f8f7175f79f8a2e3f1eccef4323ba22571d198ebe2294 files/scite-1.71-install.patch 796
 AUX scite.desktop 169 RMD160 760e2de111a56d037265b748ad65c621c1607c3b SHA1 edc81249bbe84ccf6b7a57f4a80381b58896badf SHA256 c0db119fed9a790efa073595099147ebd3c928d195ae908f6618e2f2ccdd0bcc
 MD5 2561568c62ec3edc2b46be6638c80427 files/scite.desktop 169
 RMD160 760e2de111a56d037265b748ad65c621c1607c3b files/scite.desktop 169
 SHA256 c0db119fed9a790efa073595099147ebd3c928d195ae908f6618e2f2ccdd0bcc files/scite.desktop 169
 DIST scite171.tgz 1300416 RMD160 05a56af15b0c4e4a9c33b62d8bde4ea9feef4208 SHA1 5cc1cce7ab5dc7723f36306af6d6fff5d81bc68c SHA256 c84ba2fc252345e3d36d36f14b3ab43c6f20e0e7ee5c30d8560f938d505116e3
-EBUILD scite-1.71.ebuild 1775 RMD160 4fac70ada49607f5f525c5606991e9fdcc02cb1c SHA1 84fae33b8074dc4d82e710824adaccf86cd67c6e SHA256 96565df2a3fc2e6ec9406797dddc0ebe791ac7980c86f5cc58149d1af6f89038
-MD5 0e6b0b09125a8746299da40646971afa scite-1.71.ebuild 1775
-RMD160 4fac70ada49607f5f525c5606991e9fdcc02cb1c scite-1.71.ebuild 1775
-SHA256 96565df2a3fc2e6ec9406797dddc0ebe791ac7980c86f5cc58149d1af6f89038 scite-1.71.ebuild 1775
-MISC ChangeLog 9118 RMD160 8a5d9f8d548584b424bb46553810760992157ca8 SHA1 17cd469919e17b57eaba1f6782578a993fff017b SHA256 79ad41a576e8c093741117d8143f5269c53383dc5af7dce710b2c85707f302c0
-MD5 f2a7253c8aec9deb5ea52daad59de801 ChangeLog 9118
-RMD160 8a5d9f8d548584b424bb46553810760992157ca8 ChangeLog 9118
-SHA256 79ad41a576e8c093741117d8143f5269c53383dc5af7dce710b2c85707f302c0 ChangeLog 9118
+EBUILD scite-1.71.ebuild 1845 RMD160 48b6144c2a77987feb493f1f6de418556ab8055d SHA1 6adef682862f58abe2a3e802e01a749b576832b1 SHA256 5eb2c7f43e688abf1a28ebf8983f8287bc4e460a097958ac7c7f3d9a21a5ef86
+MD5 271e56ac9ffb70deb5859537b43c0c9d scite-1.71.ebuild 1845
+RMD160 48b6144c2a77987feb493f1f6de418556ab8055d scite-1.71.ebuild 1845
+SHA256 5eb2c7f43e688abf1a28ebf8983f8287bc4e460a097958ac7c7f3d9a21a5ef86 scite-1.71.ebuild 1845
+MISC ChangeLog 9273 RMD160 a4da6a6ff62382b4dab05b32faa548c5aeb71d65 SHA1 7cc82ff3d484ebad38f9aa73a587a70b8547a24b SHA256 1d572ec6cd1459a95de494c0e733b7c5ef5e929507286d004946e6819660fd5b
+MD5 9b65693f79a3fe790c980a23c5f4cab0 ChangeLog 9273
+RMD160 a4da6a6ff62382b4dab05b32faa548c5aeb71d65 ChangeLog 9273
+SHA256 1d572ec6cd1459a95de494c0e733b7c5ef5e929507286d004946e6819660fd5b ChangeLog 9273
 MISC metadata.xml 304 RMD160 809312aa3c6eb0e2b42bfe747cbafdcf21947ff1 SHA1 8523f14def71e343644655b7890f96e14864216c SHA256 a562714322c75636ca3a75c641035e41d6066319a292473fd1811fe7ac70d655
 MD5 013655633e03ee4396e6da8e45481935 metadata.xml 304
 RMD160 809312aa3c6eb0e2b42bfe747cbafdcf21947ff1 metadata.xml 304
@@ -22,9 +26,9 @@ MD5 b03a5ddc4e6aa3e006483fd93c3a299a files/digest-scite-1.71 220
 RMD160 74809b393f5d7c05a287074982cb79ed4f497cb9 files/digest-scite-1.71 220
 SHA256 1f3532c70d2d6c3b772f9e92b42d4c53c473a48b9b212dec9f58a4f210e24a40 files/digest-scite-1.71 220
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFTOP+go/w9rxVVVERAvspAJ9rX9xCJ8ECM01u/R+W0pKvGbPkOACfU1En
-p9GbqEweCkXkSS0k0YpoWLY=
-=yroR
+iD8DBQFFklIbgo/w9rxVVVERAjx/AKC/VYVq9P4gv2le1vWzVzcqS7dlsQCfe/3w
+e/I3PgSLDaegYCNkwg4qFXk=
+=EJaV
 -----END PGP SIGNATURE-----

diff --git a/app-editors/scite/files/scite-1.71-install.patch b/app-editors/scite/files/scite-1.71-install.patch
new file mode 100644 (file)
index 0000000..c1d8750
--- /dev/null
+++ b/app-editors/scite/files/scite-1.71-install.patch
@@ -0,0 +1,20 @@
+--- scite/gtk/makefile.orig    2006-10-09 06:26:55 -0300
++++ scite/gtk/makefile 2006-10-09 06:36:09 -0300
+@@ -123,11 +123,14 @@
+ 
+ ifdef gnomeprefix
+ ifdef GTK2
+-      $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
++      $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications/
++      $(INSTALL) -m 755 SciTE.desktop $(DESTDIR)$(datadir)/applications/
+ else
+-      $(INSTALL) -m 755 -D SciTE.desktop $(DESTDIR)$(datadir)/applications/SciTE.desktop
++      $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/applications/
++      $(INSTALL) -m 755 SciTE.desktop $(DESTDIR)$(datadir)/applications/
+ endif
+-      $(INSTALL) -m 644 -D Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
++      $(INSTALL) -m 644 -d $(DESTDIR)$(pixmapdir)/
++      $(INSTALL) -m 644 Sci48M.png $(DESTDIR)$(pixmapdir)/Sci48M.png
+ endif
+ 
+ uninstall:

diff --git a/app-editors/scite/scite-1.71.ebuild b/app-editors/scite/scite-1.71.ebuild
index a80028c31455e63b3d93ad084c0817643799fc69..74db186e1e234ef3822892de1bce8746061c6c18 100644 (file)
--- a/app-editors/scite/scite-1.71.ebuild
+++ b/app-editors/scite/scite-1.71.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.71.ebuild,v 1.6 2006/10/31 20:44:41 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/scite/scite-1.71.ebuild,v 1.7 2006/12/27 10:58:57 nelchael Exp $
 
-inherit toolchain-funcs
+inherit toolchain-funcs eutils
 
 MY_PV=${PV//./}
 DESCRIPTION="A very powerful editor for programmers"
@@ -39,7 +39,9 @@ src_unpack() {
                -e "s#^\(CXXFLAGS=.*\)-Os#\1#" \
                -e "s#^CC =\(.*\)#CC = $(tc-getCXX)#" \
                -e 's#${D}##' \
+               -e 's#-g root#-g 0#' \
                || die "error patching makefile"
+       epatch ${FILESDIR}/${P}-install.patch
 }
 
 src_compile() {