diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2010-09-29 09:51:35 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2010-09-29 09:51:35 +0000 |
| commit | c58f24dfedbef92cffccb2f602c18a1482139929 (patch) | |
| tree | 6a48da28738b5af61957871a6506aae8a895a212 | |
| parent | Fix install of missing documentation (bug #304619 by Flameeyes) and add prope... (diff) | |
| download | historical-c58f24dfedbef92cffccb2f602c18a1482139929.tar.gz historical-c58f24dfedbef92cffccb2f602c18a1482139929.tar.bz2 historical-c58f24dfedbef92cffccb2f602c18a1482139929.zip | |
Fix problem with empty backslashes, bug 339074, avoid automake maintainer-mode rebuild
Package-Manager: portage-2.1.9.10/cvs/Linux x86_64
| -rw-r--r-- | gnome-extra/gnome-utils/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-extra/gnome-utils/Manifest | 4 | ||||
| -rw-r--r-- | gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild | 11 |
3 files changed, 15 insertions, 6 deletions
diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog index a3bd78ab79b8..5fd9d1f92b76 100644 --- a/gnome-extra/gnome-utils/ChangeLog +++ b/gnome-extra/gnome-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/gnome-utils # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.203 2010/09/26 19:39:24 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.204 2010/09/29 09:51:35 nirbheek Exp $ + + 29 Sep 2010; <nirbheek@gentoo.org> gnome-utils-2.30.0.ebuild: + Fix problem with empty backslashes, bug 339074, avoid automake + maintainer-mode rebuild 26 Sep 2010; <nirbheek@gentoo.org> gnome-utils-2.30.0.ebuild: Fix build issues with gtk+-2.22 by removing -D*DISABLE_DEPRECATED cflags. diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest index a093490cf93f..829a29d03ac4 100644 --- a/gnome-extra/gnome-utils/Manifest +++ b/gnome-extra/gnome-utils/Manifest @@ -3,6 +3,6 @@ DIST gnome-utils-2.28.3.tar.bz2 6862868 RMD160 ee947e5eb8acb3796358b0d76a2aba324 DIST gnome-utils-2.30.0.tar.bz2 7608826 RMD160 952102bb1751819a22d468309958234f00b2733b SHA1 107f60f499340bb5c02e92db645836f6187b4c37 SHA256 745bb25fce536dc5337e7b5cbcbce9eee66b3cc0c500de302759b98ebcef6a8f EBUILD gnome-utils-2.26.0.ebuild 1442 RMD160 878a89298603cb1e00b04f5d34454116a87080ef SHA1 a11c55bd2ee4d1db7c8ad64bb30914045dbfcb4e SHA256 677535bef7ff852c360fbb54ae669f0be42ddae23114ddd1d5f5cf3bd70aa6c8 EBUILD gnome-utils-2.28.3.ebuild 1535 RMD160 031a4a4dc591324850cb2509b5adc2b8c9a26bfe SHA1 02ab2360f90341b5eda46d452163d4858f799fcc SHA256 177244c01eb1975909bbac346d29e8e9ce684ba83639b9bab9617e7cef0d1640 -EBUILD gnome-utils-2.30.0.ebuild 1580 RMD160 218d95fcbd2de47942c227f389aa2cc1f5dc02fc SHA1 d00db8a08906491ef9d52f270c7e042a20acfea7 SHA256 2c48fb30af71be9ee1772d7bc5f571e07cfcf748187d7f20fa003efaeb83d9ac -MISC ChangeLog 25280 RMD160 537a9dc9b46a9efa97da0f56e0915d5c3957168d SHA1 f3d6f058d340e4f4f394621baa090a3912c6ac0c SHA256 451bda9498e797383f0b2c50be450a5f80c17e3ad7c09c7dd5fea21f03289231 +EBUILD gnome-utils-2.30.0.ebuild 1850 RMD160 7c13a7bf7a3c1dc3cfd4c6df04c9c6e1a4f5a31e SHA1 02c7995be6bd39ccf5a956445e192623be534562 SHA256 f98aed27817b133b213f4514ee07c112a226159e169f5334306799ada195e28c +MISC ChangeLog 25436 RMD160 ec149a85c1fd8f845c46cad0dd4a8fd2a67bb919 SHA1 6dbeb82e4d926b1da6ec1e18ff6c2ca58510f5d3 SHA256 2fedf0f4328f055dc7a0159ae6daed979f7f095e89e40ef564a55902a1dd22f2 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 diff --git a/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild index 7461b4e17472..30b2070ad48d 100644 --- a/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild +++ b/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild,v 1.7 2010/09/26 19:39:24 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.30.0.ebuild,v 1.8 2010/09/29 09:51:35 nirbheek Exp $ EAPI="2" @@ -51,8 +51,13 @@ src_prepare() { gnome2_src_prepare # Remove idiotic -D.*DISABLE_DEPRECATED cflags - find . -iname 'Makefile.*' -exec \ - sed -e 's/-D[A-Z_]*DISABLE_DEPRECATED//g' -i {} + || die "sed 1 failed" + # This method is kinda prone to breakage. Recheck carefully with next bump. + # bug 339074 + find . -iname 'Makefile.am' -exec \ + sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed" + # Do Makefile.in after Makefile.am to avoid automake maintainer-mode + find . -iname 'Makefile.in' -exec \ + sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed" if ! use test ; then sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 2 failed" |