diff options
| -rw-r--r-- | app-misc/screen/ChangeLog | 6 | ||||
| -rw-r--r-- | app-misc/screen/Manifest | 12 | ||||
| -rw-r--r-- | app-misc/screen/files/screen-4.0.3-cppflags.patch | 11 | ||||
| -rw-r--r-- | app-misc/screen/screen-4.0.3-r5.ebuild | 11 |
4 files changed, 29 insertions, 11 deletions
diff --git a/app-misc/screen/ChangeLog b/app-misc/screen/ChangeLog index 91d8493c2df8..21a0d70d81b1 100644 --- a/app-misc/screen/ChangeLog +++ b/app-misc/screen/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/screen # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.173 2012/07/10 19:19:37 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/ChangeLog,v 1.174 2012/11/04 21:51:59 swegener Exp $ + + 04 Nov 2012; Sven Wegener <swegener@gentoo.org> screen-4.0.3-r5.ebuild, + +files/screen-4.0.3-cppflags.patch: + Support CPPFLAGS for bug #424557. 10 Jul 2012; Justin Lecher <jlec@gentoo.org> -screen-4.0.3-r4.ebuild, metadata.xml: diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest index fd15d0f7e920..61cb6742527f 100644 --- a/app-misc/screen/Manifest +++ b/app-misc/screen/Manifest @@ -11,18 +11,18 @@ AUX 4.0.3-extend-d_termname-ng2.patch 5136 SHA256 e87caeab9c4dfc59816c0faf237f26 AUX screen-4.0.1-int-overflow-fix.patch 930 SHA256 fe495d43c367082099cfcb890c7b66629d2ad656a7a15fee6fcd60884abee7d0 SHA512 cb678fb3b879ff61b79995f8a63aa7c84639c1daa4150abb527769c8e6f3dd993f3b0d126b71e60ecea1050bfa1bfc6d1c4756fc4f280ee01143ab8d6caa283b WHIRLPOOL ff0a6668b3531557584af3742a62179bdbb3e2adee1279761e9e4f4e2e6ec37c0107aec2279a679aacd3a6e745551124339611b0bd8202aab7e678e12c060491 AUX screen-4.0.1-vsprintf.patch 480 SHA256 34d2f9d6101555fbc37e983542f3db549ea96ede89c7d87c21c69b7331d9c3cd SHA512 f221b84bb753538871000e545610f0b5d5bb221dfe4f963cea8f2ba195d90fc6d217d45bd82081247be2e5307b125225635bee27a618ae570bf2bc097e241871 WHIRLPOOL ed62e461f50bb8c0c14f5221a4beb525dd1fa8ae0cdc370e0a90cd82bb252b8f64d0ee6f617ced90063c70751bf69b9778200982276d16d7db50f586177ed29c AUX screen-4.0.3-config.h-autoconf-2.62.patch 388 SHA256 71897394211d9e00e008f7c34b3a37bff0cfa54bcfa31a23e849c7021471ca2f SHA512 e08abcdd2f339012cb53f953b1963021614c2de0626f2b23deadc7335f8b0b76138a9f3aa259b86b4fdf740619bf4416cd17cd0e88b97f2578e1ec4b26f736f5 WHIRLPOOL c0aec99c177dad57d506b6cc1b23333313767fa74342a1f1e1949392c8ebdeb4f444eb9f5e75afdd399b10cfbf0c3c58eaf3737fff1eb4bbbef8418f508dcb5b +AUX screen-4.0.3-cppflags.patch 406 SHA256 6590ef0afeb1bcfddc40efeceef48086196d8a223cc1536427f9c41c782d918a SHA512 94297e7dcf2d430aaab4afd4654a723493b84f3a7770a597dee321329e66f65181cbc3eed950161b48d3c407d0c10a83d288bd1e666110b4bae22bc3a9e33082 WHIRLPOOL 0ab5e94695362a19034863b16f94f4e223fbe641439b3a2f0ba17624f9b9c145b29229c9b361287fdf985e2294169e02a92aa552f0e5554ebf48fbc4a6f0ed65 AUX screen-4.0.3-crosscompile.patch 18900 SHA256 7e4109cd3f6d58ea799fe069472a58f16ea75c2397392c15f58bfcb7cbb354f9 SHA512 9d34d6245d50f0ea84735cad7148b2c6af70709efc788fe9113752081a05138172acc4d6dc33c87ac71739dead1338000b9bd64978c0edf3c44d9ead92487afb WHIRLPOOL 037ec13508ec669791fda248d4a056abb54c1d9aa6893ddcb8aa4785365231b8c4aea46e07cd5367853039c0876cc8e1ee18df4952d9aa3168806eea9f994846 AUX screen-4.0.3-setenv_autoconf.patch 2485 SHA256 091eb224a097bbc1b5f1b3dd8048dbb04b8c7476818a9444eae5bdb8b52bce75 SHA512 72dcfd9180d05edf85ce9f459e69ccd709a6c0a4593802d0f4e88ffe2daf56215ce8049a641701693dafeab3cc8a0df796338d92338ee0d39c51d46ed718af7b WHIRLPOOL fa7645c3488f75c8acdb2305864459e3eada89e7a29e39a6048cdda7459c707b090c68ce93023a53c57a7beabb3c66f9f9f26237126e68d00cc888a7581b867c AUX screenrc 10409 SHA256 f2fbb2de649df9d6b0afbb913d002eb7fdabec5525930515452c286dffcde072 SHA512 32783353cadb403999041e184c7c69570869d45793df4aff35c341f222903dab23d7872e24a78dcf84d82d636890950ad2719614c5475d7084f58769a24e8e71 WHIRLPOOL 3d1a75bcaad7870637dee9c4549062ffcddfd6be614e73e786d166b45f82b35a7f5311d9a60060a7d38afa96264b8eed3719f23244fc3799b7f8fe6ca774a754 DIST screen-4.0.3.tar.gz 840602 SHA256 78f0d5b1496084a5902586304d4a73954b2bfe33ea13edceecf21615c39e6c77 SHA512 24c1f598972f3dc9ed49cd2c05852190a0190d22fa01401eee8484627c8dd2815f0a422d9b2697faa8aaa0b3efc6730a94e2d5aa787dbe5e9ec719143176c338 WHIRLPOOL 6774786126eb05749d432593bc2c1febdc57896959220a609feb138bdc16b8da278aea63af1ccfd5c7d38ccaa9e7d28980e9e14d0009d36a54cdbd9e4cb0fca7 -EBUILD screen-4.0.3-r5.ebuild 4657 SHA256 ec900286a359b211d14b28083065daac5f78840aea0ac58832f104f92e3e69b6 SHA512 1ab33ab18afa8210bcd739ba31ccbad2304b9db3a9fc35c11ed285f8243109c9f9d621c4fc641e28dcdb3d25b8dc8ac5a81f17ae1bc2db0eb9fd0bcc0994c28f WHIRLPOOL 16fb95ae8622a37cb3a409056bf6b98c84d7333696a1f2962b7a4ed74cbc46413d13d3704c046f5293179cc8755e0588c62404a9908e9decdfb3e03eced23d8d -MISC ChangeLog 24351 SHA256 da3db66ef367c8653d9bdccd32e666eb9046416695abf91d8973035084b32899 SHA512 4cbf2125dd3be8f896074fb8e92bddc5be9c36a6bddb257f42e664c8316795beee35ce8d0cf96a5f5c94bde75eae84f66c5ec5d89142b00ee5a665d6cc6dd836 WHIRLPOOL f33283cff594bac0f475d4213ea8733b26515df253df8c07c96d1e982ba7454280c6dabb1b49e2fb5a3ff9c972040fe5574dd0333b50e049fc162934595d4c0c +EBUILD screen-4.0.3-r5.ebuild 4732 SHA256 61926505d0fca0e4ebcc5b53d443dff77bc9f86896187bed88f224ca57a65e19 SHA512 55b50431dd1c133484b932f287d6a1cea7b7ae6e00facff4c96d178ba308656b51a19a65bac4e95fbebd0ed9d36f1b6f214694a0dc1e04821dc13e9a4bceac9a WHIRLPOOL 6cf0c5e30e0346156443d5a9be34ccf8062f5b78999d42a9b410d629d6bf5aedcdb194bb7060c8688fea3d6f4836bf7289813f8701b91e6aa53b5cc2710b9c92 +MISC ChangeLog 24504 SHA256 28f793ef7701831edcbcd058a5b25dada9e13698ead2b7b097cdc738d504090a SHA512 ca00e611123991cdd2c073b2c9273f113ff9ba458ccde9be58994a57b81d23763b11d14dd4d7d1f57591a8e4a326f17df1fe6d0cea089e10f22c4f2b7e5b707a WHIRLPOOL 4b4b0308459d62cb6737ae7fe3c9902d303ca49ffac6daba5dbaff74e54ff8a129530a900623c0b3408a04d6599fd1a30a4a8dbb263fe3cc17b427c8b723360b MISC metadata.xml 1703 SHA256 f730fdee708602205eac134d406226c041480a730800b270fddc0f29b0663782 SHA512 2458aebc3c3a1852e0c251d3650846401f9a634a7d5fb722ad47a0b966705fa93de77b2fef1858d81e7dca29bc8b5ec46c22de993e385fbcc117244dedc9e46d WHIRLPOOL 4862c8c314207cde5eca001b985efa691a7ad02335f208d916c903bf6fa2acfd5100514a0704adcfee0f32d75d29a978b49ae104e9f0f60a8eaf54e07a963098 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -Comment: GPGTools - http://gpgtools.org -iEYEAREIAAYFAk/8gE4ACgkQgAnW8HDreRYZbACgzwQYu6RTuE1om39O3CNwPyRk -Pz4An1Y0QfYLzO2YxJjmpk0AycBhTNfB -=M5AL +iEYEAREIAAYFAlCW44AACgkQI1lqEGTUzyT1oQCfYyyLvqX0w9y2H195lKlDMgzr +xvYAoI2gAEB4QJFWsUr6z1c7jUUcxSfq +=e7Lr -----END PGP SIGNATURE----- diff --git a/app-misc/screen/files/screen-4.0.3-cppflags.patch b/app-misc/screen/files/screen-4.0.3-cppflags.patch new file mode 100644 index 000000000000..aebf35119c6e --- /dev/null +++ b/app-misc/screen/files/screen-4.0.3-cppflags.patch @@ -0,0 +1,11 @@ +--- screen-4.0.3/Makefile.in ++++ screen-4.0.3/Makefile.in +@@ -68,7 +68,7 @@ + $(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) + + .c.o: +- $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CFLAGS) $< ++ $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(DEFS) $(OPTIONS) $(CPPFLAGS) $(CFLAGS) $< + + install_bin: .version screen + -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ diff --git a/app-misc/screen/screen-4.0.3-r5.ebuild b/app-misc/screen/screen-4.0.3-r5.ebuild index 8d9225874bda..d78dcf176d08 100644 --- a/app-misc/screen/screen-4.0.3-r5.ebuild +++ b/app-misc/screen/screen-4.0.3-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r5.ebuild,v 1.9 2012/07/10 19:12:22 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/screen/screen-4.0.3-r5.ebuild,v 1.10 2012/11/04 21:51:59 swegener Exp $ EAPI=4 @@ -89,17 +89,20 @@ src_prepare() { # Allow usernames up to 32 chars epatch "${FILESDIR}"/${PV}-extend-d_termname-ng2.patch + # support CPPFLAGS + epatch "${FILESDIR}"/${P}-cppflags.patch + # reconfigure eautoconf } src_configure() { - append-flags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" + append-cppflags "-DMAXWIN=${MAX_SCREEN_WINDOWS:-100}" [[ ${CHOST} == *-solaris* ]] && append-libs -lsocket -lnsl - use nethack || append-flags "-DNONETHACK" - use debug && append-flags "-DDEBUG" + use nethack || append-cppflags "-DNONETHACK" + use debug && append-cppflags "-DDEBUG" econf \ --with-socket-dir="${EPREFIX}/var/run/screen" \ |